"sidebarMenu" -> "sidebarContent"

This name is more unspecific, thus more flexible to use (e.g. when
there is no real menu in the sidebar).

diff --git a/com.woltlab.wcf/template/headInclude.tpl b/com.woltlab.wcf/template/headInclude.tpl
index c84da34dbc5febaa675c608d3b3ae3b41a89d54d..d995fe8c57552ffe19d4c2e085dd6e191a95b50a 100644 (file)
--- a/com.woltlab.wcf/template/headInclude.tpl
+++ b/com.woltlab.wcf/template/headInclude.tpl
@@ -75,7 +75,7 @@
                new WCF.Effect.BalloonTooltip();
                $('<span class="pointer"><span></span></span>').appendTo('.innerError');
                
-               $('#sidebarMenu').wcfSidebar();
+               $('#sidebarContent').wcfSidebar();
                
                {event name='javascriptInit'}
        });

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 6f3c68064f914c696b783b4ee7424111b8e1ddd7..771b92f77f90b9b8156b770e41e111f3802bc4b9 100644 (file)
--- 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#sidebarMenu');
+               this._sidebarNavigation = $('nav#sidebarContent');
                
                this._prepareElements(activeMenuItems);
        },

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 087187f7d8065663cc2f5f4624e34b26dce5b813..06c49a2c33d9cacd56f3c675786f782908b1e734 100644 (file)
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -1020,36 +1020,36 @@ section.content .content {
 
 
 
-/* -- -- -- Sidebar Menu -- -- -- */
+/* -- -- -- Sidebar Content -- -- -- */
 
-.sidebarMenu {
+.sidebarContent {
        white-space: nowrap;
 }
 
-.sidebarMenu > div {
+.sidebarContent > div {
        text-shadow: 0 1px 0 #fff;
        position: relative;
        overflow: hidden;
        z-index: 110;
 }
 
-.collapsed .sidebarMenu > div {
+.collapsed .sidebarContent > div {
        width: 0;
 }
 
-.sidebarMenu > .collapsible a:hover {
+.sidebarContent > .collapsible a:hover {
        text-decoration: none !important;
        color: #369;
 }
 
-.sidebarMenu > div > h1 {
+.sidebarContent > div > h1 {
        cursor: pointer;
        font-weight: bold;
        color: #369;
        margin-top: 5px;
 }
 
-.sidebarMenu > .collapsible > h1 {
+.sidebarContent > .collapsible > h1 {
        background-image: url('../../icon/arrowRight.svg');
        background-position: 15px center;
        background-size: 16px;
@@ -1058,12 +1058,12 @@ section.content .content {
 
 @media screen and (min-width: 480px), screen and (min-device-width: 480px) {
        
-       .sidebarMenu > div > h1 {
+       .sidebarContent > div > h1 {
                font-size: 130%;
                padding: 7px 15px 7px 35px;
        }
        
-       .sidebarMenu > div:not(.collapsible) > h1 {
+       .sidebarContent > div:not(.collapsible) > h1 {
                padding: 7px 15px 7px 15px;
        }
        
@@ -1071,24 +1071,24 @@ section.content .content {
 
 @media screen and (max-width: 480px), screen and (max-device-width: 480px) {
        
-       .sidebarMenu > div > h1 {
+       .sidebarContent > div > h1 {
                font-size: 150%;
                padding: 7px 15px 7px 35px;
        }
        
-       .sidebarMenu > div:not(.collapsible) > h1 {
+       .sidebarContent > div:not(.collapsible) > h1 {
                padding: 7px 15px 7px 15px;
        }
        
 }
 
-.sidebarMenu > .collapsible h1.activeMenuItem {
+.sidebarContent > .collapsible h1.activeMenuItem {
        background-image: url('../../icon/arrowDown.svg');
 }
 
 @media screen and (min-width: 480px), screen and (min-device-width: 480px) {
        
-       .sidebarMenu > div ul > li {
+       .sidebarContent > div ul > li {
                font-size: 110%;
        }
        
@@ -1096,21 +1096,21 @@ section.content .content {
 
 @media screen and (max-width: 480px), screen and (max-device-width: 480px) {
        
-       .sidebarMenu > div ul > li {
+       .sidebarContent > div ul > li {
                font-size: 120%;
        }
        
 }
 
-.sidebarMenu > div ul > li > a,
-.sidebarMenu > div ul > li > div {
+.sidebarContent > div ul > li > a,
+.sidebarContent > div ul > li > div {
        text-shadow: 0 1px 0 #fff;
        color: #69c;
        padding: 5px 15px 7px 35px;
        display: block;
 }
 
-.sidebarMenu > div ul > li.activeMenuItem {
+.sidebarContent > div ul > li.activeMenuItem {
        background-color: #fff;
        margin-right: -1px;
        overflow: hidden;
@@ -1122,7 +1122,7 @@ section.content .content {
        box-shadow: 0 0 5px rgba(0, 0, 0, .1);
 }
 
-.sidebarMenu > div ul > li.activeMenuItem a {
+.sidebarContent > div ul > li.activeMenuItem a {
        font-weight: bold;
        color: #369;
 }

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index fa2e11c87f63c79ebc898ba784718d9f985f3f5e..85d8e10e122b0c1becd4b964bd56434e57455ec7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -72,7 +72,7 @@
                        new WCF.Effect.BalloonTooltip();
                        $('<span class="pointer"><span></span></span>').appendTo('.innerError');
                        
-                       $('#sidebarMenu').wcfSidebar();
+                       $('#sidebarContent').wcfSidebar();
                });
                //]]>
        </script>
@@ -148,7 +148,7 @@
                                <!-- SIDEBAR -->
                                <aside class="sidebar">
                                        <!-- sidebar menu -->
-                                       <nav id="sidebarMenu" class="sidebarMenu">
+                                       <nav id="sidebarContent" class="sidebarContent">
                                                {content}
                                                        {* work-around for unknown core-object during WCFSetup *}
                                                        {if PACKAGE_ID}
@@ -156,7 +156,7 @@
                                                                        <div id="{$parentMenuItem->menuItem}-container" style="display: none;" class="menuContainer collapsible" data-parent-menu-item="{$parentMenuItem->menuItem}">
                                                                                {foreach from=$__wcf->getACPMenu()->getMenuItems($parentMenuItem->menuItem) item=menuItem}
                                                                                        <h1 class="menuHeader" data-menu-item="{$menuItem->menuItem}">{lang}{@$menuItem->menuItem}{/lang}</h1>
-                                                                                       <div class="sidebarMenuGroup">
+                                                                                       <div class="sidebarContentGroup">
                                                                                                <ul id="{$menuItem->menuItem}">
                                                                                                        {foreach from=$__wcf->getACPMenu()->getMenuItems($menuItem->menuItem) item=menuItemCategory}
                                                                                                                {if $__wcf->getACPMenu()->getMenuItems($menuItemCategory->menuItem)|count > 0}