1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-17 07:10:48 +03:00

Из основного шаблона layout удалена переменная layoutShowSidebar

Сайдбар теперь автоматом скрывается если нет блоков
This commit is contained in:
Denis Shakhov 2014-12-24 17:02:52 +07:00
parent a6b19816a5
commit 7d58820f2a
26 changed files with 148 additions and 222 deletions

View file

@ -6,10 +6,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{lang 'admin.title'}
{/block}

View file

@ -6,10 +6,6 @@
{extends 'layouts/layout.admin.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_admin_page_title'}
{lang 'admin.items.plugins'}
{/block}

View file

@ -10,8 +10,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{if $sEvent == 'edit'}
{$sNav = 'blog.edit'}
{/if}

View file

@ -9,11 +9,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{* Показываем сайдбар только для закрытых блогов *}
{if $blogEdit->getType() != 'close'}
{$layoutShowSidebar = false}
{/if}
{$sNav = 'blog.edit'}
{/block}

View file

@ -9,10 +9,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = Config::Get( 'view.topic_show_sidebar' )}
{/block}
{block 'layout_content'}
{* Топик *}
{include 'components/topic/topic.tpl' topic=$topic}

View file

@ -9,10 +9,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.blog.users.readers_all} ({$countBlogUsers}):
<a href="{$blog->getUrlFull()}">{$blog->getTitle()|escape}</a>

View file

@ -8,7 +8,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{$sNav = 'create'}
{/block}

View file

@ -5,8 +5,7 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{$bNoSystemMessages = true}
{$layoutShowSystemMessages = false}
{/block}
{block 'layout_page_title'}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.login.title}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reset.title}
{/block}

View file

@ -5,10 +5,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reset.title}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.notices.success_activate}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.confirm.title}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.registration.title}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.invite.title}
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.auth.reactivation.title}
{/block}

View file

@ -10,10 +10,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
{$aLang.search.search}
{/block}

View file

@ -5,8 +5,7 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{$bNoSystemMessages = true}
{$layoutShowSystemMessages = false}
{/block}
{block 'layout_content'}

View file

@ -8,7 +8,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{$sNav = 'activity'}
{/block}

View file

@ -7,10 +7,6 @@
{extends 'layouts/layout.user.messages.tpl'}
{block 'layout_options' append}
{$bNoSystemMessages = false}
{/block}
{block 'layout_content'}
{include 'components/talk/talk-search-form.tpl'}
{include 'components/talk/talk-list.tpl' talks=$talks paging=$paging selectable=true}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
Component <span>editor</span>
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
Component <span>field</span>
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
Component <span>search-form</span>
{/block}

View file

