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 711d8c2110c3ca6d3d5b378f664ca5dbc51f534d..fdf6aa9486c78fcb4c40e74302a9338790db391d 100644 (file)
--- 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 7b15dd15c7739b9751eac016010866704b9a29c0..8985770253c2c09de259299d07acde2d922447e0 100644 (file)
--- 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 89edfc3f2233cbc4524143ed21b88e9898e9df90..533661006979e88f4b28316a44b69819c6cd2a1f 100644 (file)
--- 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 420999ab367acb2c9b7be07724cd7d6df530e83f..ef3485904f3ea2cf2921149f1264b5213bfffc0e 100644 (file)
--- 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 0a3a7dac9b1d108e59c818bd982db86870cb62e8..b986bcdc3035b696bf9a5cfa52889c8042a07ddb 100644 (file)
--- 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 252a9f6fe4c2767d246013ee82ee453f9d046d85..0ad900aeed73db294a94f95b003a0fb95f4ac0a9 100644 (file)
--- 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 5fe20247c351f470daefe2f6aaf94dea14681ce4..b381ef1d187ba64cc4612be8e56dd4c7b3d3fca6 100644 (file)
--- 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));
        },