From: Luzifr <szekely@woltlab.com>
Date: Thu, 9 Feb 2012 19:42:32 +0000 (+0100)
Subject: Multiple changes
X-Git-Tag: 2.0.0_Beta_1~1358^2~13^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b29fbb53054c527f42f6650d60689ca3af50af7c;p=GitHub%2FWoltLab%2FWCF.git

Multiple changes

Changed class in sidebar-menu; More style-prefixes; Fixed some bugs.
---

diff --git a/com.woltlab.wcf/template/permissionDenied.tpl b/com.woltlab.wcf/template/permissionDenied.tpl
index 711d8c2110..fdf6aa9486 100644
--- a/com.woltlab.wcf/template/permissionDenied.tpl
+++ b/com.woltlab.wcf/template/permissionDenied.tpl
@@ -6,13 +6,9 @@
 
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
-
-<div id="main" class="wcf-main">
 	
 	<p class="wcf-error">{lang}wcf.global.error.permissionDenied{/lang}</p>
-
-</div>
-
+	
 {if ENABLE_DEBUG_MODE}
 	<!-- 
 	{$name} thrown in {$file} ({@$line})
diff --git a/com.woltlab.wcf/template/userException.tpl b/com.woltlab.wcf/template/userException.tpl
index 7b15dd15c7..8985770253 100644
--- a/com.woltlab.wcf/template/userException.tpl
+++ b/com.woltlab.wcf/template/userException.tpl
@@ -6,19 +6,17 @@
 
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
 {include file='header' sandbox=false}
-
-<div id="main" class="wcf-main">
+	
 	<p id="errorMessage" class="wcf-error">
 		{@$message}
 	</p>
-</div>
-<script type="text/javascript">
-	//<![CDATA[
-	if (document.referrer) {
-		$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
-	}
-	//]]>
-</script>
+	<script type="text/javascript">
+		//<![CDATA[
+		if (document.referrer) {
+			$('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 
+		}
+		//]]>
+	</script>
 
 {if ENABLE_DEBUG_MODE}
 	<!-- 
diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 89edfc3f22..5336610069 100644
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -590,7 +590,6 @@ nav.wcf-topMenu {
 	border-top-right-radius: 5px;
 	background-color: rgba(0, 0, 0, .4);
 	display: inline-block;
-	position: relative;
 }
 
 .wcf-mainMenu > ul > li {
@@ -1130,7 +1129,7 @@ section.wcf-content .wcf-content {
 	width: 0;
 }
 
-.wcf-sidebarContent > .collapsible a:hover {
+.wcf-sidebarContent > .collapsibleMenus a:hover {
 	text-decoration: none !important;
 	color: #369;
 }
@@ -1142,7 +1141,7 @@ section.wcf-content .wcf-content {
 	margin-top: 5px;
 }
 
-.wcf-sidebarContent > .collapsible > h1 {
+.wcf-sidebarContent > .collapsibleMenus > h1 {
 	background-image: url('../../icon/arrowRight.svg');
 	background-position: 15px center;
 	background-size: 16px;
@@ -1156,7 +1155,7 @@ section.wcf-content .wcf-content {
 		padding: 7px 15px 7px 35px;
 	}
 	
-	.wcf-sidebarContent > div:not(.collapsible) > h1 {
+	.wcf-sidebarContent > div:not(.collapsibleMenus) > h1 {
 		padding: 7px 15px 7px 15px;
 	}
 	
@@ -1169,13 +1168,13 @@ section.wcf-content .wcf-content {
 		padding: 7px 15px 7px 35px;
 	}
 	
-	.wcf-sidebarContent > div:not(.collapsible) > h1 {
+	.wcf-sidebarContent > div:not(.collapsibleMenus) > h1 {
 		padding: 7px 15px 7px 15px;
 	}
 	
 }
 
-.wcf-sidebarContent > .collapsible h1.activeMenuItem {
+.wcf-sidebarContent > .collapsibleMenus h1.activeMenuItem {
 	background-image: url('../../icon/arrowDown.svg');
 }
 
diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 420999ab36..ef3485904f 100644
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -62,7 +62,7 @@
 	{counter name=cacheIndex assign=cacheIndex print=false start=0}
 	{if $files|count}
 		<div class="wcf-border wcf-boxTitle">
-			<a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
+			<a class="jsCollapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
 			<hgroup>
 				<h1>{$cache} <span class="wcf-badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
 			</hgroup>
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 0a3a7dac9b..b986bcdc30 100644
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -157,7 +157,7 @@
 							{* work-around for unknown core-object during WCFSetup *}
 							{if PACKAGE_ID}
 								{foreach from=$__wcf->getACPMenu()->getMenuItems('') item=parentMenuItem}
-									<div id="{$parentMenuItem->menuItem}-container" style="display: none;" class="wcf-menuContainer collapsible" data-parent-menu-item="{$parentMenuItem->menuItem}">
+									<div id="{$parentMenuItem->menuItem}-container" style="display: none;" class="wcf-menuContainer collapsibleMenus" data-parent-menu-item="{$parentMenuItem->menuItem}">
 										{foreach from=$__wcf->getACPMenu()->getMenuItems($parentMenuItem->menuItem) item=menuItem}
 											<h1 class="wcf-menuHeader" data-menu-item="{$menuItem->menuItem}">{lang}{@$menuItem->menuItem}{/lang}</h1>
 											<div class="wcf-sidebarContentGroup">
diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index 252a9f6fe4..0ad900aeed 100644
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -1,5 +1,5 @@
 <div id="workerContainer">
-	<header class="mainHeading">
+	<header class="wcf-mainHeading">
 		<img src="{@RELATIVE_WCF_DIR}icon/working2.svg" alt="" />
 		<hgroup>
 			<h1>Aufgaben werden ausgeführt &hellip;</h1>
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 5fe20247c3..b381ef1d18 100644
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -2516,7 +2516,7 @@ WCF.Collapsible.Simple = {
 	 * Initializes collapsibles.
 	 */
 	init: function() {
-		$('.collapsible').each($.proxy(function(index, button) {
+		$('.jsCollapsible').each($.proxy(function(index, button) {
 			this._initButton(button);
 		}, this));
 	},