@ -4,10 +4,6 @@
{extends 'layouts/layout.base.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = false}
{/block}
{block 'layout_page_title'}
Component <span>tabs</span>
{/block}

View file

@ -1,174 +1,186 @@
{**
*
* Основной лэйаут
*
* @param string $layoutNavContent Название навигации
* @param string $layoutNavContentPath Кастомный путь до навигации контента
* @param string $layoutShowSystemMessages Кастомный путь до навигации контента
*}
{extends 'components/layout/layout.tpl'}
{block 'layout_options' append}
{$layoutShowSidebar = $layoutShowSidebar|default:true}
{$layoutShowSystemMessages = $layoutShowSystemMessages|default:true}
{* Получаем блоки для вывода в сайдбаре *}
{include 'blocks.tpl' group='right' assign=layoutSidebarBlocks}
{$layoutSidebarBlocks = trim( $layoutSidebarBlocks )}
{/block}
{block 'layout_head_styles' append}
<link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset=latin,cyrillic' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Open+Sans:300,400,700&amp;subset=latin,cyrillic' rel='stylesheet' type='text/css'>
{/block}
{block 'layout_head' append}
<script>
ls.lang.load({json var = $aLangJs});
ls.lang.load({lang_load name="comments.comments_declension, comments.unsubscribe, comments.subscribe, comments.folding.unfold, comments.folding.fold, comments.folding.unfold_all, comments.folding.fold_all, poll.notices.error_answers_max, blog.blog, favourite.add, favourite.remove, field.geo.select_city, field.geo.select_region, blog.add.fields.type.note_open, blog.add.fields.type.note_close, common.success.add, common.success.remove, pagination.notices.first, pagination.notices.last, user.actions.unfollow, user.actions.follow, user.friends.status.added, user.friends.status.notfriends, user.friends.status.pending, user.friends.status.rejected, user.friends.status.sent, user.friends.status.linked, blog.blocks.navigator.blog, user.settings.profile.notices.error_max_userfields, common.remove_confirm"});
<script>
ls.lang.load({json var = $aLangJs});
ls.lang.load({lang_load name="comments.comments_declension, comments.unsubscribe, comments.subscribe, comments.folding.unfold, comments.folding.fold, comments.folding.unfold_all, comments.folding.fold_all, poll.notices.error_answers_max, blog.blog, favourite.add, favourite.remove, field.geo.select_city, field.geo.select_region, blog.add.fields.type.note_open, blog.add.fields.type.note_close, common.success.add, common.success.remove, pagination.notices.first, pagination.notices.last, user.actions.unfollow, user.actions.follow, user.friends.status.added, user.friends.status.notfriends, user.friends.status.pending, user.friends.status.rejected, user.friends.status.sent, user.friends.status.linked, blog.blocks.navigator.blog, user.settings.profile.notices.error_max_userfields, common.remove_confirm"});
ls.registry.set({json var = $aVarsJs});
ls.registry.set('comment_max_tree', {json var=Config::Get('module.comment.max_tree')});
ls.registry.set('block_stream_show_tip', {json var=Config::Get('block.stream.show_tip')});
</script>
ls.registry.set({json var = $aVarsJs});
ls.registry.set('comment_max_tree', {json var=Config::Get('module.comment.max_tree')});
ls.registry.set('block_stream_show_tip', {json var=Config::Get('block.stream.show_tip')});
</script>
{**
* Тип сетки сайта
*}
{if {cfg name='view.grid.type'} == 'fluid'}
<style>
.grid-role-userbar,
.grid-role-nav .nav--main,
.grid-role-header .site-info,
.grid-role-container {
min-width: {cfg name='view.grid.fluid_min_width'};
max-width: {cfg name='view.grid.fluid_max_width'};
}
</style>
{else}
<style>
.grid-role-userbar,
.grid-role-nav .nav--main,
.grid-role-header .site-info,
.grid-role-container { width: {cfg name='view.grid.fixed_width'}; }
</style>
{/if}
{**
* Тип сетки сайта
*}
{if {cfg name='view.grid.type'} == 'fluid'}
<style>
.grid-role-userbar,
.grid-role-nav .nav--main,
.grid-role-header .site-info,
.grid-role-container {
min-width: {cfg name='view.grid.fluid_min_width'};
max-width: {cfg name='view.grid.fluid_max_width'};
}
</style>
{else}
<style>
.grid-role-userbar,
.grid-role-nav .nav--main,
.grid-role-header .site-info,
.grid-role-container { width: {cfg name='view.grid.fixed_width'}; }
</style>
{/if}
{/block}
{block 'layout_body'}
{**
* Юзербар
*}
{include 'components/userbar/userbar.tpl'}
{**
* Юзербар
*}
{include 'components/userbar/userbar.tpl'}
{**
* Шапка
*}
{if Config::Get( 'view.layout_show_banner' )}
<header class="grid-row grid-role-header" role="banner">
{hook run='header_banner_begin'}
{**
* Шапка
*}
{if Config::Get( 'view.layout_show_banner' )}
<header class="grid-row grid-role-header" role="banner">
{hook run='header_banner_begin'}
<div class="site-info">
<h1 class="site-name"><a href="{router page='/'}">{cfg name='view.name'}</a></h1>
<h2 class="site-description">{cfg name='view.description'}</h2>
</div>
<div class="site-info">
<h1 class="site-name"><a href="{router page='/'}">{cfg name='view.name'}</a></h1>
<h2 class="site-description">{cfg name='view.description'}</h2>
</div>
{hook run='header_banner_end'}
</header>
{/if}
{hook run='header_banner_end'}
</header>
{/if}
{**
* Основная навигация
*}
<nav class="grid-row grid-role-nav">
{include 'navs/nav.main.tpl'}
</nav>
{**
* Основная навигация
*}
<nav class="grid-row grid-role-nav">
{include 'navs/nav.main.tpl'}
</nav>
{**
* Основной контэйнер
*}
<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'}">
{**
* Контент
*}
<div class="grid-col grid-col-8 grid-role-content"
role="main"
{if $sMenuItemSelect == 'profile'}itemscope itemtype="http://data-vocabulary.org/Person"{/if}>
{**
* Основной контэйнер
*}
<div id="container" class="grid-row grid-role-container {hook run='container_class'} {if ! $layoutSidebarBlocks}no-sidebar{/if}">
{* Вспомогательный контейнер-обертка *}
<div class="grid-row grid-role-wrapper" class="{hook run='wrapper_class'}">
{**
* Контент
*}
<div class="grid-col grid-col-8 grid-role-content"
role="main"
{if $sMenuItemSelect == 'profile'}itemscope itemtype="http://data-vocabulary.org/Person"{/if}>
{hook run='content_begin'}
{hook run='content_begin'}
{* Основной заголовок страницы *}
{block 'layout_page_title' hide}
{* TODO: Временный фикс *}
<h2 class="page-header">
{$smarty.block.child}
</h2>
{*include 'components/page-header/page-header.tpl' text="{$smarty.block.child}"*}
{/block}
{* Основной заголовок страницы *}
{block 'layout_page_title' hide}
{* TODO: Временный фикс *}
<h2 class="page-header">
{$smarty.block.child}
</h2>
{*include 'components/page-header/page-header.tpl' text="{$smarty.block.child}"*}
{/block}
{block 'layout_content_header'}
{* Навигация *}
{if $sNav}
<div class="nav-group">
{if $sNav}
{if in_array($sNav, $aMenuContainers)}
{$aMenuFetch.$sNav}
{else}
{include "{$sNavPath}navs/nav.$sNav.tpl"}
{/if}
{/if}
</div>
{/if}
{block 'layout_content_header'}
{* Навигация *}
{if $sNav}
{if in_array($sNav, $aMenuContainers)}
{$_navContent = $aMenuFetch.$sNav}
{else}
{include "{$sNavPath}navs/nav.$sNav.tpl" assign=_navContent}
{/if}
{* Системные сообщения *}
{if ! $bNoSystemMessages}
{if $aMsgError}
{include 'components/alert/alert.tpl' text=$aMsgError mods='error' close=true}
{/if}
{* Проверяем наличие вывода на случай если меню с одним пунктом автоматом скрывается *}
{if $_navContent|strip:''}
<div class="nav-group">
{$_navContent}
</div>
{/if}
{/if}
{if $aMsgNotice}
{include 'components/alert/alert.tpl' text=$aMsgNotice close=true}
{/if}
{/if}
{/block}
{* Системные сообщения *}
{if $layoutShowSystemMessages}
{if $aMsgError}
{include 'components/alert/alert.tpl' text=$aMsgError mods='error' close=true}
{/if}
{block 'layout_content'}{/block}
{if $aMsgNotice}
{include 'components/alert/alert.tpl' text=$aMsgNotice close=true}
{/if}
{/if}
{/block}
{hook run='content_end'}
</div>
{block 'layout_content'}{/block}
{**
* Сайдбар
*}
{if $layoutShowSidebar}
<aside class="grid-col grid-col-4 grid-role-sidebar" role="complementary">
{include 'blocks.tpl' group='right'}
</aside>
{/if}
</div> {* /wrapper *}
{hook run='content_end'}
</div>
{**
* Сайдбар
* Показываем сайдбар только если есть добавленные блоки
*}
{if $layoutSidebarBlocks}
<aside class="grid-col grid-col-4 grid-role-sidebar" role="complementary">
{$layoutSidebarBlocks}
</aside>
{/if}
</div> {* /wrapper *}
{* Подвал *}
<footer class="grid-row grid-role-footer">
{block 'layout_footer'}
{hook run='footer_begin'}
{hook run='copyright'}
{hook run='footer_end'}
{/block}
</footer>
</div> {* /container *}
{* Подвал *}
<footer class="grid-row grid-role-footer">
{block 'layout_footer'}
{hook run='footer_begin'}
{hook run='copyright'}
{hook run='footer_end'}
{/block}
</footer>
</div> {* /container *}
{* Подключение модальных окон *}
{if $oUserCurrent}
{include 'components/tags-favourite/modal.favourite_tags.tpl'}
{else}
{include 'components/auth/modal.auth.tpl'}
{/if}
{* Подключение модальных окон *}
{if $oUserCurrent}
{include 'components/tags-favourite/modal.favourite_tags.tpl'}
{else}
{include 'components/auth/modal.auth.tpl'}
{/if}
{**
* Тулбар
* Добавление кнопок в тулбар
*}
{add_block group='toolbar' name='components/admin/toolbar.admin.tpl' priority=100}
{add_block group='toolbar' name='components/toolbar-scrollup/toolbar.scrollup.tpl' priority=-100}
{**
* Тулбар
* Добавление кнопок в тулбар
*}
{add_block group='toolbar' name='components/admin/toolbar.admin.tpl' priority=100}
{add_block group='toolbar' name='components/toolbar-scrollup/toolbar.scrollup.tpl' priority=-100}
{* Подключение тулбара *}
{include 'components/toolbar/toolbar.tpl'}
{* Подключение тулбара *}
{include 'components/toolbar/toolbar.tpl'}
{/block}

View file

@ -17,11 +17,8 @@ $config['view']['grid']['fluid_max_width'] = '1000px';
// Настройки фиксированная ширина
$config['view']['grid']['fixed_width'] = '1000px';
// Показывать сайдбар на странице топика или нет
$config['view']['topic_show_sidebar'] = false;
// Показывать баннер с лого и описанием или нет
$config['view']['layout_show_banner'] = true;
$config['view']['layout_show_banner'] = false;
// Подключение скриптов шаблона
$config['head']['default']['js'] = array_merge(Config::Get('head.default.js'), array(