1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-06-26 11:40:48 +03:00

Добавлена возможность изменять ширину шаблона через конфиг (резина\фиксированная ширина)

This commit is contained in:
Denis Shakhov 2012-07-08 15:51:14 +07:00
parent 4adbac6512
commit 3abd133433
9 changed files with 148 additions and 81 deletions

View file

@ -2,7 +2,7 @@
СЕТКА
-------------------------------------------- */
#container { width: 1000px; margin: 0 auto; margin-bottom: 20px; }
#container { margin: 0 auto; margin-bottom: 20px; }
#header { padding: 50px 0; position: relative; }
#nav { margin-bottom: 15px; overflow: hidden; }
#wrapper { overflow: hidden; zoom: 1; padding: 30px; background: #fff; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 3px rgba(0,0,0,.1); box-shadow: 0 0 3px rgba(0,0,0,.1); }

View file

@ -64,6 +64,22 @@
</script>
{if {cfg name='view.grid.type'} == 'fluid'}
<style>
{literal} #container { {/literal}
min-width: {cfg name='view.grid.fluid_min_width'}px;
max-width: {cfg name='view.grid.fluid_max_width'}px;
{literal} } {/literal}
</style>
{else}
<style>
{literal} #container { {/literal}
width: {cfg name='view.grid.fixed_width'}px;
{literal} } {/literal}
</style>
{/if}
{hook run='html_head_end'}
</head>
@ -86,7 +102,10 @@
{add_block group='toolbar' name='toolbar_admin.tpl' priority=100}
{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100}
<body class="{$body_classes}">
<body class="{$body_classes} width-{cfg name='view.grid.type'}">
{hook run='body_begin'}

View file

@ -4,6 +4,23 @@ $config = array();
$config['view']['theme'] = 'default';
/* Grid type:
*
* fluid - резина
* fixed - фиксированная ширина
*/
$config['view']['grid']['type'] = 'fixed';
/* Fluid settings */
$config['view']['grid']['fluid_min_width'] = 1000;
$config['view']['grid']['fluid_max_width'] = 1400;
/* Fixed settings */
$config['view']['grid']['fixed_width'] = 1000;
$config['head']['default']['js'] = Config::Get('head.default.js');
$config['head']['default']['js'][] = '___path.static.skin___/js/template.js';

View file

@ -2,9 +2,9 @@
СЕТКА
-------------------------------------------- */
#container { width: 976px; margin: 0 auto; margin-bottom: 20px; }
#header-wrapper { background: #090909; min-width: 976px; }
#header { width: 706px; height: 51px; margin: 0 auto; position: relative; padding-right: 270px; }
#container { margin: 0 auto; margin-bottom: 20px; padding: 0 48px; }
#header-back { position: absolute; top: 0; left: 0; width: 100%; height: 51px; background: #090909; }
#header { background: #090909; height: 51px; margin: 0 auto; position: relative; padding-right: 270px; }
#nav {
min-height: 26px;
margin-bottom: 32px;
@ -22,18 +22,14 @@
background: -ms-linear-gradient(top, #fdfdfd 0%,#f6f8f9 100%);
background: linear-gradient(top, #fdfdfd 0%,#f6f8f9 100%);
}
#wrapper { width: 933px; overflow: hidden; zoom: 1; padding: 20px 16px 20px 27px; margin-bottom: 60px; background: #fff url(../images/sidebar-border.png) 699px 0px repeat-y; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 5px rgba(0,0,0,.05); box-shadow: 0 0 5px rgba(0,0,0,.05); border-radius: 10px; }
#content { float: left; width: 635px; min-height: 1px; margin-right: 55px; background: #fff; position: relative; }
#sidebar { float: left; width: 240px; }
#wrapper { overflow: hidden; zoom: 1; padding: 20px 16px 20px 27px; margin-bottom: 60px; background: #fff url(../images/sidebar-border.png) 100% 0px repeat-y; border-bottom: 1px solid #eee; -webkit-box-shadow: 0 0 5px rgba(0,0,0,.05); box-shadow: 0 0 5px rgba(0,0,0,.05); border-radius: 10px; }
#content { min-height: 1px; margin-right: 295px; background: #fff; position: relative; }
#sidebar { float: right; width: 240px; }
#footer { overflow: hidden; zoom: 1; margin-bottom: 20px; padding: 0 0 50px 30px; font-size: 11px; }
#wrapper.no-sidebar { background-image: none; }
#wrapper.no-sidebar #content { width: 100%; margin-right: 0; }
#container.toolbar-margin #wrapper { width: 885px; background-position: 651px 0px; }
#container.toolbar-margin #wrapper #content { width: 587px; }
#container.toolbar-margin #wrapper #sidebar { width: 240px; }
#container.toolbar-margin #footer { padding-right: 50px; }
#content.content-right { margin-right: 0; float: none; margin-left: 311px; width: auto; }
#container.toolbar-margin { padding: 0; }
#container.toolbar-margin #wrapper { margin-right: 48px; }

View file

@ -1,9 +1,5 @@
{hook run='content_end'}
</div> <!-- /content -->
{if !$noSidebar}
{include file='sidebar.tpl'}
{/if}
</div> <!-- /wrapper -->

View file

@ -66,6 +66,22 @@
</script>
{if {cfg name='view.grid.type'} == 'fluid'}
<style>
{literal} #container { {/literal}
min-width: {cfg name='view.grid.fluid_min_width'}px;
max-width: {cfg name='view.grid.fluid_max_width'}px;
{literal} } {/literal}
</style>
{else}
<style>
{literal} #container { {/literal}
width: {cfg name='view.grid.fixed_width'}px;
{literal} } {/literal}
</style>
{/if}
{hook run='html_head_end'}
</head>
@ -88,7 +104,7 @@
{add_block group='toolbar' name='toolbar_admin.tpl' priority=100}
{add_block group='toolbar' name='toolbar_scrollup.tpl' priority=-100}
<body class="{$body_classes}">
<body class="{$body_classes} width-{cfg name='view.grid.type'}"">
{hook run='body_begin'}
@ -100,12 +116,19 @@
{/if}
{include file='header_top.tpl'}
<div id="header-back"></div>
<div id="container" class="{hook run='container_class'}">
{include file='header_top.tpl'}
{include file='nav.tpl'}
<div id="wrapper" class="{if $noSidebar}no-sidebar{/if}{hook run='wrapper_class'}">
{if !$noSidebar}
{include file='sidebar.tpl'}
{/if}
<div id="content" role="main" {if $sidebarPosition == 'left'}class="content-profile"{/if} {if $sMenuItemSelect=='profile'}itemscope itemtype="http://data-vocabulary.org/Person"{/if}>
{include file='nav_content.tpl'}
{include file='system_message.tpl'}

