1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-05 07:54:24 +03:00

Merge pull request #85 from 1d10t/master

some fixes
This commit is contained in:
Mzhelskiy Maxim 2012-02-27 00:28:49 -08:00
commit 8b2140fb15
16 changed files with 352 additions and 318 deletions

View file

@ -947,7 +947,9 @@ class Engine extends Object {
if($aInfo[Engine::CI_INHERIT]){ if($aInfo[Engine::CI_INHERIT]){
$sInheritClass = $aInfo[Engine::CI_INHERIT]; $sInheritClass = $aInfo[Engine::CI_INHERIT];
$sParentClass = Engine::getInstance()->Plugin_GetParentInherit($sInheritClass); $sParentClass = Engine::getInstance()->Plugin_GetParentInherit($sInheritClass);
class_alias($sParentClass,$sClassName); if(!class_alias($sParentClass,$sClassName)){
dump("(autoload $sParentClass) Can not load CLASS-file");
}
}elseif($aInfo[Engine::CI_CLASSPATH]){ }elseif($aInfo[Engine::CI_CLASSPATH]){
require_once $aInfo[Engine::CI_CLASSPATH]; require_once $aInfo[Engine::CI_CLASSPATH];
}elseif(!class_exists($sClassName)){ }elseif(!class_exists($sClassName)){

View file

@ -128,19 +128,16 @@ function func_generator($iLength=10) {
/** /**
* htmlspecialchars умеющая обрабатывать массивы * htmlspecialchars умеющая обрабатывать массивы
* *
* @param unknown_type $data * @param mixed $data
* @param int %walkIndex - represents the key/index of the array being recursively htmlspecialchars'ed
* @return void
*/ */
function func_htmlspecialchars(&$data) { function func_htmlspecialchars(&$data, $walkIndex = null)
if (is_array($data)) { {
foreach ($data as $sKey => $value) { if(is_string($data)){
if (is_array($value)) { $data = htmlspecialchars($data);
func_htmlspecialchars($data[$sKey]); }elseif(is_array($data)){
} else { array_walk($data, __FUNCTION__);
$data[$sKey]=htmlspecialchars($value);
}
}
} else {
$data=htmlspecialchars($data);
} }
} }
@ -402,7 +399,11 @@ if (!function_exists('array_intersect_key')) {
if (!function_exists('class_alias')) { if (!function_exists('class_alias')) {
function class_alias($original, $alias) { function class_alias($original, $alias) {
if(!class_exists($original)){
return false;
}
eval('abstract class ' . $alias . ' extends ' . $original . ' {}'); eval('abstract class ' . $alias . ' extends ' . $original . ' {}');
return true;
} }
} }

View file

@ -42,7 +42,12 @@
border-left: 1px solid #c0cad5; border-left: 1px solid #c0cad5;
border-right: 1px solid #c0cad5; border-right: 1px solid #c0cad5;
} }
.markItUpHeader ul { overflow: visible; zoom: 1; } .markItUpHeader ul {
overflow: visible;
zoom: 1;
display: inline-block;
*display: inline; /* ie <= 7 */
}
.markItUpHeader ul li { list-style: none; float: left; position: relative; margin-right: 6px; } .markItUpHeader ul li { list-style: none; float: left; position: relative; margin-right: 6px; }
.markItUpHeader ul li: hover > ul{ display: block; } .markItUpHeader ul li: hover > ul{ display: block; }
.markItUpHeader ul .markItUpDropMenu { .markItUpHeader ul .markItUpDropMenu {

View file

@ -1,5 +1,11 @@
Function.prototype.bind = function(context) { Function.prototype.bind = function(context) {
var fn = this; var fn = this;
if(jQuery.type(fn) != 'function'){
throw new TypeError('Function.prototype.bind: call on non-function');
};
if(jQuery.type(context) == 'null'){
throw new TypeError('Function.prototype.bind: cant be bound to null');
};
return function() { return function() {
return fn.apply(context, arguments); return fn.apply(context, arguments);
}; };
@ -8,7 +14,7 @@ String.prototype.tr = function(a,p) {
var k; var k;
var p = typeof(p)=='string' ? p : ''; var p = typeof(p)=='string' ? p : '';
var s = this; var s = this;
$.each(a,function(k){ jQuery.each(a,function(k){
var tk = p?p.split('/'):[]; var tk = p?p.split('/'):[];
tk[tk.length] = k; tk[tk.length] = k;
var tp = tk.join('/'); var tp = tk.join('/');
@ -25,8 +31,8 @@ String.prototype.tr = function(a,p) {
var ls = ls || {}; var ls = ls || {};
/** /**
* Управление всплывающими сообщениями * Управление всплывающими сообщениями
*/ */
ls.msg = (function ($) { ls.msg = (function ($) {
/** /**
* Опции * Опции
@ -425,7 +431,7 @@ ls = (function ($) {
* Лог сообщений * Лог сообщений
*/ */
this.log = function() { this.log = function() {
if (window.console && window.console.log) { if (!$.browser.msie && window.console && window.console.log) {
Function.prototype.bind.call(console.log, console).apply(console, arguments); Function.prototype.bind.call(console.log, console).apply(console, arguments);
} else { } else {
//alert(msg); //alert(msg);

View file

@ -7,27 +7,29 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ jQuery(function($){
mode : "textareas", tinyMCE.init({
theme : "advanced", mode : "textareas",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media", force_p_newlines : false,
convert_urls : false, plugins : "lseditor,safari,inlinepopups,media",
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
language : TINYMCE_LANG extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
});
}); });
</script> </script>
{/literal} {/literal}
@ -58,11 +60,11 @@
<p><label for="page_title">{$aLang.page_create_title}:</label><br /> <p><label for="page_title">{$aLang.page_create_title}:</label><br />
<input type="text" id="page_title" name="page_title" value="{$_aRequest.page_title}" class="input-wide" /> </p> <input type="text" id="page_title" name="page_title" value="{$_aRequest.page_title}" class="input-wide" /> </p>
<p><label for="page_url">{$aLang.page_create_url}:</label><br /> <p><label for="page_url">{$aLang.page_create_url}:</label><br />
<input type="text" id="page_url" name="page_url" value="{$_aRequest.page_url}" class="input-wide" /> </p> <input type="text" id="page_url" name="page_url" value="{$_aRequest.page_url}" class="input-wide" /> </p>
<label for="topic_text">{$aLang.page_create_text}:</label> <label for="topic_text">{$aLang.page_create_text}:</label>

View file

@ -7,27 +7,29 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ jQuery(function($){
mode : "textareas", tinyMCE.init({
theme : "advanced", mode : "textareas",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media", force_p_newlines : false,
convert_urls : false, plugins : "lseditor,safari,inlinepopups,media",
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
language : TINYMCE_LANG extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
});
}); });
</script> </script>
{/literal} {/literal}
@ -58,11 +60,11 @@
<p><label for="page_title">{$aLang.page_create_title}:</label><br /> <p><label for="page_title">{$aLang.page_create_title}:</label><br />
<input type="text" id="page_title" name="page_title" value="{$_aRequest.page_title}" class="input-wide" /> </p> <input type="text" id="page_title" name="page_title" value="{$_aRequest.page_title}" class="input-wide" /> </p>
<p><label for="page_url">{$aLang.page_create_url}:</label><br /> <p><label for="page_url">{$aLang.page_create_url}:</label><br />
<input type="text" id="page_url" name="page_url" value="{$_aRequest.page_url}" class="input-wide" /> </p> <input type="text" id="page_url" name="page_url" value="{$_aRequest.page_url}" class="input-wide" /> </p>
<label for="topic_text">{$aLang.page_create_text}:</label> <label for="topic_text">{$aLang.page_create_text}:</label>

View file

@ -6,35 +6,37 @@
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
tinyMCE.init({ jQuery(function($){
mode : "specific_textareas", tinyMCE.init({
editor_selector : "mceEditor", mode : "specific_textareas",
theme : "advanced", editor_selector : "mceEditor",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media,pagebreak", force_p_newlines : false,
inline_styles:false, plugins : "lseditor,safari,inlinepopups,media,pagebreak",
formats : { inline_styles:false,
underline : {inline : 'u', exact : true}, formats : {
strikethrough : {inline : 's', exact : true} underline : {inline : 'u', exact : true},
}, strikethrough : {inline : 's', exact : true}
convert_urls : false, },
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
pagebreak_separator :"<cut>", extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
media_strict : false, pagebreak_separator :"<cut>",
language : TINYMCE_LANG media_strict : false,
language : TINYMCE_LANG
});
}); });
{/literal} {/literal}
</script> </script>
@ -68,17 +70,17 @@ tinyMCE.init({
{else} {else}
<h1>{$aLang.topic_photoset_edit}</h1> <h1>{$aLang.topic_photoset_edit}</h1>
{/if} {/if}
<form id="photoset-upload-form" method="POST" enctype="multipart/form-data" onsubmit="return false;"> <form id="photoset-upload-form" method="POST" enctype="multipart/form-data" onsubmit="return false;">
<p id="topic-photo-upload-input" class="topic-photo-upload-input"> <p id="topic-photo-upload-input" class="topic-photo-upload-input">
<label for="">{$aLang.topic_photoset_choose_image}:</label><br /> <label for="">{$aLang.topic_photoset_choose_image}:</label><br />
<input type="file" id="photoset-upload-file" name="Filedata" /><br><br> <input type="file" id="photoset-upload-file" name="Filedata" /><br><br>
<button onclick="ls.photoset.upload();">{$aLang.topic_photoset_upload_choose}</button> <button onclick="ls.photoset.upload();">{$aLang.topic_photoset_upload_choose}</button>
<button onclick="ls.photoset.closeForm();">{$aLang.topic_photoset_upload_close}</button> <button onclick="ls.photoset.closeForm();">{$aLang.topic_photoset_upload_close}</button>
<input type="hidden" name="is_iframe" value="true" /> <input type="hidden" name="is_iframe" value="true" />
<input type="hidden" name="topic_id" value="{$_aRequest.topic_id}" /> <input type="hidden" name="topic_id" value="{$_aRequest.topic_id}" />
</p> </p>
</form> </form>
{hook run='add_topic_photoset_begin'} {hook run='add_topic_photoset_begin'}
<form action="" method="POST" enctype="multipart/form-data"> <form action="" method="POST" enctype="multipart/form-data">
@ -119,26 +121,26 @@ tinyMCE.init({
</div> </div>
<input type="hidden" name="topic_main_photo" id="topic_main_photo" value="{$_aRequest.topic_main_photo}" /> <input type="hidden" name="topic_main_photo" id="topic_main_photo" value="{$_aRequest.topic_main_photo}" />
<ul id="swfu_images"> <ul id="swfu_images">
{if count($aPhotos)} {if count($aPhotos)}
{foreach from=$aPhotos item=oPhoto} {foreach from=$aPhotos item=oPhoto}
{if $_aRequest.topic_main_photo && $_aRequest.topic_main_photo == $oPhoto->getId()} {if $_aRequest.topic_main_photo && $_aRequest.topic_main_photo == $oPhoto->getId()}
{assign var=bIsMainPhoto value=true} {assign var=bIsMainPhoto value=true}
{/if} {/if}
<li id="photo_{$oPhoto->getId()}" {if $bIsMainPhoto}class="marked-as-preview"{/if}> <li id="photo_{$oPhoto->getId()}" {if $bIsMainPhoto}class="marked-as-preview"{/if}>
<img src="{$oPhoto->getWebPath('100crop')}" alt="image" /> <img src="{$oPhoto->getWebPath('100crop')}" alt="image" />
<textarea onBlur="ls.photoset.setPreviewDescription({$oPhoto->getId()}, this.value)">{$oPhoto->getDescription()}</textarea><br /> <textarea onBlur="ls.photoset.setPreviewDescription({$oPhoto->getId()}, this.value)">{$oPhoto->getDescription()}</textarea><br />
<a href="javascript:ls.photoset.deletePhoto({$oPhoto->getId()})" class="image-delete">{$aLang.topic_photoset_photo_delete}</a> <a href="javascript:ls.photoset.deletePhoto({$oPhoto->getId()})" class="image-delete">{$aLang.topic_photoset_photo_delete}</a>
<span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state"> <span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state">
{if $bIsMainPhoto} {if $bIsMainPhoto}
{$aLang.topic_photoset_is_preview} {$aLang.topic_photoset_is_preview}
{else} {else}
<a href="javascript:ls.photoset.setPreview({$oPhoto->getId()})" class="mark-as-preview">{$aLang.topic_photoset_mark_as_preview}</a> <a href="javascript:ls.photoset.setPreview({$oPhoto->getId()})" class="mark-as-preview">{$aLang.topic_photoset_mark_as_preview}</a>
{/if} {/if}
</span> </span>
</li> </li>
{assign var=bIsMainPhoto value=false} {assign var=bIsMainPhoto value=false}
{/foreach} {/foreach}
{/if} {/if}
</ul> </ul>
<a href="javascript:ls.photoset.showForm()" id="photoset-start-upload">{$aLang.topic_photoset_upload_choose}</a> <a href="javascript:ls.photoset.showForm()" id="photoset-start-upload">{$aLang.topic_photoset_upload_choose}</a>
</div> </div>

View file

@ -5,34 +5,36 @@
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
tinyMCE.init({ jQuery(function($){
mode : "textareas", tinyMCE.init({
theme : "advanced", mode : "textareas",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media,pagebreak", force_p_newlines : false,
convert_urls : false, plugins : "lseditor,safari,inlinepopups,media,pagebreak",
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
pagebreak_separator :"<cut>", extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
media_strict : false, pagebreak_separator :"<cut>",
language : TINYMCE_LANG, media_strict : false,
inline_styles:false, language : TINYMCE_LANG,
formats : { inline_styles:false,
underline : {inline : 'u', exact : true}, formats : {
strikethrough : {inline : 's', exact : true} underline : {inline : 'u', exact : true},
} strikethrough : {inline : 's', exact : true}
}
});
}); });
{/literal} {/literal}
</script> </script>
@ -78,7 +80,7 @@ tinyMCE.init({
jQuery(document).ready(function($){ jQuery(document).ready(function($){
ls.blog.loadInfo($('#blog_id').val()); ls.blog.loadInfo($('#blog_id').val());
}); });
</script> </script>
<p><label for="topic_title">{$aLang.topic_create_title}:</label><br /> <p><label for="topic_title">{$aLang.topic_create_title}:</label><br />
<input type="text" id="topic_title" name="topic_title" value="{$_aRequest.topic_title}" class="input-wide" /><br /> <input type="text" id="topic_title" name="topic_title" value="{$_aRequest.topic_title}" class="input-wide" /><br />

View file

@ -47,53 +47,55 @@
<h4 class="reply-header" id="add_comment_root"><a href="#" onclick="ls.comments.toggleCommentForm(0); return false;">{$sNoticeCommentAdd}</a></h4> <h4 class="reply-header" id="add_comment_root"><a href="#" onclick="ls.comments.toggleCommentForm(0); return false;">{$sNoticeCommentAdd}</a></h4>
<div id="reply_0" class="reply"> <div id="reply_0" class="reply">
{if $oConfig->GetValue('view.tinymce')} {if $oConfig->GetValue('view.tinymce')}
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce/tiny_mce.js"></script>
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ jQuery(function($){
mode : "textareas", tinyMCE.init({
theme : "advanced", mode : "textareas",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,lslink,lsquote", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "bold,italic,underline,strikethrough,lslink,lsquote",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media,pagebreak", force_p_newlines : false,
convert_urls : false, plugins : "lseditor,safari,inlinepopups,media,pagebreak",
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
pagebreak_separator :"<cut>", extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
media_strict : false, pagebreak_separator :"<cut>",
language : TINYMCE_LANG, media_strict : false,
inline_styles:false, language : TINYMCE_LANG,
formats : { inline_styles:false,
underline : {inline : 'u', exact : true}, formats : {
strikethrough : {inline : 's', exact : true} underline : {inline : 'u', exact : true},
}, strikethrough : {inline : 's', exact : true}
setup : function(ed) { },
// Display an alert onclick setup : function(ed) {
ed.onKeyPress.add(function(ed, e) { // Display an alert onclick
key = e.keyCode || e.which; ed.onKeyPress.add(function(ed, e) {
if(e.ctrlKey && (key == 13)) { key = e.keyCode || e.which;
$('#comment-button-submit').click(); if(e.ctrlKey && (key == 13)) {
return false; $('#comment-button-submit').click();
} return false;
}); }
} });
}); }
</script> });
{/literal} });
{/if} </script>
{/literal}
{/if}
{if $oUserCurrent} {if $oUserCurrent}
<div class="comment" id="comment_preview_0" style="display: none;"><div class="comment-inner"><div class="content"></div></div></div> <div class="comment" id="comment_preview_0" style="display: none;"><div class="comment-inner"><div class="content"></div></div></div>
{/if} {/if}

View file

@ -9,4 +9,4 @@
.markItUp { width: 100%; } .markItUp { width: 100%; }
.markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; } .markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; height: 28px; } .markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }

View file

@ -17,34 +17,36 @@
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
tinyMCE.init({ jQuery(function($){
mode : "textareas", tinyMCE.init({
theme : "advanced", mode : "textareas",
theme_advanced_toolbar_location : "top", theme : "advanced",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_location : "top",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code", theme_advanced_toolbar_align : "left",
theme_advanced_buttons2 : "", theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons3 : "", theme_advanced_buttons2 : "",
theme_advanced_statusbar_location : "bottom", theme_advanced_buttons3 : "",
theme_advanced_resizing : true, theme_advanced_statusbar_location : "bottom",
theme_advanced_resize_horizontal : 0, theme_advanced_resizing : true,
theme_advanced_resizing_use_cookie : 0, theme_advanced_resize_horizontal : 0,
theme_advanced_path : false, theme_advanced_resizing_use_cookie : 0,
object_resizing : true, theme_advanced_path : false,
force_br_newlines : true, object_resizing : true,
forced_root_block : '', // Needed for 3.x force_br_newlines : true,
force_p_newlines : false, forced_root_block : '', // Needed for 3.x
plugins : "lseditor,safari,inlinepopups,media,pagebreak", force_p_newlines : false,
convert_urls : false, plugins : "lseditor,safari,inlinepopups,media,pagebreak",
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]", convert_urls : false,
pagebreak_separator :"<cut>", extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
media_strict : false, pagebreak_separator :"<cut>",
language : TINYMCE_LANG, media_strict : false,
inline_styles:false, language : TINYMCE_LANG,
formats : { inline_styles:false,
underline : {inline : 'u', exact : true}, formats : {
strikethrough : {inline : 's', exact : true} underline : {inline : 'u', exact : true},
} strikethrough : {inline : 's', exact : true}
}
});
}); });
{/literal} {/literal}
</script> </script>

View file

@ -5,7 +5,8 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
jQuery(function($){
tinyMCE.init({ tinyMCE.init({
mode : "textareas", mode : "textareas",
theme : "advanced", theme : "advanced",
@ -35,7 +36,8 @@
media_strict : false, media_strict : false,
language : TINYMCE_LANG language : TINYMCE_LANG
}); });
{/literal} });
{/literal}
</script> </script>
{else} {else}

View file

@ -4,7 +4,8 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
jQuery(function($){
tinyMCE.init({ tinyMCE.init({
mode : "textareas", mode : "textareas",
theme : "advanced", theme : "advanced",
@ -31,10 +32,11 @@
inline_styles:false, inline_styles:false,
formats : { formats : {
underline : {inline : 'u', exact : true}, underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true} strikethrough : {inline : 's', exact : true}
} }
}); });
{/literal} });
{/literal}
</script> </script>
{else} {else}
{include file='window_load_img.tpl' sToLoad='talk_text'} {include file='window_load_img.tpl' sToLoad='talk_text'}

View file

@ -5,7 +5,8 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
{literal} {literal}
jQuery(function($){
tinyMCE.init({ tinyMCE.init({
mode : "textareas", mode : "textareas",
theme : "advanced", theme : "advanced",
@ -32,10 +33,11 @@
inline_styles:false, inline_styles:false,
formats : { formats : {
underline : {inline : 'u', exact : true}, underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true} strikethrough : {inline : 's', exact : true}
} }
}); });
{/literal} });
{/literal}
</script> </script>
{else} {else}
{include file='window_load_img.tpl' sToLoad='topic_text'} {include file='window_load_img.tpl' sToLoad='topic_text'}

View file

@ -57,6 +57,7 @@
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
jQuery(function($){
tinyMCE.init({ tinyMCE.init({
mode : "textareas", mode : "textareas",
theme : "advanced", theme : "advanced",
@ -82,8 +83,8 @@
language : TINYMCE_LANG, language : TINYMCE_LANG,
inline_styles:false, inline_styles:false,
formats : { formats : {
underline : {inline : 'u', exact : true}, underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true} strikethrough : {inline : 's', exact : true}
}, },
setup : function(ed) { setup : function(ed) {
// Display an alert onclick // Display an alert onclick
@ -94,8 +95,9 @@
return false; return false;
} }
}); });
} }
}); });
});
</script> </script>
{/literal} {/literal}
{else} {else}

View file

@ -11,7 +11,7 @@
.markItUp { width: 100%; } .markItUp { width: 100%; }
.markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; } .markItUpEditor { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
.markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; height: 28px; } .markItUpHeader { width: 100%; -moz-box-sizing: border-box; box-sizing: border-box; }
.button { .button {
background: rgb(254,254,254); background: rgb(254,254,254);