Fix tab menu issues

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 8d625193b584e41d2f1cb99d01e59a3c26aa3aba..9ac13b1a92fa3cb5d7e9fa2ba6064d92ae651bab 100644 (file)
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -108,7 +108,7 @@
                        </nav>
                        
                        {hascontent}
-                               <div id="dependencies-required" class="tabularBox tabularBoxTitle hidden">
+                               <div id="dependencies-required" class="tabMenuContent tabularBox tabularBoxTitle hidden">
                                        <header>
                                                <h2>{lang}wcf.acp.package.dependencies.required{/lang}</h2>
                                                <small>{lang}wcf.acp.package.dependencies.required.description{/lang}</small>
@@ -154,7 +154,7 @@
                        {/hascontent}
                        
                        {hascontent}
-                               <div id="dependencies-dependent" class="tabularBox tabularBoxTitle hidden">
+                               <div id="dependencies-dependent" class="tabMenuContent tabularBox tabularBoxTitle hidden">
                                        <header>
                                                <h2>{lang}wcf.acp.package.dependencies.dependent{/lang}</h2>
                                                <small>{lang}wcf.acp.package.dependencies.dependent.description{/lang}</small>

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 704c8985932d12cd81be869d4a8e7ce4130fbbaf..632686f829acb33b672d3af47f6554ebbd56c085 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -169,7 +169,7 @@
                                        </nav>
                                        
                                        {foreach from=$categoryLevel1[categories] item=categoryLevel2}
-                                               <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}" class="hidden">
+                                               <div id="{@$categoryLevel1[object]->categoryName}-{@$categoryLevel2[object]->categoryName}" class="tabMenuContent hidden">
                                                        {if $categoryLevel2[options]|count}
                                                                <fieldset>
                                                                        <legend>{lang}wcf.acp.group.option.category.{@$categoryLevel2[object]->categoryName}{/lang}</legend>

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
index ecadeca68016a56ee6d481411ee65aab8525caf3..fbd32d77d07460ec0e9f1583f9eba064b53bcc9f 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/TabMenu/Simple.js
@@ -231,13 +231,27 @@ define(['Dictionary', 'Dom/Traverse', 'Dom/Util', 'EventHandler'], function(Dict
                                newContent.classList.remove('hidden');
                        }
                        
+                       var menu = tab.parentNode.parentNode;
+                       
                        // set pointer position
-                       var span = DomTraverse.childByTag(tab.parentNode.parentNode, 'SPAN');
+                       var span = DomTraverse.childByTag(menu, 'SPAN');
+                       
+                       // make sure that the tab is (temporarily) visible so that offsetLeft has the proper value
+                       var toggleHidden = false;
+                       if (menu.classList.contains('menu') && menu.parentNode.classList.contains('hidden')) {
+                               toggleHidden = true;
+                               menu.parentNode.classList.remove('hidden');
+                       }
+                       
                        if (span !== null) {
                                span.style.setProperty('transform', 'translateX(' + tab.offsetLeft + 'px)');
                                span.style.setProperty('width', tab.clientWidth + 'px');
                        }
                        
+                       if (toggleHidden) {
+                               menu.parentNode.classList.add('hidden');
+                       }
+                       
                        if (!disableEvent) {
                                EventHandler.fire('com.woltlab.wcf.simpleTabMenu_' + this._container.id, 'select', {
                                        active: tab,