From: Luzifr <szekely@woltlab.com>
Date: Mon, 9 Jan 2012 16:23:39 +0000 (+0100)
Subject: "sidebarMenu" -> "sidebarContent"
X-Git-Tag: 2.0.0_Beta_1~1439
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac305165c97951c840fdb2c0f8fc11849595e70f;p=GitHub%2FWoltLab%2FWCF.git

"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 c84da34dbc..d995fe8c57 100644
--- 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 6f3c68064f..771b92f77f 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#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 087187f7d8..06c49a2c33 100644
--- 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 fa2e11c87f..85d8e10e12 100644
--- 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}