1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-14 23:08:18 +03:00

Группировка не влезающих пунктов в главном меню, добавлен пункт Избранное в меню пользователя шаблона Synio, исправлены мелкие баги

This commit is contained in:
Denis Shakhov 2012-07-30 19:32:21 +07:00
parent 0f063fc4f5
commit 789bdb2bb6
10 changed files with 107 additions and 19 deletions

View file

@ -89,10 +89,10 @@ h2.header-table span { color: #949aa1; }
.dropdown-user-menu li:last-child { border-bottom: none; }
.dropdown-user-menu li:last-child a { border-radius: 0 0 10px 10px; }
.dropdown-user-menu li.item-stat { padding: 20px 17px; font-size: 11px; background: #191919 url(../images/dropdown-user-shadow.png) left bottom repeat-x; }
.dropdown-user-menu li.item-stat .rating { color: #9dd868; margin-right: 21px; }
.dropdown-user-menu li.item-stat .rating { color: #93d3f2; }
.dropdown-user-menu li.item-stat .rating.negative { color: #d95f5f; }
.dropdown-user-menu li.item-stat .rating i { position: relative; top: 2px; }
.dropdown-user-menu li.item-stat .strength { color: #93d3f2; }
.dropdown-user-menu li.item-stat .strength { color: #f3d50b; margin-right: 21px; }
.dropdown-user-menu li.item-stat .arrow { position: relative; top: 3px; }
.dropdown-user-menu li.item-stat .icon-synio-star-small { position: relative; top: 2px; }
.dropdown-user-menu li.item-stat .icon-synio-strength { position: relative; top: 1px; }
@ -104,6 +104,7 @@ h2.header-table span { color: #949aa1; }
.dropdown-user-menu li.item-settings .item-icon { background-position: -46px 0; }
.dropdown-user-menu li.item-create .item-icon { background-position: -69px 0; }
.dropdown-user-menu li.item-signout .item-icon { background-position: -92px 0; }
.dropdown-user-menu li.item-favourite .item-icon { background-position: -115px 0; }
.dropdown-user-menu li.item-messages .new { position: absolute; top: 15px; right: 7px; cursor: pointer; color: #fff; border-radius: 15px; border: 2px solid #eabe21; line-height: 1em; padding: 2px 7px 3px; }
#header .auth { position: absolute; top: 0; right: 0; line-height: 49px; font-size: 11px; margin-right: 17px; }

View file

@ -341,7 +341,7 @@
.loader { background: #fafafa url(../images/loader.gif) 50% 50% no-repeat; }
.user, .ls-user { font-weight: bold; color: #333; }
.user:before, .ls-user:before { content: ''; display: inline-block; width: 14px; height: 14px; margin-right: 3px; background: url(../images/icons.png) -168px 0 no-repeat; vertical-align: middle; }
.user:before, .ls-user:before { content: ''; display: inline-block; width: 12px; height: 12px; margin-right: 4px; background: url(../images/icons-synio.png) -165px -75px no-repeat; vertical-align: middle; position: relative; top: -1px; }
.user .icon-user { margin-right: 3px; }
.username.inactive,
.user.inactive { color: #aaa !important; }

View file

@ -177,7 +177,7 @@
.icon-synio-arrow-up { width: 9px; height: 9px; background-position: -24px -24px; }
.icon-synio-arrow-down { width: 9px; height: 9px; background-position: -33px -24px; }
.icon-synio-star-green { width: 11px; height: 11px; background-position: 0 -23px; }
.icon-synio-star-green { width: 12px; height: 11px; background-position: 0 -23px; }
.icon-synio-star-blue { width: 11px; height: 11px; background-position: 0 -37px; }
.icon-synio-star-white { width: 11px; height: 11px; background-position: 0 -51px; }
.icon-synio-star-yellow { width: 11px; height: 11px; background-position: 0 -65px; }
@ -185,7 +185,7 @@
.icon-synio-share-blue { width: 11px; height: 11px; background-position: -12px -37px; }
.icon-synio-share-white { width: 11px; height: 11px; background-position: -12px -51px; }
.icon-synio-strength { width: 11px; height: 11px; background-position: -12px -23px; }
.icon-synio-rating { width: 11px; height: 11px; background-position: -12px -23px; }
.icon-synio-arrows { width: 11px; height: 11px; background-position: -22px -65px; }
.icon-synio-comments-green { width: 11px; height: 11px; background-position: -46px -23px; }

View file

@ -113,12 +113,16 @@
.nav.nav-main li.active i { display: block; }
.nav.nav-main li.active a { color: #aed6e9; }
.nav.nav-main li.nav-main-more { display: none; }
.nav.nav-main li.nav-main-more a { border: 1px solid #595959; border-radius: 3px; padding: 0 5px 2px; position: relative; padding-right: 15px; }
.nav.nav-main li.nav-main-more a:before { content: ''; position: absolute; top: 8px; right: 5px; width: 0; height: 0; border: 3px solid #fff; border-color: #fff transparent transparent transparent; }
/* Nav Profile */
.nav.nav-profile { margin-bottom: 15px; }
.nav.nav-profile li { float: none; font-size: 15px; border-bottom: 1px dotted #dce1e6; padding: 8px 10px 10px 30px; }
.nav.nav-profile li a { text-decoration: underline; color: #275ec2; }
.nav.nav-profile li a:hover { color: #f00; }
.nav.nav-profile li a:hover { color: #f00; }
.nav.nav-profile li.active a { text-decoration: none; color: #000; }
@ -135,8 +139,11 @@
.dropdown-menu li a { display: block; }
.dropdown-menu li a:hover { }
.dropdown-menu li.active a { color: #aaa; }
.dropdown-menu li.active a:hover { cursor: default; }
.dropdown-menu.dropdown-nav-main { background: #090909; border: 1px solid #333; }
.dropdown-menu.dropdown-nav-main li a { color: #fff; text-decoration: none; }
.dropdown-menu.dropdown-nav-main li a:hover { color: #ddd; }
.dropdown-menu.dropdown-nav-main li.active a { color: #555; }
.dropdown-create { margin-right: 120px; line-height: 23px; }
.dropdown-create a { font-weight: normal; }

View file

@ -40,6 +40,6 @@
.text object,
.text img { max-width: 100%; vertical-align: top; }
.text .ls-user { color: #333; }
.text .ls-user:visited { color: #333; }
.text .ls-user:hover { color: #555; }
.text .ls-user { }
.text .ls-user:visited { color: #3F8AD7; }
.text .ls-user:hover { color: #f00; }

View file

@ -2,7 +2,7 @@
ТОПИК
-------------------------------------------- */
.topic { overflow: hidden; zoom: 1; margin-bottom: 50px; }
.topic { margin-bottom: 50px; }
.topic:last-child { margin-bottom: 0; }
/* Header */
@ -50,7 +50,7 @@
.topic .topic-footer .topic-info li.topic-info-date { color: #7b848d; }
.topic .topic-footer .topic-info li.topic-info-share { padding: 6px; cursor: pointer; border-radius: 4px; }
.topic .topic-footer .topic-info li.topic-info-share { padding: 6px; cursor: pointer; border-radius: 4px; position: relative; }
.topic .topic-footer .topic-info li.topic-info-share i { float: left; }
.topic .topic-footer .topic-info li.topic-info-share.active,
.topic .topic-footer .topic-info li.topic-info-share:hover { background: #64ceff; }
@ -70,8 +70,10 @@
.topic .topic-footer .topic-info li.topic-info-favourite:hover i { background-position: 0 -51px; }
/* Share */
.topic .topic-share { display: none; border: 3px solid #edf8fd; padding: 3px; border-radius: 5px; margin-bottom: 10px; position: relative; }
.topic .topic-share .arrow { position: absolute; border: none; width: 15px; height: 11px; background: url(../images/icons-synio.png) no-repeat; background-position: -53px -107px; bottom: -11px; }
.topic .topic-share { display: none; border: 3px solid #edf8fd; padding: 3px; border-radius: 5px; margin-bottom: 10px; position: relative; }
.topic .topic-share .close { content: ''; position: absolute; top: -9px; right: -9px; width: 19px; height: 22px; background: url(../images/icons-synio.png) -479px -26px no-repeat; cursor: pointer; opacity: .8; }
.topic .topic-share .close:hover { opacity: 1; }
.topic .topic-share .arrow { position: absolute; border: none; width: 15px; height: 11px; background: url(../images/icons-synio.png) no-repeat; background-position: -53px -107px; bottom: -11px; }
/* Poll */
.topic .poll { margin-bottom: 15px; }

View file

@ -10,8 +10,12 @@
<li {if $sMenuHeadItemSelect=='stream'}class="active"{/if}><a href="{router page='stream'}">{$aLang.stream_menu}</a> <i></i></li>
{hook run='main_menu_item'}
<li class="nav-main-more"><a href="#" id="dropdown-mainmenu-trigger" onclick="return false">еще</a></li>
</ul>
<ul class="dropdown-nav-main dropdown-menu" id="dropdown-mainmenu-menu"></ul>
{hook run='main_menu'}
@ -27,8 +31,8 @@
<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>
<span class="strength" title="{$aLang.user_skill}"><i class="icon-synio-star-green"></i> {$oUserCurrent->getRating()}</span>
<span class="rating {if $oUserCurrent->getRating() < 0}negative{/if}" title="{$aLang.user_rating}"><i class="icon-synio-rating"></i> {$oUserCurrent->getSkill()}</span>
{hook run='userbar_stat_item'}
</li>
{hook run='userbar_item_first'}
@ -39,7 +43,8 @@
{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-favourite"><i class="item-icon"></i><a href="{$oUserCurrent->getUserWebPath()}favourites/topics/">{$aLang.user_menu_profile_favourites}</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'}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View file

@ -365,6 +365,40 @@ jQuery(document).ready(function($){
}
});
// Меню
(function(){
var trigger = $('#dropdown-mainmenu-trigger');
if (!trigger.length) {
return;
}
var menu = $('#dropdown-mainmenu-menu');
menu.appendTo('body').css('display', 'none');
trigger.click(function(){
var pos = trigger.offset();
menu.css({ 'left': pos.left, 'top': pos.top + trigger.height() + 10, 'min-width': trigger.outerWidth() });
menu.slideToggle();
trigger.toggleClass('opened');
return false;
});
// Hide menu
$(document).click(function(){
trigger.removeClass('opened');
menu.slideUp();
});
$('body').on('click', '#dropdown-mainmenu-trigger, #dropdown-mainmenu-menu', function(e) {
e.stopPropagation();
});
$(window).resize(function(){
menu.css({ 'left': $('#dropdown-mainmenu-trigger').offset().left });
});
})();
// Меню пользователя в шапке
(function(){
// Dropdown
@ -479,4 +513,42 @@ function toolbarPos() {
$('#toolbar').css({'position': 'fixed', 'left': $('#wrapper').offset().left + $('#wrapper').outerWidth() + 7, 'top': 136, 'display': 'block'});
}
}
};
};
// Группировка не влезающих пунктов в главном меню
jQuery(window).load(function () {
navMainGroup();
});
jQuery(window).resize(function () {
navMainGroup();
});
function navMainGroup() {
var $ = jQuery;
var more_li = $('#nav-main li.nav-main-more');
var li = $('#nav-main li:not(.nav-main-more)');
var width_lis = 0;
var vis_count = 0;
var is_outofbox = false;
$('#dropdown-mainmenu-menu').hide();
li.each(function(i){
if (!is_outofbox && $(this).offset().top < 10) {
width_lis += $(this).outerWidth(true);
vis_count++;
} else {
is_outofbox = true;
$(this).appendTo('#dropdown-mainmenu-menu');
}
});
if ($('#dropdown-mainmenu-menu li').length > 0) {
if ($('#nav-main').width() - width_lis < more_li.width()) {
$( li[vis_count - 1] ).prependTo('#dropdown-mainmenu-menu');
}
more_li.show();
}
}

View file

@ -37,6 +37,7 @@
<div class="yashare-auto-init" data-yashareTitle="{$oTopic->getTitle()|escape:'html'}" data-yashareLink="{$oTopic->getUrl()}" data-yashareL10n="ru" data-yashareType="button" data-yashareQuickServices="yaru,vkontakte,facebook,twitter,odnoklassniki,moimir,lj,gplus"></div>
{/hookb}
<div class="arrow"></div>
<div class="close" onclick="jQuery('#topic_share_{$oTopic->getId()}').slideToggle(); return false;"></div>
</div>