View file

@ -1,63 +1,61 @@
<div id="header-wrapper">
<header id="header" role="banner">
{hook run='header_banner_begin'}
<h1 class="site-name"><a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a></h1>
<ul class="nav nav-main" id="nav-main">
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{cfg name='path.root.web'}">{$aLang.topic_title}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='stream'}class="active"{/if}><a href="{router page='stream'}">{$aLang.stream_menu}</a> <i></i></li>
<header id="header" role="banner">
{hook run='header_banner_begin'}
<h1 class="site-name"><a href="{cfg name='path.root.web'}">{cfg name='view.name'}</a></h1>
<ul class="nav nav-main" id="nav-main">
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{cfg name='path.root.web'}">{$aLang.topic_title}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a> <i></i></li>
<li {if $sMenuHeadItemSelect=='stream'}class="active"{/if}><a href="{router page='stream'}">{$aLang.stream_menu}</a> <i></i></li>
{hook run='main_menu_item'}
</ul>
{hook run='main_menu'}
{hook run='userbar_nav'}
{if $oUserCurrent}
<div class="dropdown-user" id="dropdown-user">
<a href="{$oUserCurrent->getUserWebPath()}"><img src="{$oUserCurrent->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$oUserCurrent->getUserWebPath()}" class="username">{$oUserCurrent->getLogin()}</a>
<div class="dropdown-user-shadow"></div>
<div class="dropdown-user-trigger" id="dropdown-user-trigger"><i></i></div>
<ul class="dropdown-user-menu" id="dropdown-user-menu" style="display: none">
<li class="item-stat">
<span class="rating {if $oUserCurrent->getRating() < 0}negative{/if}"><i class="icon-synio-star-green"></i> {$oUserCurrent->getRating()}</span>
<span class="strength"><i class="icon-synio-strength"></i> {$oUserCurrent->getSkill()}</span>
{hook run='userbar_stat_item'}
</li>
{hook run='userbar_item_first'}
<li class="item-messages">
<a href="{router page='talk'}" id="new_messages">
<i class="item-icon"></i>
{$aLang.user_privat_messages}
{if $iUserCurrentCountTalkNew}<div class="new">+{$iUserCurrentCountTalkNew}</div>{/if}
</a>
</li>
<li class="item-profile"><i class="item-icon"></i><a href="{$oUserCurrent->getUserWebPath()}">{$aLang.footer_menu_user_profile}</a></li>
<li class="item-settings"><i class="item-icon"></i><a href="{router page='settings'}profile/">{$aLang.user_settings}</a></li>
<li class="item-create"><i class="item-icon"></i><a href="{router page='topic'}add/">{$aLang.block_create}</a></li>
{hook run='userbar_item_last'}
<li class="item-signout"><i class="item-icon"></i><a href="{router page='login'}exit/?security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.exit}</a></li>
</ul>
</div>
{else}
<ul class="auth">
{hook run='userbar_item'}
<li><a href="{router page='registration'}" class="js-registration-form-show">{$aLang.registration_submit}</a></li>
<li><a href="{router page='login'}" class="js-login-form-show sign-in">{$aLang.user_login_submit}</a></li>
{hook run='main_menu_item'}
</ul>
{hook run='main_menu'}
{hook run='userbar_nav'}
{if $oUserCurrent}
<div class="dropdown-user" id="dropdown-user">
<a href="{$oUserCurrent->getUserWebPath()}"><img src="{$oUserCurrent->getProfileAvatarPath(48)}" alt="avatar" class="avatar" /></a>
<a href="{$oUserCurrent->getUserWebPath()}" class="username">{$oUserCurrent->getLogin()}</a>
<div class="dropdown-user-shadow"></div>
<div class="dropdown-user-trigger" id="dropdown-user-trigger"><i></i></div>
<ul class="dropdown-user-menu" id="dropdown-user-menu" style="display: none">
<li class="item-stat">
<span class="rating {if $oUserCurrent->getRating() < 0}negative{/if}"><i class="icon-synio-star-green"></i> {$oUserCurrent->getRating()}</span>
<span class="strength"><i class="icon-synio-strength"></i> {$oUserCurrent->getSkill()}</span>
{hook run='userbar_stat_item'}
</li>
{hook run='userbar_item_first'}
<li class="item-messages">
<a href="{router page='talk'}" id="new_messages">
<i class="item-icon"></i>
{$aLang.user_privat_messages}
{if $iUserCurrentCountTalkNew}<div class="new">+{$iUserCurrentCountTalkNew}</div>{/if}
</a>
</li>
<li class="item-profile"><i class="item-icon"></i><a href="{$oUserCurrent->getUserWebPath()}">{$aLang.footer_menu_user_profile}</a></li>
<li class="item-settings"><i class="item-icon"></i><a href="{router page='settings'}profile/">{$aLang.user_settings}</a></li>
<li class="item-create"><i class="item-icon"></i><a href="{router page='topic'}add/">{$aLang.block_create}</a></li>
{hook run='userbar_item_last'}
<li class="item-signout"><i class="item-icon"></i><a href="{router page='login'}exit/?security_ls_key={$LIVESTREET_SECURITY_KEY}">{$aLang.exit}</a></li>
</ul>
{/if}
{if $iUserCurrentCountTalkNew}<a href="{router page='talk'}" class="new-messages">+{$iUserCurrentCountTalkNew} <i class="icon-synio-new-message"></i></a>{/if}
{hook run='header_banner_end'}
</header>
</div>
</div>
{else}
<ul class="auth">
{hook run='userbar_item'}
<li><a href="{router page='registration'}" class="js-registration-form-show">{$aLang.registration_submit}</a></li>
<li><a href="{router page='login'}" class="js-login-form-show sign-in">{$aLang.user_login_submit}</a></li>
</ul>
{/if}
{if $iUserCurrentCountTalkNew}<a href="{router page='talk'}" class="new-messages">+{$iUserCurrentCountTalkNew} <i class="icon-synio-new-message"></i></a>{/if}
{hook run='header_banner_end'}
</header>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 936 B

After

Width:  |  Height:  |  Size: 937 B

View file

@ -4,10 +4,28 @@ $config = array();
// Максимальная вложенность комментов при отображении
$config['module']['comment']['max_tree'] = 5;
// Ограничение на вывод числа друзей пользователя на странице его профиля
$config['module']['user']['friend_on_profile'] = 18;
$config['view']['theme'] = 'default';
/* Grid type:
*
* fluid - резина
* fixed - фиксированная ширина
*/
$config['view']['grid']['type'] = 'fixed';
/* Fluid settings */
$config['view']['grid']['fluid_min_width'] = 976; // Min - 976px
$config['view']['grid']['fluid_max_width'] = 1300;
/* Fixed settings */
$config['view']['grid']['fixed_width'] = 976;
$config['head']['default']['js'] = Config::Get('head.default.js');
$config['head']['default']['js'][] = '___path.static.skin___/js/template.js';