From: Marcel Werk Date: Sat, 29 Sep 2012 18:14:31 +0000 (+0200) Subject: Added basic style; CSS/LESS overhaul X-Git-Tag: 2.0.0_Beta_1~895^2~5 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ecbd8a0b8723c719c60a049bc88ff171816e181f;p=GitHub%2FWoltLab%2FWCF.git Added basic style; CSS/LESS overhaul --- diff --git a/com.woltlab.wcf/template/footer.tpl b/com.woltlab.wcf/template/footer.tpl index 3a5811b066..f08940a680 100644 --- a/com.woltlab.wcf/template/footer.tpl +++ b/com.woltlab.wcf/template/footer.tpl @@ -1,14 +1,10 @@ {if $skipBreadcrumbs|empty}{include file='breadcrumbs' __microdata=false}{/if} - - - - + diff --git a/com.woltlab.wcf/template/header.tpl b/com.woltlab.wcf/template/header.tpl index 5bec63f84a..2bf8862ba3 100644 --- a/com.woltlab.wcf/template/header.tpl +++ b/com.woltlab.wcf/template/header.tpl @@ -1,8 +1,7 @@ - + - -
{if $sidebar|isset} @@ -59,7 +44,6 @@ {/if} -
{if $skipBreadcrumbs|empty}{include file='breadcrumbs'}{/if} diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index be267ab325..64c877c4e8 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -25,7 +25,7 @@ WCF.ACP.Menu.prototype = { */ init: function(activeMenuItems) { this._headerNavigation = $('nav#mainMenu'); - this._sidebarNavigation = $('nav#sidebarContent'); + this._sidebarNavigation = $('aside.collapsibleMenu'); this._prepareElements(activeMenuItems); }, @@ -36,12 +36,12 @@ WCF.ACP.Menu.prototype = { _prepareElements: function(activeMenuItems) { this._headerNavigation.find('li').removeClass('active'); - this._sidebarNavigation.find('div h1').each($.proxy(function(index, menuHeader) { + this._sidebarNavigation.find('legend').each($.proxy(function(index, menuHeader) { $(menuHeader).click($.proxy(this._toggleItem, this)); }, this)); // close all navigation groups - this._sidebarNavigation.find('div div').each(function() { + this._sidebarNavigation.find('nav ul').each(function() { $(this).hide(); }); @@ -61,7 +61,8 @@ WCF.ACP.Menu.prototype = { _toggleItem: function(event) { var $menuItem = $(event.target); - $menuItem.next().stop(true, true).toggle('blind', { }, 200).end().toggleClass('active'); + $menuItem.parent().find('nav ul').stop(true, true).toggle('blind', { }, 200).end(); + $menuItem.toggleClass('active'); }, /** @@ -91,7 +92,7 @@ WCF.ACP.Menu.prototype = { _renderSidebar: function(menuItem, activeMenuItems) { // reset visible and active items this._headerNavigation.find('li').removeClass('active'); - this._sidebarNavigation.find('div.menuGroup').hide(); + this._sidebarNavigation.find('> div').hide(); if (activeMenuItems.length === 0) { // show active menu @@ -112,7 +113,7 @@ WCF.ACP.Menu.prototype = { var $menuItem = $('#' + $.wcfEscapeID($item)); if ($menuItem.getTagName() === 'ul') { - $menuItem.parent('div').show().prev().addClass('active'); + $menuItem.show().parents('fieldset').children('legend').addClass('active'); } else { $menuItem.addClass('active'); diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 9fe7b8e231..2e4d27a757 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -19,7 +19,7 @@ - +