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

Доработка и исправление багов в шаблоне

This commit is contained in:
Denis Shakhov 2012-04-12 21:13:49 +07:00
parent 94359f1559
commit d8ca5367fa
7 changed files with 10 additions and 7 deletions

View file

@ -201,6 +201,7 @@ return array(
'block_stream_comments_all' => 'All comment block',
'block_stream_topics_all' => 'All topics block',
'comments_all' => 'All comments',
'add_favourite_tags' => 'Add tags',
/**
* Topic menus
*/
@ -524,6 +525,7 @@ return array(
'profile_date_registration' => 'Registered at',
'profile_date_last' => 'Last visit',
'profile_social_contacts' => 'Contacts and social services',
'profile_add_friend' => 'Add friend',
/**
* UserFields
*/

View file

@ -201,6 +201,7 @@ return array(
'block_stream_comments_all' => 'Весь эфир',
'block_stream_topics_all' => 'Весь эфир',
'comments_all' => 'Прямой эфир',
'add_favourite_tags' => 'Добавить свои теги',
/**
* Меню топиков
*/
@ -524,6 +525,7 @@ return array(
'profile_date_registration' => 'Зарегистрирован',
'profile_date_last' => 'Последний визит',
'profile_social_contacts' => 'Контакты и социальные сервисы',
'profile_add_friend' => 'Добавить друга',
/**
* UserFields
*/

View file

@ -11,14 +11,13 @@
{elseif !$oUserFriend}
<div id="add_friend_form" class="modal">
<header class="modal-header">
<h3>{$aLang.user_authorization}</h3>
<h3>{$aLang.profile_add_friend}</h3>
<a href="#" class="close jqmClose"></a>
</header>
<form onsubmit="return ls.user.addFriend(this,{$oUserProfile->getId()},'add');" class="modal-content">
<p><label for="add_friend_text">{$aLang.user_friend_add_text_label}</label>
<textarea id="add_friend_text" rows="3" class="input-text input-width-full"></textarea></p>
<textarea id="add_friend_text" rows="3" class="input-text input-width-full"></textarea></p>
<button class="button button-primary">{$aLang.user_friend_add_submit}</button>
</form>

View file

@ -1 +1 @@
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 7px; margin-bottom: 0; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li:first-child { } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { font-weight: bold; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> */ .nav.nav-nested { height: 95px; margin: 0 0 50px 0; } .nav.nav-nested li { margin-right: 1px; position: relative; } .nav.nav-nested li a { background: #ddd; color: #333; padding: 7px 13px; } .nav.nav-nested li a:hover { background: #ccc; } .nav.nav-nested li.active > a { background: #333; color: #fff; } .nav.nav-nested ul { position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 4px; padding: 5px 12px; background: #eee; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills li.active a { background: #2375C6; color: #fff; } .nav.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; background: #eee; } .nav.nav-profile li a { padding: 7px 12px; border-radius: 0; } .nav.nav-profile li a:hover { background: #e5e5e5; } .nav.nav-profile li.active a { background: #333; color: #fff; }
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ------------------------------------------------- */ .nav { overflow: hidden; zoom: 1; } .nav li { float: left; } .nav li:last-child { border-right: none; } .nav li a { display: block; padding: 10px 15px; } .nav li a:hover { background: #f3f3f3; } .nav li.active a { background: #f3f3f3; } /* <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ #userbar { border: 1px solid #ddd; border-top: none; background: #ffffff; background: -moz-linear-gradient(top, #ffffff 0%, #f3f3f3 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f3f3f3)); background: -webkit-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -o-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: -ms-linear-gradient(top, #ffffff 0%,#f3f3f3 100%); background: linear-gradient(top, #ffffff 0%,#f3f3f3 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f3f3f3',GradientType=0 ); border-radius: 0 0 4px 4px; box-shadow: 0 0 5px #ddd; } #userbar .search { float: left; margin: 5px 0 0 7px; margin-bottom: 0; } .nav.nav-userbar { float: right; } .nav.nav-userbar li { border-radius: 0 0 0 4px; border-left: 1px solid #eaeaea; } .nav.nav-userbar li:first-child a { border-radius: 0 0 0 4px; } .nav.nav-userbar li:last-child a { border-radius: 0 0 4px 0; } .nav.nav-userbar li:first-child { } .nav.nav-userbar li.nav-userbar-username a { position: relative; padding-left: 47px; font-weight: bold; } .nav.nav-userbar li.nav-userbar-username .avatar { position: absolute; top: 7px; left: 15px; } .nav.nav-userbar li .new-messages { font-weight: bold; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> */ .nav.nav-main { border-radius: 4px; background: #222; background: -moz-linear-gradient(top, #333 0%, #222 100%); } .nav.nav-main li a { color: #ddd; } .nav.nav-main li a:hover { background: #333; } .nav.nav-main li:first-child a { border-radius: 4px 0 0 4px; } .nav.nav-main li:last-child a { border-radius: 0 4px 4px 0; } .nav.nav-main li.active a { background: #3a3a3a; color: #bbb; box-shadow: 0 0 7px rgba(0,0,0,.15) inset; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> */ .nav.nav-nested { height: 95px; margin: 0 0 50px 0; } .nav.nav-nested li { margin-right: 1px; position: relative; } .nav.nav-nested li a { background: #ddd; color: #333; padding: 7px 13px; float: left; } .nav.nav-nested li a:hover { background: #ccc; } .nav.nav-nested li.active > a { background: #333; color: #fff; } .nav.nav-nested ul { position: absolute; top: 100%; left: 0; width: 400px; margin-top: 1px; } .nav.nav-nested li a.new { background: #d1d1d1; font-weight: bold; } .nav.nav-nested li a.new:hover { background: #ccc; } .nav.nav-nested li.active a.new { background: #444; } .nav.nav-nested li.active a.new:hover { background: #555; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ .nav.nav-pills { margin-bottom: 15px; } .nav.nav-pills li { margin-right: 3px; } .nav.nav-pills li a { border-radius: 4px; padding: 5px 12px; background: #eee; } .nav.nav-pills li a:hover { background: #eaeaea; } .nav.nav-pills li.active a { background: #2375C6; color: #fff; } .nav.nav-pills.nav-pills-profile { margin-bottom: 30px; } /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ .nav.nav-profile { margin-bottom: 15px; } .nav.nav-profile li { float: none; margin-bottom: 2px; background: #eee; } .nav.nav-profile li a { padding: 7px 12px; border-radius: 0; } .nav.nav-profile li a:hover { background: #e5e5e5; } .nav.nav-profile li.active a { background: #333; color: #fff; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View file

@ -17,7 +17,7 @@
{if $sMenuItemSelect=='blog'}
<ul class="sub-menu">
<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><a href="{$sMenuSubBlogUrl}">{$aLang.blog_menu_collective_good}</a></li>
{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{$sMenuSubBlogUrl}new/">{$aLang.blog_menu_collective_new}</a> +{$iCountTopicsBlogNew}</li>{/if}
{if $iCountTopicsBlogNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{$sMenuSubBlogUrl}new/">{$aLang.blog_menu_collective_new} +{$iCountTopicsBlogNew}</a></li>{/if}
<li {if $sMenuSubItemSelect=='discussed'}class="active"{/if}><a href="{$sMenuSubBlogUrl}discussed/">{$aLang.blog_menu_collective_discussed}</a></li>
<li {if $sMenuSubItemSelect=='top'}class="active"{/if}><a href="{$sMenuSubBlogUrl}top/">{$aLang.blog_menu_collective_top}</a></li>
{hook run='menu_blog_blog_item'}
@ -30,7 +30,7 @@
{if $sMenuItemSelect=='log'}
<ul class="sub-menu">
<li {if $sMenuSubItemSelect=='good'}class="active"{/if}><a href="{router page='personal_blog'}">{$aLang.blog_menu_personal_good}</a></li>
{if $iCountTopicsPersonalNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{router page='personal_blog'}new/">{$aLang.blog_menu_personal_new}</a> +{$iCountTopicsPersonalNew}</li>{/if}
{if $iCountTopicsPersonalNew>0}<li {if $sMenuSubItemSelect=='new'}class="active"{/if}><a href="{router page='personal_blog'}new/">{$aLang.blog_menu_personal_new} +{$iCountTopicsPersonalNew}</a></li>{/if}
<li {if $sMenuSubItemSelect=='discussed'}class="active"{/if}><a href="{router page='personal_blog'}discussed/">{$aLang.blog_menu_personal_discussed}</a></li>
<li {if $sMenuSubItemSelect=='top'}class="active"{/if}><a href="{router page='personal_blog'}top/">{$aLang.blog_menu_personal_top}</a></li>
{hook run='menu_blog_log_item'}

View file

@ -1,7 +1,7 @@
{if $oUserCurrent}
<div id="favourite-form-tags" class="modal">
<header class="modal-header">
<h3>{$aLang.user_authorization}</h3>
<h3>{$aLang.add_favourite_tags}</h3>
<a href="#" class="close jqmClose"></a>
</header>