mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-06-26 11:40:48 +03:00
фикс багов в шаблоне new-jquery, оформление страницы blog/blog_name/users
This commit is contained in:
Denis Shakhov
parent
e05e4c7fb3
commit
f8038179ed
|
|
@ -10,7 +10,7 @@ return array(
|
|||
'talk_favourite_empty' => 'Нет писем в избранном',
|
||||
'topic_menu_add' => 'Написать',
|
||||
'user_menu_profile_whois' => 'Инфо',
|
||||
'comment_leave' => 'Оставить комменатрий',
|
||||
'comment_leave' => 'Оставить комментарий',
|
||||
'topic_poll_add_item' => 'Добавить вариант',
|
||||
'topic_poll_delete_item' => 'Удалить',
|
||||
'admin_title' => 'Админка',
|
||||
|
|
|
|||
|
|
@ -11,6 +11,54 @@
|
|||
{include file='menu.blog_edit.tpl'}
|
||||
{/if}
|
||||
|
||||
|
||||
{if $oConfig->GetValue('view.tinymce')}
|
||||
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
|
||||
|
||||
<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}
|
||||
}
|
||||
});
|
||||
{/literal}
|
||||
</script>
|
||||
{else}
|
||||
{include file='window_load_img.tpl' sToLoad='topic_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"});
|
||||
// Ïîäêëþ÷àåì ðåäàêòîð
|
||||
$('#blog_description').markItUp(getMarkitupSettings());
|
||||
});
|
||||
</script>
|
||||
{/if}
|
||||
|
||||
<form action="" method="POST" enctype="multipart/form-data">
|
||||
{hook run='form_add_blog_begin'}
|
||||
<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" />
|
||||
|
|
@ -49,8 +97,8 @@
|
|||
|
||||
{hook run='form_add_blog_end'}
|
||||
|
||||
<p><input type="submit" name="submit_blog_add" value="{$aLang.blog_create_submit}" />
|
||||
<input type="hidden" name="blog_id" value="{$_aRequest.blog_id}" /></p>
|
||||
<input type="submit" name="submit_blog_add" value="{$aLang.blog_create_submit}" />
|
||||
<input type="hidden" name="blog_id" value="{$_aRequest.blog_id}" />
|
||||
</form>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
<a href="{$oUser->getUserWebPath()}" class="user">{$oUser->getLogin()}</a>
|
||||
{/foreach}
|
||||
{if count($aBlogUsers)<$iCountBlogUsers}
|
||||
<br/><a href="{$oBlog->getUrlFull()}users/">{$aLang.blog_user_readers_all}</a>
|
||||
<br /><br /><a href="{$oBlog->getUrlFull()}users/">{$aLang.blog_user_readers_all}</a>
|
||||
{/if}
|
||||
{else}
|
||||
{$aLang.blog_user_readers_empty}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{include file='header.tpl'}
|
||||
|
||||
<h1>{$aLang.blog_user_readers_all} ({$iCountBlogUsers}): <a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()}</a></h1>
|
||||
<h2>{$aLang.blog_user_readers_all} ({$iCountBlogUsers}): <a href="{$oBlog->getUrlFull()}">{$oBlog->getTitle()}</a></h2>
|
||||
|
||||
<div class="page people">
|
||||
{if $aBlogUsers}
|
||||
|
||||
<table class="table">
|
||||
<table class="table table-people">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>{$aLang.user}</td>
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
<tbody>
|
||||
{foreach from=$aBlogUsers item=oBlogUser}
|
||||
{assign var="oUser" value=$oBlogUser->getUser()}
|
||||
<tr>
|
||||
<td><a href="{$oUser->getUserWebPath()}">{$oUser->getLogin()}</a></td>
|
||||
<td align="center">{$oUser->getSkill()}</td>
|
||||
<td align="center"><strong>{$oUser->getRating()}</strong></td>
|
||||
<tr>
|
||||
<td><a href="{$oUser->getUserWebPath()}"><img src="{$oUser->getProfileAvatarPath(24)}" alt="" class="avatar" /></a><a href="{$oUser->getUserWebPath()}" class="username">{$oUser->getLogin()}</a></td>
|
||||
<td align="center" class="strength">{$oUser->getSkill()}</td>
|
||||
<td align="center" class="rating"><strong>{$oUser->getRating()}</strong></td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
{foreach from=$_aRequest.answer item=sAnswer key=i}
|
||||
<li>
|
||||
<input type="text" value="{$sAnswer}" name="answer[]" class="input input-300" {if $bEditDisabled}disabled{/if} />
|
||||
{if !$bEditDisabled and $i>1} <a href="#" onClick="return ls.poll.removeAnswer(this);">{$aLang.topic_poll_delete_item}</a>{/if}
|
||||
{if !$bEditDisabled and $i>1} <a href="#" onClick="return ls.poll.removeAnswer(this);" class="dashed">{$aLang.topic_poll_delete_item}</a>{/if}
|
||||
</li>
|
||||
{/foreach}
|
||||
{else}
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<li><input type="text" value="" name="answer[]" class="input input-300" {if $bEditDisabled}disabled{/if} /></li>
|
||||
{/if}
|
||||
</ul>
|
||||
{if !$bEditDisabled}<p><a href="#" onClick="ls.poll.addAnswer(); return false;">{$aLang.topic_poll_add_item}</a></p>{/if}
|
||||
{if !$bEditDisabled}<p><a href="#" onClick="ls.poll.addAnswer(); return false;" class="dashed">{$aLang.topic_poll_add_item}</a></p>{/if}
|
||||
|
||||
<p><label for="topic_text">{$aLang.topic_question_create_text}:</label><br />
|
||||
<textarea name="topic_text" id="topic_text" rows="20" class="input-wide">{$_aRequest.topic_text}</textarea></p>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div class="block-content">
|
||||
<form action="{router page='talk'}" method="GET" name="talk_filter_form">
|
||||
<p><label for="talk_filter_sender">{$aLang.talk_filter_label_sender}:</label><br />
|
||||
<input type="text" id="talk_filter_sender" name="sender" value="{$_aRequest.sender}" class="input-wide" /><br />
|
||||
<input type="text" id="talk_filter_sender" name="sender" value="{$_aRequest.sender}" class="input-wide autocomplete-users" /><br />
|
||||
<span class="note">{$aLang.talk_filter_notice_sender}</span></p>
|
||||
|
||||
<p><label for="talk_filter_keyword">{$aLang.talk_filter_label_keyword}:</label><br />
|
||||
|
|
|
|||
|
|
@ -1,43 +1,43 @@
|
|||
{include file='header.tpl' menu='topic_action'}
|
||||
{include file='window_load_img.tpl' sToLoad='topic_text'}
|
||||
|
||||
|
||||
{if $oConfig->GetValue('view.tinymce')}
|
||||
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
|
||||
|
||||
<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}
|
||||
}
|
||||
});
|
||||
{/literal}
|
||||
</script>
|
||||
<script type="text/javascript" src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
|
||||
|
||||
<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}
|
||||
}
|
||||
});
|
||||
{/literal}
|
||||
</script>
|
||||
{else}
|
||||
{include file='window_load_img.tpl' sToLoad='topic_text'}
|
||||
<script type="text/javascript">
|
||||
|
|
@ -50,6 +50,7 @@ tinyMCE.init({
|
|||
{/if}
|
||||
|
||||
|
||||
|
||||
<div class="topic" style="display: none;">
|
||||
<div class="content" id="text_preview"></div>
|
||||
</div>
|
||||
|
|
@ -104,9 +105,9 @@ tinyMCE.init({
|
|||
{hook run='form_add_topic_topic_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;" />
|
||||
<input type="submit" name="submit_topic_save" value="{$aLang.topic_create_submit_save}" />
|
||||
<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;" />
|
||||
<input type="submit" name="submit_topic_save" value="{$aLang.topic_create_submit_save}" />
|
||||
</p>
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@
|
|||
.comment .voting .minus { position: absolute; top: 16px; left: 0; }
|
||||
.comment .voting .total { position: absolute; top: 4px; right: 0; font-weight: normal; color: #333; padding: 0; }
|
||||
.comment .voting.positive .total { color: #390; }
|
||||
.comment .voting.negative .total { color: #f00; }
|
||||
|
||||
/* Comment Highlights */
|
||||
.comment .content { background: #f7f7f7; }
|
||||
|
|
@ -64,7 +65,9 @@
|
|||
.comment .info li a { }
|
||||
|
||||
/* Content */
|
||||
.comment .content { color: #000; padding-right: 20px; margin: 0 30px 10px 0; border: 1px solid #DDDEDE; background: #f7f7f7; border-radius: 7px; padding: 8px 10px 9px; }
|
||||
.comment .content { color: #000; margin: 0 30px 10px 0; border: 1px solid #DDDEDE; background: #f7f7f7; border-radius: 7px; padding: 8px 30px 9px 10px; }
|
||||
.comment .content pre { overflow: auto; width: 95%; padding: 5px 2%; margin-bottom: 10px; background: #f8f8f8 url(../images/code.gif); border: 1px solid #dce6f0; clear: both; }
|
||||
.comment .content blockquote {font-style: italic; padding: 5px 10px; background: #ffffff; border: 1px solid #ddd;}
|
||||
|
||||
/* Actions */
|
||||
.comment .actions { font-size: 11px; }
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@
|
|||
.note { font-size: 12px; color: #aaa; }
|
||||
.checkbox { position: relative; top: 2px; margin: 0 4px 0 1px; }
|
||||
.question-list { margin-bottom: 15px; }
|
||||
.question-list li { margin-bottom: 3px; }
|
||||
.question-list li { margin-bottom: 5px; }
|
||||
.question-list li input { margin-right: 5px; }
|
||||
|
||||
|
||||
.markItUp { width: 100%; }
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
#nav .menu li.active:before { content: ""; position: absolute; bottom: -5px; left: 10px; width: 9px; height: 5px; background: url(../images/arrows.png) no-repeat; }
|
||||
|
||||
/* Sub-menu */
|
||||
#nav .sub-menu { position: absolute; top: 35px; left: 0; width: 400px; font-size: 11px; }
|
||||
#nav .sub-menu { position: absolute; top: 35px; left: 0; width: 500px; font-size: 11px; }
|
||||
#nav .sub-menu li { margin-right: 5px; line-height: 12px; padding: 3px 10px 5px 10px !important; border-radius: 12px; }
|
||||
#nav .sub-menu li a { color: #777 !important; text-decoration: underline; }
|
||||
#nav .sub-menu li a:hover { text-decoration: none !important; }
|
||||
|
|
@ -100,11 +100,12 @@
|
|||
.blog .blog-info { display: none; background: #F4F4F6; padding: 25px 30px; border-radius: 10px; }
|
||||
.blog .blog-info h3 { font-size: 22px; color: #555; font-family: Verdana, sans-serif; }
|
||||
.blog .blog-info p { border-bottom: 1px solid #DADADA; padding-bottom: 15px; margin-bottom: 0; }
|
||||
.blog .blog-info .user { margin-right: 5px; }
|
||||
|
||||
.blog .blog-wrapper { overflow: hidden; zoom: 1; margin-bottom: 40px; border-top: 1px solid #fff; padding: 20px 0 0; }
|
||||
.blog .blog-wrapper .blog-admins { float: left; width: 50%; }
|
||||
.blog .blog-wrapper .blog-mods { float: left; width: 50%; }
|
||||
.blog .blog-wrapper .user-list li { float: left; width: 60px; text-align: center; overflow: hidden; }
|
||||
.blog .blog-wrapper .user-list li { float: left; width: 60px;text-align: center; overflow: hidden; }
|
||||
.blog .blog-wrapper .user-list li img { display: block; margin: 0 auto 2px; }
|
||||
|
||||
.blog-list-table { }
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ h3 { font-size: 18px; }
|
|||
a { color: #70AAE0; }
|
||||
a:hover { text-decoration: none; }
|
||||
|
||||
a.dashed { text-decoration: none; border-bottom: 1px dashed #70AAE0; }
|
||||
|
||||
p { margin-bottom: 18px; }
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -446,6 +446,7 @@ jQuery(document).ready(function($){
|
|||
ls.autocomplete.add($(".autocomplete-users"), aRouter['ajax']+'autocompleter/user/', true);
|
||||
ls.autocomplete.add($(".autocomplete-city"), aRouter['ajax']+'autocompleter/city/', false);
|
||||
ls.autocomplete.add($(".autocomplete-country"), aRouter['ajax']+'autocompleter/country/', false);
|
||||
ls.autocomplete.add($(".autocomplete-country"), aRouter['ajax']+'autocompleter/country/', false);
|
||||
|
||||
|
||||
// Скролл
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ ls.poll = (function ($) {
|
|||
}
|
||||
var newItem = $("#question_list li:first-child").clone();
|
||||
newItem.find('a').remove();
|
||||
newItem.appendTo("#question_list").append($('<a href="#">'+LANG_DELETE+'</a>').click(function(ev){
|
||||
newItem.appendTo("#question_list").append($('<a href="#" class="dashed">'+LANG_DELETE+'</a>').click(function(ev){
|
||||
return this.removeAnswer(ev.target);
|
||||
}.bind(this)));
|
||||
newItem.find('input').val('');
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ return array(
|
|||
'talk_favourite_empty' => 'Нет писем в избранном',
|
||||
'topic_menu_add' => 'Написать',
|
||||
'user_menu_profile_whois' => 'Инфо',
|
||||
'comment_leave' => 'Оставить комменатрий',
|
||||
'comment_leave' => 'Оставить комментарий',
|
||||
'topic_poll_add_item' => 'Добавить вариант',
|
||||
'topic_poll_delete_item' => 'Удалить',
|
||||
'admin_title' => 'Админка',
|
||||
|
|
|
|||
Loading…
Reference in a new issue