mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-05-21 18:28:17 +03:00
Доработка компонентов
This commit is contained in:
Denis Shakhov
parent
99d649f1ed
commit
41aaa79c04
|
|
@ -423,7 +423,7 @@ class ActionProfile extends Action
|
|||
*/
|
||||
$this->Viewer_Assign('paging', $aPaging);
|
||||
$this->Viewer_Assign('topics', $aTopics);
|
||||
$this->Viewer_Assign('favouriteTag', htmlspecialchars($sTag));
|
||||
$this->Viewer_Assign('activeFavouriteTag', htmlspecialchars($sTag));
|
||||
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.profile.title') . ' ' . $this->oUserProfile->getLogin());
|
||||
$this->Viewer_AddHtmlTitle($this->Lang_Get('user.favourites.title'));
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -210,8 +210,8 @@ class ActionTalk extends Action
|
|||
/**
|
||||
* Загружаем переменные в шаблон
|
||||
*/
|
||||
$this->Viewer_Assign('aPaging', $aPaging);
|
||||
$this->Viewer_Assign('aTalks', $aTalks);
|
||||
$this->Viewer_Assign('paging', $aPaging);
|
||||
$this->Viewer_Assign('talks', $aTalks);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -39,18 +39,6 @@ class BlockTagsFavouriteTopic extends Block
|
|||
if (!($oUser = $this->getParam('user'))) {
|
||||
$oUser = $oUserCurrent;
|
||||
}
|
||||
/**
|
||||
* Получаем список тегов
|
||||
*/
|
||||
$aTags = $this->Favourite_GetGroupTags($oUser->getId(), 'topic', null, 70);
|
||||
/**
|
||||
* Расчитываем логарифмическое облако тегов
|
||||
*/
|
||||
$this->Tools_MakeCloud($aTags);
|
||||
/**
|
||||
* Устанавливаем шаблон вывода
|
||||
*/
|
||||
$this->Viewer_Assign("aFavouriteTopicTags", $aTags);
|
||||
/**
|
||||
* Получаем список тегов пользователя
|
||||
*/
|
||||
|
|
@ -62,8 +50,9 @@ class BlockTagsFavouriteTopic extends Block
|
|||
/**
|
||||
* Устанавливаем шаблон вывода
|
||||
*/
|
||||
$this->Viewer_Assign("aFavouriteTopicUserTags", $aTags);
|
||||
$this->Viewer_Assign("oFavouriteUser", $oUser);
|
||||
$this->Viewer_Assign("tags", $aTags, true);
|
||||
$this->Viewer_Assign("user", $oUser, true);
|
||||
$this->Viewer_Assign("activeTag", $this->getParam('activeTag'), true);
|
||||
|
||||
$this->SetTemplate('components/tags-favourite/tags-cloud.tpl');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -538,7 +538,7 @@ $config['head']['default']['js'] = array(
|
|||
"___path.skin.web___/components/wall/js/wall.js",
|
||||
"___path.skin.web___/components/wall/js/wall-form.js",
|
||||
"___path.skin.web___/components/wall/js/wall-entry.js",
|
||||
"___path.skin.web___/components/blog/js/blog.js",
|
||||
"___path.skin.web___/components/blog/js/blog-add.js",
|
||||
"___path.skin.web___/components/blog/js/blog-invites.js",
|
||||
"___path.skin.web___/components/blog/js/blog-join.js",
|
||||
"___path.skin.web___/components/blog/js/blog-info.js",
|
||||
|
|
@ -552,7 +552,7 @@ $config['head']['default']['js'] = array(
|
|||
"___path.skin.web___/components/note/js/note.js",
|
||||
"___path.skin.web___/components/feed/js/feed-blogs.js",
|
||||
"___path.skin.web___/components/talk/js/talk.js",
|
||||
"___path.skin.web___/components/talk/js/message-users.js",
|
||||
"___path.skin.web___/components/talk/js/talk-users.js",
|
||||
"___path.skin.web___/components/user/js/user.js",
|
||||
"___path.skin.web___/components/user/js/user-follow.js",
|
||||
"___path.skin.web___/components/user/js/user-friend.js",
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
{lang name='admin.title'}
|
||||
{lang 'admin.title'}
|
||||
{/block}
|
||||
|
||||
{block 'layout_content'}
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
name = 'admin'
|
||||
mods = 'stacked pills'
|
||||
items = [
|
||||
[ 'name' => 'user', 'url' => "{router page='admin/plugins'}?plugin=admin&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}", 'text' => {lang 'admin.install_plugin_admin'}, is_enabled=$availableAdminPlugin ],
|
||||
[ 'name' => 'user', 'url' => "{router page='admin/plugins'}?plugin=admin&action=activate&security_ls_key={$LIVESTREET_SECURITY_KEY}", 'text' => {lang 'admin.install_plugin_admin'}, is_enabled => $availableAdminPlugin ],
|
||||
[ 'name' => 'plugins', 'url' => "{router page='admin'}plugins/", 'text' => {lang 'admin.items.plugins'} ]
|
||||
]}
|
||||
{/block}
|
||||
|
|
@ -4,16 +4,14 @@
|
|||
* @param array $plugins Список плагинов
|
||||
*}
|
||||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
{extends 'layouts/layout.admin.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
<a href="{router page='admin'}">{lang name='admin.title'}</a>
|
||||
<span>»</span>
|
||||
{lang name='admin.items.plugins'}
|
||||
{block 'layout_admin_page_title'}
|
||||
{lang 'admin.items.plugins'}
|
||||
{/block}
|
||||
|
||||
{block 'layout_content'}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
|
||||
{if $sEvent == 'edit'}
|
||||
{$sNav = 'blog.edit'}
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{* Показываем сайдбар только для закрытых блогов *}
|
||||
{if $blogEdit->getType() != 'close'}
|
||||
{$bNoSidebar = true}
|
||||
{$layoutShowSidebar = false}
|
||||
{/if}
|
||||
|
||||
{$sNav = 'blog.edit'}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'topics.sub'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'topics'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = ! Config::Get( 'view.topic_show_sidebar' )}
|
||||
{block 'layout_options' append}
|
||||
{$layouShowSidebar = Config::Get( 'view.topic_show_sidebar' )}
|
||||
{/block}
|
||||
|
||||
{block 'layout_content'}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sMenuHeadItemSelect = 'blogs'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{if $sEvent == 'add'}
|
||||
{$sNav = 'create'}
|
||||
{/if}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{$sNav = 'create'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{$bNoSystemMessages = true}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'topics'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'topics'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
*
|
||||
* @param array $topics
|
||||
* @param array $paging
|
||||
* @param array $activeFavouriteTag
|
||||
*}
|
||||
|
||||
{extends 'layouts/layout.user.tpl'}
|
||||
|
|
@ -16,7 +17,10 @@
|
|||
|
||||
{* Блок с тегами избранного *}
|
||||
{if $oUserCurrent && $oUserCurrent->getId() == $oUserProfile->getId()}
|
||||
{insert name='block' block='tagsFavouriteTopic' params={$aBlockParams.user=$oUserProfile}}
|
||||
{insert name='block' block='tagsFavouriteTopic' params=[
|
||||
'user' => $oUserProfile,
|
||||
'activeTag' => $activeFavouriteTag
|
||||
]}
|
||||
{/if}
|
||||
|
||||
{include 'components/topic/topic-list.tpl' topics=$topics paging=$paging}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{$bNoSystemMessages = true}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{$sNav = 'activity'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'activity'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'topics'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ jQuery(document).ready(function($){
|
|||
$('.js-date-picker').datepicker();
|
||||
|
||||
$('[data-type=captcha]').livequery(function () {
|
||||
$(this).captcha();
|
||||
$(this).lsCaptcha();
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -97,9 +97,9 @@ jQuery(document).ready(function($){
|
|||
/**
|
||||
* Tooltips
|
||||
*/
|
||||
$('.js-tooltip').tooltip();
|
||||
$('.js-tooltip').lsTooltip();
|
||||
|
||||
$('.js-popover-default').tooltip({
|
||||
$('.js-popover-default').lsTooltip({
|
||||
useAttrTitle: false,
|
||||
trigger: 'click',
|
||||
classes: 'tooltip-light'
|
||||
|
|
@ -107,7 +107,7 @@ jQuery(document).ready(function($){
|
|||
|
||||
if (ls.registry.get('block_stream_show_tip')) {
|
||||
$('.js-title-comment, .js-title-topic').livequery(function () {
|
||||
$(this).tooltip({
|
||||
$(this).lsTooltip({
|
||||
position: {
|
||||
my: "right center",
|
||||
at: "left left"
|
||||
|
|
@ -182,7 +182,7 @@ jQuery(document).ready(function($){
|
|||
});
|
||||
|
||||
// Добавление пользователей в персональную активность
|
||||
$('.js-activity-users').user_list_add({
|
||||
$('.js-activity-users').lsUserListAdd({
|
||||
urls: {
|
||||
add: aRouter.stream + 'ajaxadduser',
|
||||
remove: aRouter.stream + 'ajaxremoveuser'
|
||||
|
|
@ -204,7 +204,7 @@ jQuery(document).ready(function($){
|
|||
});
|
||||
|
||||
// Добавление пользователей в свою ленту
|
||||
$('.js-feed-users').user_list_add({
|
||||
$('.js-feed-users').lsUserListAdd({
|
||||
urls: {
|
||||
add: aRouter.feed + 'ajaxadduser',
|
||||
remove: aRouter.feed + 'unsubscribe'
|
||||
|
|
@ -341,11 +341,11 @@ jQuery(document).ready(function($){
|
|||
}
|
||||
});
|
||||
|
||||
// Добавление участников личного сообщения
|
||||
$('.js-message-users').message_users();
|
||||
// Управление участниками личного сообщения
|
||||
$('.js-message-users').lsTalkUsers();
|
||||
|
||||
// Черный список
|
||||
$('.js-user-list-add-blacklist').user_list_add({
|
||||
$('.js-user-list-add-blacklist').lsUserListAdd({
|
||||
urls: {
|
||||
add: aRouter['talk'] + 'ajaxaddtoblacklist/',
|
||||
remove: aRouter['talk'] + 'ajaxdeletefromblacklist/'
|
||||
|
|
@ -382,7 +382,9 @@ jQuery(document).ready(function($){
|
|||
/**
|
||||
* Blog
|
||||
*/
|
||||
ls.blog.init();
|
||||
|
||||
// Форма добавления блога
|
||||
$('.js-blog-add').lsBlogAdd();
|
||||
|
||||
// Приглашение пользователей в блог
|
||||
$('.js-user-list-add-blog-invite').lsBlogInvites();
|
||||
|
|
@ -545,7 +547,7 @@ jQuery(document).ready(function($){
|
|||
/**
|
||||
* Toolbar
|
||||
*/
|
||||
$('.js-toolbar').toolbar({
|
||||
$('.js-toolbar').lsToolbar({
|
||||
target: '.grid-role-wrapper',
|
||||
offsetX: 10
|
||||
});
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
};
|
||||
|
||||
// Подгрузка событий
|
||||
this.elements.more.more({
|
||||
this.elements.more.lsMore({
|
||||
url: this.option( 'urls.more' ),
|
||||
target: this.elements.list,
|
||||
beforeload: function (e, context) {
|
||||
|
|
|
|||
|
|
@ -74,22 +74,24 @@
|
|||
* Текст
|
||||
*}
|
||||
{block 'article_body'}
|
||||
<div class="{$component}-content text">
|
||||
{block 'article_content_text'}
|
||||
{if $isList}
|
||||
{$article->getTextShort()}
|
||||
|
||||
{* Кат *}
|
||||
{if $article->getTextShort() != $article->getText()}
|
||||
<br/>
|
||||
<a href="{$article->getUrl()}#cut" title="{$aLang.topic.read_more}">
|
||||
{$article->getCutText()|default:$aLang.topic.read_more}
|
||||
</a>
|
||||
<div class="{$component}-content">
|
||||
<div class="{$component}-text text">
|
||||
{block 'article_content_text'}
|
||||
{if $isList}
|
||||
{$article->getTextShort()}
|
||||
{else}
|
||||
{$article->getText()}
|
||||
{/if}
|
||||
{else}
|
||||
{$article->getText()}
|
||||
{/if}
|
||||
{/block}
|
||||
{/block}
|
||||
</div>
|
||||
|
||||
{* Кат *}
|
||||
{if $article->getTextShort() != $article->getText()}
|
||||
{include 'components/button/button.tpl'
|
||||
classes = "{$component}-cut"
|
||||
url = "{$article->getUrl()}#cut"
|
||||
text = "{$article->getCutText()|default:$aLang.topic.read_more}"}
|
||||
{/if}
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,40 +6,71 @@
|
|||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
.block { background: #fff; margin-bottom: 30px; }
|
||||
.block:last-child { margin-bottom: 0; }
|
||||
|
||||
.block .text { font-size: 13px; line-height: 18px; }
|
||||
.block .max-height-200 { overflow: auto; max-height: 200px; position: relative; }
|
||||
.block {
|
||||
background: #fff;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.block:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.block .text {
|
||||
font-size: 13px;
|
||||
line-height: 18px;
|
||||
}
|
||||
.block .max-height-200 {
|
||||
overflow: auto;
|
||||
max-height: 200px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* Шапка */
|
||||
.block-header { padding: 18px 20px 0; position: relative; }
|
||||
.block-header .block-title { margin-bottom: 0; font-size: 16px; line-height: 1em; font-weight: normal; }
|
||||
.block-header {
|
||||
padding: 18px 20px 0;
|
||||
position: relative;
|
||||
}
|
||||
.block-header .block-title {
|
||||
margin-bottom: 0;
|
||||
font-size: 16px;
|
||||
line-height: 1em;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
/* Навигация */
|
||||
.block .tab-list {
|
||||
padding: 20px;
|
||||
margin-bottom: 0;
|
||||
border-bottom: 1px solid #eee;
|
||||
padding: 20px;
|
||||
margin-bottom: 0;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
/* Контент */
|
||||
.block-content { padding: 20px; }
|
||||
.block-content {
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
/* Подвал */
|
||||
.block-footer { border-top: 1px solid #eee; padding: 15px 20px; font-size: 12px; }
|
||||
.block-footer .search-form { padding: 0; margin: 5px 0; }
|
||||
.block-footer {
|
||||
border-top: 1px solid #eee;
|
||||
padding: 15px 20px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.block-footer .search-form {
|
||||
padding: 0;
|
||||
margin: 5px 0;
|
||||
}
|
||||
|
||||
/* Кнопка обновления блока */
|
||||
.block-update {
|
||||
position: absolute;
|
||||
top: 19px;
|
||||
right: 15px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background: url(../images/update.gif) no-repeat; cursor: pointer;
|
||||
position: absolute;
|
||||
top: 19px;
|
||||
right: 15px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
background: url(../images/update.gif) no-repeat;
|
||||
cursor: pointer;
|
||||
}
|
||||
.block-update.active {
|
||||
background-position: -16px 0;
|
||||
}
|
||||
.block-update.active { background-position: -16px 0; }
|
||||
|
||||
/**
|
||||
* @modifier nopadding Блок без отступов у контента
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
{$blog = $smarty.local.blog}
|
||||
|
||||
<form method="post" enctype="multipart/form-data" class="js-form-validate">
|
||||
<form method="post" enctype="multipart/form-data" class="js-blog-add js-form-validate">
|
||||
{hook run='form_add_blog_begin'}
|
||||
|
||||
{* Название блога *}
|
||||
|
|
@ -35,6 +35,7 @@
|
|||
name = 'blog_type'
|
||||
label = $aLang.blog.add.fields.type.label
|
||||
note = $aLang.blog.add.fields.type.note_open
|
||||
classes = 'js-blog-add-field-type'
|
||||
inputClasses = 'width-200 js-blog-add-type'
|
||||
selectedValue = $_aRequest.blog_type
|
||||
items = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{**
|
||||
* Статистика по пользователям
|
||||
* Фильтр блогов
|
||||
*}
|
||||
|
||||
{extends 'components/block/block.tpl'}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{**
|
||||
* Блок со списоком блогов
|
||||
* Блок со списком блогов
|
||||
*}
|
||||
|
||||
{extends 'components/block/block.tpl'}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
/**
|
||||
* Форма добавления блога
|
||||
*
|
||||
* @module ls/blog/add
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.lsBlogAdd", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
options: {
|
||||
// Селекторы
|
||||
selectors: {
|
||||
type: '.js-blog-add-type',
|
||||
type_note: '.js-blog-add-field-type .js-field-note',
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Конструктор
|
||||
*
|
||||
* @constructor
|
||||
* @private
|
||||
*/
|
||||
_create: function () {
|
||||
var _this = this;
|
||||
|
||||
this.elements = {
|
||||
type: this.element.find( this.option( 'selectors.type' ) ),
|
||||
type_note: this.element.find( this.option( 'selectors.type_note' ) )
|
||||
};
|
||||
|
||||
// Подгрузка информации о выбранном типе блога при создании блога
|
||||
this.elements.type.on( 'change' + this.eventNamespace, function () {
|
||||
_this.setTypeNote( $( this ).val() );
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
setTypeNote: function( type ) {
|
||||
this.elements.type_note.text( ls.lang.get( 'blog.add.fields.type.note_' + type ) );
|
||||
}
|
||||
});
|
||||
})(jQuery);
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.lsBlogInvites", $.livestreet.user_list_add, {
|
||||
$.widget( "livestreet.lsBlogInvites", $.livestreet.lsUserListAdd, {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
/**
|
||||
* Блоги
|
||||
*
|
||||
* @module ls/blogs
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
var ls = ls || {};
|
||||
|
||||
ls.blog = (function ($) {
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
var _defaults = {
|
||||
// Селекторы
|
||||
selectors: {
|
||||
addBlogSelectType: '.js-blog-add-type',
|
||||
blog_add_type_note: '#blog_type_note',
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Инициализация
|
||||
*
|
||||
* @param {Object} options Опции
|
||||
*/
|
||||
this.init = function(options) {
|
||||
var _this = this;
|
||||
|
||||
this.options = $.extend({}, _defaults, options);
|
||||
|
||||
this.elements = {
|
||||
blog_add_type_note: $(this.options.selectors.blog_add_type_note),
|
||||
};
|
||||
|
||||
// Подгрузка информации о выбранном типе блога при создании блога
|
||||
$(this.options.selectors.addBlogSelectType).on('change', function (e) {
|
||||
_this.loadInfoType($(this).val());
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Отображение информации о типе блога
|
||||
*/
|
||||
this.loadInfoType = function(type) {
|
||||
this.elements.blog_add_type_note.text(ls.lang.get('blog.add.fields.type.note_' + type));
|
||||
};
|
||||
|
||||
return this;
|
||||
}).call(ls.blog || {},jQuery);
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
| `icon` | string | null | Класс иконки |
|
||||
| `classes` | string | null | Дополнительные классы (указываются через пробел) |
|
||||
| `mods` | string | null | Список классов-модификаторов (указываются через пробел) |
|
||||
| `attributes` | string | null | Атрибуты (указываются через пробел) |
|
||||
| `attributes` | array | null | Атрибуты |
|
||||
|
||||
|
||||
## Использование
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@
|
|||
|
||||
// Голосование за комментарий
|
||||
this.element.find('.js-vote-comment').livequery(function () {
|
||||
$(this).vote({
|
||||
$(this).lsVote({
|
||||
urls: {
|
||||
vote: aRouter['ajax'] + 'vote/comment/'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{**
|
||||
* Выбор блогов для чтения в ленте
|
||||
*
|
||||
* @styles css/blocks.css
|
||||
*}
|
||||
|
||||
{extends 'components/block/block.tpl'}
|
||||
|
|
@ -15,5 +13,5 @@
|
|||
{/block}
|
||||
|
||||
{block 'block_content'}
|
||||
{include 'components/feed/blogs.tpl' blogsJoined=$blogsJoined blogsSubscribed=$blogsSubscribed}
|
||||
{include '../blogs.tpl' blogsJoined=$blogsJoined blogsSubscribed=$blogsSubscribed}
|
||||
{/block}
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
{**
|
||||
* Выбор пользователей для чтения в ленте
|
||||
*
|
||||
* @styles css/blocks.css
|
||||
*}
|
||||
|
||||
{extends 'components/block/block.tpl'}
|
||||
|
|
@ -15,5 +13,5 @@
|
|||
{/block}
|
||||
|
||||
{block 'block_content'}
|
||||
{include 'components/feed/users.tpl' users=$users}
|
||||
{include '../users.tpl' users=$users}
|
||||
{/block}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* Captcha
|
||||
*
|
||||
* @module captcha
|
||||
* @module ls/captcha
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
|
|
@ -11,13 +11,13 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.captcha", {
|
||||
$.widget( "livestreet.lsCaptcha", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
options: {
|
||||
name: '',
|
||||
url: aRouter.ajax + 'captcha/'
|
||||
url: aRouter.ajax + 'captcha/'
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
@ -27,25 +27,25 @@
|
|||
* @private
|
||||
*/
|
||||
_create: function() {
|
||||
this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, 'captcha'));
|
||||
this.options = $.extend({}, this.options, ls.utils.getDataOptions(this.element, 'captcha'));
|
||||
|
||||
this._on({ click: this.update });
|
||||
|
||||
this.update();
|
||||
},
|
||||
|
||||
/**
|
||||
* Получает url каптчи
|
||||
*/
|
||||
getUrl: function () {
|
||||
return this.options.url + '?security_ls_key=' + LIVESTREET_SECURITY_KEY + '&n=' + Math.random() + '&name=' + this.options.name;
|
||||
},
|
||||
/**
|
||||
* Получает url каптчи
|
||||
*/
|
||||
getUrl: function () {
|
||||
return this.options.url + '?security_ls_key=' + LIVESTREET_SECURITY_KEY + '&n=' + Math.random() + '&name=' + this.options.name;
|
||||
},
|
||||
|
||||
/**
|
||||
* Обновляет каптчу
|
||||
*/
|
||||
update: function () {
|
||||
this.element.css('background-image', 'url(' + this.getUrl() + ')');
|
||||
}
|
||||
/**
|
||||
* Обновляет каптчу
|
||||
*/
|
||||
update: function () {
|
||||
this.element.css('background-image', 'url(' + this.getUrl() + ')');
|
||||
}
|
||||
});
|
||||
})(jQuery);
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<!doctype html>
|
||||
|
||||
{block 'layout_options'}{/block}
|
||||
{block 'layout_options' append}{/block}
|
||||
|
||||
{$sRTL = ( Config::Get('view.rtl') ) ? 'dir="rtl"' : ''}
|
||||
{$sLang = Config::Get('lang.current')}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* Подгрузка контента
|
||||
*
|
||||
* @module more
|
||||
* @module ls/more
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.more", {
|
||||
$.widget( "livestreet.lsMore", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
|
||||
// Кнопка подгрузки
|
||||
this.elements.more.livequery(function () {
|
||||
$( this ).more({
|
||||
$( this ).lsMore({
|
||||
url: _this.option( 'urls.search' ),
|
||||
result: 'sText', // тут лучше на дефолтный sHtml заменить
|
||||
beforeload: function ( event, context ) {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
{extends 'layouts/layout.base.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{$bNoSidebar = true}
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = false}
|
||||
{/block}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,21 @@
|
|||
{**
|
||||
* Избранные теги пользователя.
|
||||
* Блок находится в профиле пользователя в разделе "Избранные топики".
|
||||
* Избранные теги пользователя
|
||||
*
|
||||
* @styles css/common.css
|
||||
* @param array $tags
|
||||
* @param object $user
|
||||
* @param object $activeTag
|
||||
*}
|
||||
|
||||
{$user = $smarty.local.user}
|
||||
{$activeTag = $smarty.local.activeTag}
|
||||
|
||||
{include 'components/tags/tag-cloud.tpl'
|
||||
tags = $aFavouriteTopicUserTags
|
||||
url = '{$oFavouriteUser->getUserWebPath()}favourites/topics/tag/{$tag->getText()|escape:\'url\'}/'
|
||||
active = $sFavouriteTag
|
||||
tags = $smarty.local.tags
|
||||
url = '{$user->getUserWebPath()}favourites/topics/tag/{$tag->getText()|escape:\'url\'}/'
|
||||
active = $activeTag
|
||||
assign = tags}
|
||||
|
||||
{include 'components/accordion/accordion.tpl' classes='js-tags-favourite-accordion' items=[[
|
||||
'title' => "{lang 'favourite_tags.title'} {if $sFavouriteTag}({$sFavouriteTag}){/if}",
|
||||
'title' => "{lang 'favourite_tags.title'} {if $activeTag}({$activeTag}){/if}",
|
||||
'content' => $tags
|
||||
]]}
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
{**
|
||||
* Список тегов
|
||||
*
|
||||
* @styles css/common.css
|
||||
*}
|
||||
|
||||
{extends 'components/tags/tags.tpl'}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* Добавление / удаление пользователей из личных сообщений
|
||||
*
|
||||
* @module message_users
|
||||
* @module ls/talk/users
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.message_users", $.livestreet.user_list_add, {
|
||||
$.widget( "livestreet.lsTalkUsers", $.livestreet.lsUserListAdd, {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
@ -13,13 +13,6 @@ var ls = ls || {};
|
|||
ls.talk = (function ($) {
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
var defaults = {
|
||||
|
||||
};
|
||||
|
||||
/**
|
||||
* Инициализация
|
||||
*
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
/**
|
||||
* Toolbar
|
||||
*
|
||||
* @module toolbar
|
||||
*
|
||||
* @module ls/toolbar
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
$.widget( "livestreet.toolbar", {
|
||||
$.widget( "livestreet.lsToolbar", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
/**
|
||||
* Всплывающие подсказки
|
||||
*
|
||||
* @module tooltip
|
||||
* @module ls/tooltip
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
* @author Denis Shakhov <denis.shakhov@gmail.com>
|
||||
*/
|
||||
|
||||
$.widget( "livestreet.tooltip", {
|
||||
$.widget( "livestreet.lsTooltip", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -34,8 +34,9 @@
|
|||
/**
|
||||
* Содержимое топика
|
||||
*/
|
||||
.article-content { margin-bottom: 20px; }
|
||||
.article-content.text { color: #333; font-size: 15px; line-height: 1.6em; }
|
||||
.article-content { margin-bottom: 20px; }
|
||||
.article-text.text { color: #333; font-size: 15px; line-height: 1.6em; }
|
||||
.article-cut { margin-top: 10px; }
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
this.element.find( this.option( 'selectors.favourite' ) ).lsTopicFavourite();
|
||||
|
||||
// Голосование за топик
|
||||
this.element.find( this.option( 'selectors.vote' ) ).vote({
|
||||
this.element.find( this.option( 'selectors.vote' ) ).lsVote({
|
||||
urls: {
|
||||
vote: aRouter.ajax + 'vote/topic/',
|
||||
info: aRouter.ajax + 'vote/get/info/topic'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* Пополняемый список пользователей
|
||||
*
|
||||
* @module ls/user_list_add
|
||||
* @module ls/user-list-add
|
||||
*
|
||||
* @license GNU General Public License, version 2
|
||||
* @copyright 2013 OOO "ЛС-СОФТ" {@link http://livestreetcms.com}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.user_list_add", {
|
||||
$.widget( "livestreet.lsUserListAdd", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
(function($) {
|
||||
"use strict";
|
||||
|
||||
$.widget( "livestreet.vote", {
|
||||
$.widget( "livestreet.lsVote", {
|
||||
/**
|
||||
* Дефолтные опции
|
||||
*/
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
if ( ! this.element.hasClass(this.options.classes.voted) ) {
|
||||
this._on( this.elements.items, {
|
||||
'click': function (e) {
|
||||
_this.vote( $(e.currentTarget).data('vote-value') );
|
||||
_this.lsVote( $(e.currentTarget).data('vote-value') );
|
||||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
this.elements.items.removeAttr('title');
|
||||
|
||||
// Иниц-ия тултипа
|
||||
this.info().tooltip('show');
|
||||
this.info().lsTooltip('show');
|
||||
}
|
||||
}.bind(this));
|
||||
},
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
info: function () {
|
||||
if ( ! this.options.urls.info ) return $();
|
||||
|
||||
return this.element.tooltip($.extend({}, {
|
||||
return this.element.lsTooltip($.extend({}, {
|
||||
ajax: {
|
||||
url: this.options.urls.info,
|
||||
params: this.options.params
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
this.userId = this.getUserId();
|
||||
|
||||
// Подгрузка новых постов
|
||||
this.elements.more.more({
|
||||
this.elements.more.lsMore({
|
||||
url: this.option( 'urls.load' ),
|
||||
params: {
|
||||
user_id: this.getUserId()
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
|
||||
// Подгрузка комментариев
|
||||
this.elements.more_comments.livequery( function () {
|
||||
$( this ).more({
|
||||
$( this ).lsMore({
|
||||
url: _this.option( 'urls.load_comments' ),
|
||||
params: {
|
||||
user_id: _this.getUserId()
|
||||
|
|
|
|||
11
application/frontend/skin/developer/layouts/layout.admin.tpl
Normal file
11
application/frontend/skin/developer/layouts/layout.admin.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{**
|
||||
* Базовый шаблон админки
|
||||
*}
|
||||
|
||||
{extends './layout.base.tpl'}
|
||||
|
||||
{block 'layout_page_title'}
|
||||
<a href="{router page='admin'}">{lang 'admin.title'}</a>
|
||||
<span>»</span>
|
||||
{block 'layout_admin_page_title'}{/block}
|
||||
{/block}
|
||||
|
|
@ -4,6 +4,10 @@
|
|||
|
||||
{extends 'components/layout/layout.tpl'}
|
||||
|
||||
{block 'layout_options' append}
|
||||
{$layoutShowSidebar = $layoutShowSidebar|default:true}
|
||||
{/block}
|
||||
|
||||
{block 'layout_head_styles' append}
|
||||
<link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
|
||||
{/block}
|
||||
|
|
@ -76,7 +80,7 @@
|
|||
{**
|
||||
* Основной контэйнер
|
||||
*}
|
||||
<div id="container" class="grid-row grid-role-container {hook run='container_class'} {if $bNoSidebar}no-sidebar{/if}">
|
||||
<div id="container" class="grid-row grid-role-container {hook run='container_class'} {if ! $layoutShowSidebar}no-sidebar{/if}">
|
||||
{* Вспомогательный контейнер-обертка *}
|
||||
<div class="grid-row grid-role-wrapper" class="{hook run='wrapper_class'}">
|
||||
{**
|
||||
|
|
@ -131,7 +135,7 @@
|
|||
{**
|
||||
* Сайдбар
|
||||
*}
|
||||
{if ! $bNoSidebar}
|
||||
{if $layoutShowSidebar}
|
||||
<aside class="grid-col grid-col-4 grid-role-sidebar" role="complementary">
|
||||
{include 'blocks.tpl' group='right'}
|
||||
</aside>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
{extends './layout.user.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'messages'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
{extends './layout.user.tpl'}
|
||||
|
||||
{block 'layout_options'}
|
||||
{block 'layout_options' append}
|
||||
{$sNav = 'settings'}
|
||||
{/block}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue