1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-01 05:55:02 +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]){
$sInheritClass = $aInfo[Engine::CI_INHERIT];
$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]){
require_once $aInfo[Engine::CI_CLASSPATH];
}elseif(!class_exists($sClassName)){

View file

@ -128,19 +128,16 @@ function func_generator($iLength=10) {
/**
* 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) {
if (is_array($data)) {
foreach ($data as $sKey => $value) {
if (is_array($value)) {
func_htmlspecialchars($data[$sKey]);
} else {
$data[$sKey]=htmlspecialchars($value);
}
}
} else {
$data=htmlspecialchars($data);
function func_htmlspecialchars(&$data, $walkIndex = null)
{
if(is_string($data)){
$data = htmlspecialchars($data);
}elseif(is_array($data)){
array_walk($data, __FUNCTION__);
}
}
@ -402,7 +399,11 @@ if (!function_exists('array_intersect_key')) {
if (!function_exists('class_alias')) {
function class_alias($original, $alias) {
if(!class_exists($original)){
return false;
}
eval('abstract class ' . $alias . ' extends ' . $original . ' {}');
return true;
}
}

View file

@ -42,7 +42,12 @@
border-left: 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: hover > ul{ display: block; }
.markItUpHeader ul .markItUpDropMenu {

View file

@ -1,5 +1,11 @@
Function.prototype.bind = function(context) {
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 fn.apply(context, arguments);
};
@ -8,7 +14,7 @@ String.prototype.tr = function(a,p) {
var k;
var p = typeof(p)=='string' ? p : '';
var s = this;
$.each(a,function(k){
jQuery.each(a,function(k){
var tk = p?p.split('/'):[];
tk[tk.length] = k;
var tp = tk.join('/');
@ -25,8 +31,8 @@ String.prototype.tr = function(a,p) {
var ls = ls || {};
/**
* Управление всплывающими сообщениями
*/
* Управление всплывающими сообщениями
*/
ls.msg = (function ($) {
/**
* Опции
@ -425,7 +431,7 @@ ls = (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);
} else {
//alert(msg);

View file

@ -7,67 +7,69 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
{literal}
<script type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
});
});
</script>
{/literal}
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
<script type="text/javascript">
jQuery(document).ready(function($){
ls.lang.load({lang_load name="panel_b,panel_i,panel_u,panel_s,panel_url,panel_url_promt,panel_code,panel_video,panel_image,panel_cut,panel_quote,panel_list,panel_list_ul,panel_list_ol,panel_title,panel_clear_tags,panel_video_promt,panel_list_li"});
// Подключаем редактор
// Подключаем редактор
$('#page_text').markItUp(getMarkitupSettings());
});
</script>
{/if}
<form action="" method="POST">
{hook run='plugin_page_form_add_begin'}
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<p><label for="page_pid">{$aLang.page_create_parent_page}</label><br />
<select name="page_pid" id="page_pid" class="input-300">
<option value="0"></option>
{foreach from=$aPages item=oPage}
<option style="margin-left: {$oPage->getLevel()*20}px;" value="{$oPage->getId()}" {if $_aRequest.page_pid==$oPage->getId()}selected{/if}>{$oPage->getTitle()}(/{$oPage->getUrlFull()}/)</option>
{/foreach}
{/foreach}
</select></p>
<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>
<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>
<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>
<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>
<label for="topic_text">{$aLang.page_create_text}:</label>
<textarea name="page_text" id="page_text" rows="20" class="input-wide">{$_aRequest.page_text}</textarea><br /><br />
<p><label for="page_seo_keywords">{$aLang.page_create_seo_keywords}:</label><br />
<input type="text" id="page_seo_keywords" name="page_seo_keywords" value="{$_aRequest.page_seo_keywords}" class="input-wide" />
<span class="note">{$aLang.page_create_seo_keywords_notice}</span></p>
@ -75,22 +77,22 @@
<p><label for="page_seo_description">{$aLang.page_create_seo_description}:</label><br />
<input type="text" id="page_seo_description" name="page_seo_description" value="{$_aRequest.page_seo_description}" class="input-wide" />
<span class="note">{$aLang.page_create_seo_description_notice}</span></p>
<p><label for="page_sort">{$aLang.page_create_sort}:</label><br />
<input type="text" id="page_sort" name="page_sort" value="{$_aRequest.page_sort}" class="input-wide" />
<span class="note">{$aLang.page_create_sort_notice}</span></p>
<p><label><input type="checkbox" id="page_auto_br" name="page_auto_br" value="1" class="checkbox" {if $_aRequest.page_auto_br==1}checked{/if}/>{$aLang.page_create_auto_br}</label></p>
<p><label><input type="checkbox" id="page_active" name="page_active" value="1" class="checkbox" {if $_aRequest.page_active==1}checked{/if} />{$aLang.page_create_active}</label></p>
<p><label><input type="checkbox" id="page_main" name="page_main" value="1" class="checkbox" {if $_aRequest.page_main==1}checked{/if} />{$aLang.page_create_main}</label></p>
{hook run='plugin_page_form_add_end'}
<p>
<p>
<input type="submit" name="submit_page_save" value="{$aLang.page_create_submit_save}" />
<input type="submit" name="submit_page_cancel" value="{$aLang.page_create_submit_cancel}" onclick="window.location='{router page='page'}admin/'; return false;" />
</p>
<input type="hidden" name="page_id" value="{$_aRequest.page_id}">
</form>

View file

@ -7,67 +7,69 @@
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
{literal}
<script type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
language : TINYMCE_LANG
});
});
</script>
{/literal}
{else}
{include file='window_load_img.tpl' sToLoad='page_text'}
<script type="text/javascript">
jQuery(document).ready(function($){
ls.lang.load({lang_load name="panel_b,panel_i,panel_u,panel_s,panel_url,panel_url_promt,panel_code,panel_video,panel_image,panel_cut,panel_quote,panel_list,panel_list_ul,panel_list_ol,panel_title,panel_clear_tags,panel_video_promt,panel_list_li"});
// Подключаем редактор
// Подключаем редактор
$('#page_text').markItUp(getMarkitupSettings());
});
</script>
{/if}
<form action="" method="POST">
{hook run='plugin_page_form_add_begin'}
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<p><label for="page_pid">{$aLang.page_create_parent_page}</label><br />
<select name="page_pid" id="page_pid" class="input-300">
<option value="0"></option>
{foreach from=$aPages item=oPage}
<option style="margin-left: {$oPage->getLevel()*20}px;" value="{$oPage->getId()}" {if $_aRequest.page_pid==$oPage->getId()}selected{/if}>{$oPage->getTitle()}(/{$oPage->getUrlFull()}/)</option>
{/foreach}
{/foreach}
</select></p>
<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>
<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>
<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>
<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>
<label for="topic_text">{$aLang.page_create_text}:</label>
<textarea name="page_text" id="page_text" rows="20" class="input-wide">{$_aRequest.page_text}</textarea><br /><br />
<p><label for="page_seo_keywords">{$aLang.page_create_seo_keywords}:</label><br />
<input type="text" id="page_seo_keywords" name="page_seo_keywords" value="{$_aRequest.page_seo_keywords}" class="input-wide" />
<span class="note">{$aLang.page_create_seo_keywords_notice}</span></p>
@ -75,22 +77,22 @@
<p><label for="page_seo_description">{$aLang.page_create_seo_description}:</label><br />
<input type="text" id="page_seo_description" name="page_seo_description" value="{$_aRequest.page_seo_description}" class="input-wide" />
<span class="note">{$aLang.page_create_seo_description_notice}</span></p>
<p><label for="page_sort">{$aLang.page_create_sort}:</label><br />
<input type="text" id="page_sort" name="page_sort" value="{$_aRequest.page_sort}" class="input-wide" />
<span class="note">{$aLang.page_create_sort_notice}</span></p>
<p><label><input type="checkbox" id="page_auto_br" name="page_auto_br" value="1" class="checkbox" {if $_aRequest.page_auto_br==1}checked{/if}/>{$aLang.page_create_auto_br}</label></p>
<p><label><input type="checkbox" id="page_active" name="page_active" value="1" class="checkbox" {if $_aRequest.page_active==1}checked{/if} />{$aLang.page_create_active}</label></p>
<p><label><input type="checkbox" id="page_main" name="page_main" value="1" class="checkbox" {if $_aRequest.page_main==1}checked{/if} />{$aLang.page_create_main}</label></p>
{hook run='plugin_page_form_add_end'}
<p>
<p>
<input type="submit" name="submit_page_save" value="{$aLang.page_create_submit_save}" />
<input type="submit" name="submit_page_cancel" value="{$aLang.page_create_submit_cancel}" onclick="window.location='{router page='page'}admin/'; return false;" />
</p>
<input type="hidden" name="page_id" value="{$_aRequest.page_id}">
</form>

View file

@ -6,35 +6,37 @@
<script type="text/javascript">
{literal}
tinyMCE.init({
mode : "specific_textareas",
editor_selector : "mceEditor",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
},
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG
jQuery(function($){
tinyMCE.init({
mode : "specific_textareas",
editor_selector : "mceEditor",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
},
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG
});
});
{/literal}
</script>
@ -44,7 +46,7 @@ tinyMCE.init({
<script type="text/javascript">
jQuery(document).ready(function($){
ls.lang.load({lang_load name="panel_b,panel_i,panel_u,panel_s,panel_url,panel_url_promt,panel_code,panel_video,panel_image,panel_cut,panel_quote,panel_list,panel_list_ul,panel_list_ol,panel_title,panel_clear_tags,panel_video_promt,panel_list_li,panel_image_promt,panel_user,panel_user_promt"});
// Подключаем редактор
// Подключаем редактор
$('#topic_text').markItUp(getMarkitupSettings());
});
</script>
@ -68,38 +70,38 @@ tinyMCE.init({
{else}
<h1>{$aLang.topic_photoset_edit}</h1>
{/if}
<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">
<label for="">{$aLang.topic_photoset_choose_image}:</label><br />
<input type="file" id="photoset-upload-file" name="Filedata" /><br><br>
<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">
<label for="">{$aLang.topic_photoset_choose_image}:</label><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.closeForm();">{$aLang.topic_photoset_upload_close}</button>
<input type="hidden" name="is_iframe" value="true" />
<input type="hidden" name="topic_id" value="{$_aRequest.topic_id}" />
</p>
</form>
<button onclick="ls.photoset.upload();">{$aLang.topic_photoset_upload_choose}</button>
<button onclick="ls.photoset.closeForm();">{$aLang.topic_photoset_upload_close}</button>
<input type="hidden" name="is_iframe" value="true" />
<input type="hidden" name="topic_id" value="{$_aRequest.topic_id}" />
</p>
</form>
{hook run='add_topic_photoset_begin'}
<form action="" method="POST" enctype="multipart/form-data">
{hook run='form_add_topic_photoset_begin'}
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
<p><label for="blog_id">{$aLang.topic_create_blog}</label><br />
<select name="blog_id" id="blog_id" onChange="ls.blog.loadInfo(this.value);" class="input-300">
<option value="0">{$aLang.topic_create_blog_personal}</option>
{foreach from=$aBlogsAllow item=oBlog}
<option value="{$oBlog->getId()}" {if $_aRequest.blog_id==$oBlog->getId()}selected{/if}>{$oBlog->getTitle()|escape:'html'}</option>
{/foreach}
{/foreach}
</select></p>
<script language="JavaScript" type="text/javascript">
jQuery(document).ready(function($){
ls.blog.loadInfo($('#blog_id').val());
});
</script>
<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 />
<span class="note">{$aLang.topic_create_title_notice}</span>
@ -109,42 +111,42 @@ tinyMCE.init({
<label for="topic_text">{$aLang.topic_create_text}{if !$oConfig->GetValue('view.tinymce')} ({$aLang.topic_create_text_notice}){/if}:</label>
<textarea name="topic_text" class="mceEditor" id="topic_text" rows="20">{$_aRequest.topic_text}</textarea>
</p>
<!-- Topic Photo Add -->
<div class="topic-photo-upload">
<h2>{$aLang.topic_photoset_upload_title}</h2>
<div class="topic-photo-upload-rules">
{$aLang.topic_photoset_upload_rules|ls_lang:"SIZE%%`$oConfig->get('module.topic.photoset.photo_max_size')`":"COUNT%%`$oConfig->get('module.topic.photoset.count_photos_max')`"}
</div>
<input type="hidden" name="topic_main_photo" id="topic_main_photo" value="{$_aRequest.topic_main_photo}" />
<ul id="swfu_images">
{if count($aPhotos)}
{foreach from=$aPhotos item=oPhoto}
{if $_aRequest.topic_main_photo && $_aRequest.topic_main_photo == $oPhoto->getId()}
{assign var=bIsMainPhoto value=true}
{/if}
<li id="photo_{$oPhoto->getId()}" {if $bIsMainPhoto}class="marked-as-preview"{/if}>
<img src="{$oPhoto->getWebPath('100crop')}" alt="image" />
<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>
<span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state">
{if $bIsMainPhoto}
{$aLang.topic_photoset_is_preview}
{else}
<a href="javascript:ls.photoset.setPreview({$oPhoto->getId()})" class="mark-as-preview">{$aLang.topic_photoset_mark_as_preview}</a>
{/if}
</span>
</li>
{assign var=bIsMainPhoto value=false}
{/foreach}
{/if}
{if count($aPhotos)}
{foreach from=$aPhotos item=oPhoto}
{if $_aRequest.topic_main_photo && $_aRequest.topic_main_photo == $oPhoto->getId()}
{assign var=bIsMainPhoto value=true}
{/if}
<li id="photo_{$oPhoto->getId()}" {if $bIsMainPhoto}class="marked-as-preview"{/if}>
<img src="{$oPhoto->getWebPath('100crop')}" alt="image" />
<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>
<span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state">
{if $bIsMainPhoto}
{$aLang.topic_photoset_is_preview}
{else}
<a href="javascript:ls.photoset.setPreview({$oPhoto->getId()})" class="mark-as-preview">{$aLang.topic_photoset_mark_as_preview}</a>
{/if}
</span>
</li>
{assign var=bIsMainPhoto value=false}
{/foreach}
{/if}
</ul>
<a href="javascript:ls.photoset.showForm()" id="photoset-start-upload">{$aLang.topic_photoset_upload_choose}</a>
</div>
<!-- /Topic Photo Add -->
<p><label for="topic_tags">{$aLang.topic_create_tags}:</label><br />
<input type="text" id="topic_tags" name="topic_tags" value="{$_aRequest.topic_tags}" class="input-wide autocomplete-tags-sep" /><br />
<span class="note">{$aLang.topic_create_tags_notice}</span></p>
@ -152,7 +154,7 @@ tinyMCE.init({
<p><label for="topic_forbid_comment"><input type="checkbox" id="topic_forbid_comment" name="topic_forbid_comment" class="checkbox" value="1" {if $_aRequest.topic_forbid_comment==1}checked{/if} />
{$aLang.topic_create_forbid_comment}</label><br />
<span class="note">{$aLang.topic_create_forbid_comment_notice}</span></p>
{if $oUserCurrent->isAdministrator()}
<p><label for="topic_publish_index"><input type="checkbox" id="topic_publish_index" name="topic_publish_index" class="checkbox" value="1" {if $_aRequest.topic_publish_index==1}checked{/if} />
{$aLang.topic_create_publish_index}</label><br />
@ -160,7 +162,7 @@ tinyMCE.init({
{/if}
{hook run='form_add_topic_photoset_end'}
<p class="buttons">
<input type="submit" name="submit_topic_publish" value="{$aLang.topic_create_submit_publish}" class="right" />
<input type="submit" name="submit_preview" value="{$aLang.topic_create_submit_preview}" onclick="jQuery('#text_preview').parent().show(); ls.tools.textPreview('topic_text',false); return false;" />&nbsp;

View file

@ -5,34 +5,36 @@
<script type="text/javascript">
{literal}
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
}
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
}
});
});
{/literal}
</script>
@ -42,7 +44,7 @@ tinyMCE.init({
<script type="text/javascript">
jQuery(document).ready(function($){
ls.lang.load({lang_load name="panel_b,panel_i,panel_u,panel_s,panel_url,panel_url_promt,panel_code,panel_video,panel_image,panel_cut,panel_quote,panel_list,panel_list_ul,panel_list_ol,panel_title,panel_clear_tags,panel_video_promt,panel_list_li,panel_image_promt,panel_user,panel_user_promt"});
// Подключаем редактор
// Подключаем редактор
$('#topic_text').markItUp(getMarkitupSettings());
});
</script>
@ -78,8 +80,8 @@ tinyMCE.init({
jQuery(document).ready(function($){
ls.blog.loadInfo($('#blog_id').val());
});
</script>
</script>
<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 />
<span class="note">{$aLang.topic_create_title_notice}</span></p>

View file

@ -6,38 +6,38 @@
<input type="hidden" id="comment_use_paging" value="{if $aPagingCmt and $aPagingCmt.iCountPage>1}1{/if}" />
</div>
{/if}
<h3>{$aLang.comment_title} (<span id="count-comments">{$iCountComment}</span>)</h3>
<a name="comments"></a>
<div class="comments" id="comments">
{assign var="nesting" value="-1"}
{foreach from=$aComments item=oComment name=rublist}
{assign var="cmtlevel" value=$oComment->getLevel()}
{if $cmtlevel>$oConfig->GetValue('module.comment.max_tree')}
{assign var="cmtlevel" value=$oConfig->GetValue('module.comment.max_tree')}
{/if}
{if $nesting < $cmtlevel}
{elseif $nesting > $cmtlevel}
{if $nesting < $cmtlevel}
{elseif $nesting > $cmtlevel}
{section name=closelist1 loop=$nesting-$cmtlevel+1}</div>{/section}
{elseif not $smarty.foreach.rublist.first}
</div>
{/if}
<div class="comment-wrapper" id="comment_wrapper_id_{$oComment->getId()}">
{include file='comment.tpl'}
{include file='comment.tpl'}
{assign var="nesting" value=$cmtlevel}
{if $smarty.foreach.rublist.last}
{section name=closelist2 loop=$nesting+1}</div>{/section}
{section name=closelist2 loop=$nesting+1}</div>{/section}
{/if}
{/foreach}
</div>
</div>
{include file='comment_paging.tpl' aPagingCmt=$aPagingCmt}
{if $bAllowNewComment}
@ -45,58 +45,60 @@
{else}
{if $oUserCurrent}
<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">
{if $oConfig->GetValue('view.tinymce')}
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce/tiny_mce.js"></script>
{literal}
<script type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,lslink,lsquote",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
},
setup : function(ed) {
// Display an alert onclick
ed.onKeyPress.add(function(ed, e) {
key = e.keyCode || e.which;
if(e.ctrlKey && (key == 13)) {
$('#comment-button-submit').click();
return false;
}
});
}
});
</script>
{/literal}
{/if}
<div id="reply_0" class="reply">
{if $oConfig->GetValue('view.tinymce')}
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce/tiny_mce.js"></script>
{literal}
<script type="text/javascript">
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,lslink,lsquote",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
},
setup : function(ed) {
// Display an alert onclick
ed.onKeyPress.add(function(ed, e) {
key = e.keyCode || e.which;
if(e.ctrlKey && (key == 13)) {
$('#comment-button-submit').click();
return false;
}
});
}
});
});
</script>
{/literal}
{/if}
{if $oUserCurrent}
<div class="comment" id="comment_preview_0" style="display: none;"><div class="comment-inner"><div class="content"></div></div></div>
{/if}
<div class="comment" id="comment_preview_0" style="display: none;"><div class="comment-inner"><div class="content"></div></div></div>
{/if}
<form action="" method="POST" id="form_comment" onsubmit="return false;" enctype="multipart/form-data">
{hook run='form_add_comment_begin'}
<textarea name="comment_text" id="form_comment_text" class="input-wide"></textarea>
@ -110,6 +112,6 @@
{else}
{$aLang.comment_unregistered}
{/if}
{/if}
{/if}

View file

@ -9,4 +9,4 @@
.markItUp { width: 100%; }
.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">
{literal}
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
}
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_buttons1 : "lshselect,bold,italic,underline,strikethrough,|,bullist,numlist,|,undo,redo,|,lslink,unlink,lsvideo,lsimage,pagebreak,code",
theme_advanced_buttons2 : "",
theme_advanced_buttons3 : "",
theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : 0,
theme_advanced_resizing_use_cookie : 0,
theme_advanced_path : false,
object_resizing : true,
force_br_newlines : true,
forced_root_block : '', // Needed for 3.x
force_p_newlines : false,
plugins : "lseditor,safari,inlinepopups,media,pagebreak",
convert_urls : false,
extended_valid_elements : "embed[src|type|allowscriptaccess|allowfullscreen|width|height]",
pagebreak_separator :"<cut>",
media_strict : false,
language : TINYMCE_LANG,
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
}
});
});
{/literal}
</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">
{literal}
{literal}
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
@ -35,7 +36,8 @@
media_strict : false,
language : TINYMCE_LANG
});
{/literal}
});
{/literal}
</script>
{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">
{literal}
{literal}
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
@ -31,10 +32,11 @@
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
strikethrough : {inline : 's', exact : true}
}
});
{/literal}
});
{/literal}
</script>
{else}
{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">
{literal}
{literal}
jQuery(function($){
tinyMCE.init({
mode : "textareas",
theme : "advanced",
@ -32,10 +33,11 @@
inline_styles:false,
formats : {
underline : {inline : 'u', exact : true},
strikethrough : {inline : 's', exact : true}
strikethrough : {inline : 's', exact : true}
}
});
{/literal}
});
{/literal}
</script>
{else}
{include file='window_load_img.tpl' sToLoad='topic_text'}

View file

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

View file

@ -11,7 +11,7 @@
.markItUp { width: 100%; }
.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 {
background: rgb(254,254,254);