Merge branch 'bugfix/6.2-message-tab-menu-form-builder' into 6.2-quote-tab

Author: Cyperghost

com.woltlab.wcf/package.xml

@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.3 dev 2</version>
-		<date>2024-12-31</date>
+		<version>6.1.3</version>
+		<date>2025-01-06</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -110,4 +110,10 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 	</instructions>
+	<instructions type="update" fromversion="6.1.3 dev 2">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
+	<instructions type="update" fromversion="6.1.3 dev 3">
+		<instruction type="file">files_update.tar</instruction>
+	</instructions>
 </package>

com.woltlab.wcf/templates/shared_wysiwygTabMenuFormContainer.tpl

@@ -1 +1,29 @@
-{include file='shared_tabMenuFormContainer' __tabMenuCSSClassName='messageTabMenuNavigation'}
+<div id="{$container->getPrefixedId()}Container"{*
+	*}{if !$container->getClasses()|empty} class="{implode from=$container->getClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+	*}{foreach from=$container->getAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+	*}{if !$container->checkDependencies()} hidden{/if}>
+	<nav class="messageTabMenuNavigation jsOnly">
+		<ul>
+			{foreach from=$container item='child'}
+				{if $child->isAvailable()}
+					<li data-name="{$child->getPrefixedId()|rawurlencode}Container"{if !$child->checkDependencies()} hidden{/if}>
+						<button type="button">
+							{if $child->getIcon()}{icon name=$child->getIcon()}{/if}
+							<span>{@$child->getLabel()}</span>
+						</button>
+					</li>
+				{/if}
+			{/foreach}
+		</ul>
+	</nav>
+
+	{include file='shared_formContainerChildren'}
+</div>
+
+{include file='shared_formContainerDependencies'}
+
+<script data-relocate="true">
+	require(['WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTabMenu'], ({ WysiwygTabMenu }) => {
+		new WysiwygTabMenu('{@$container->getPrefixedId()|encodeJS}Container');
+	});
+</script>

ts/WoltLabSuite/Core/Ajax/Status.ts

@@ -6,6 +6,8 @@
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 
+import { getPageOverlayContainer } from "../Helper/PageOverlay";
+
 class AjaxStatus {
   private _activeRequests = 0;
   private readonly _overlay: Element;
@@ -20,7 +22,7 @@ class AjaxStatus {
     loadingIndicator.size = 48;
     this._overlay.append(loadingIndicator);
 
-    document.body.append(this._overlay);
+    getPageOverlayContainer().append(this._overlay);
   }
 
   show(): void {

ts/WoltLabSuite/Core/Component/Image/Viewer.ts

@@ -1,6 +1,7 @@
 import { Fancybox } from "@fancyapps/ui";
 import { userSlideType } from "@fancyapps/ui/types/Carousel/types";
 import { OptionsType } from "@fancyapps/ui/types/Fancybox/options";
+import { getPageOverlayContainer } from "WoltLabSuite/Core/Helper/PageOverlay";
 
 const LOCALES = ["cs", "de", "en", "es", "fr", "it", "lv", "pl", "sk"];
 
@@ -26,6 +27,7 @@ export async function createFancybox(userSlides?: Array<userSlideType>): Promise
 async function getDefaultConfig(): Promise<Partial<OptionsType>> {
   return {
     l10n: await getLocalization(),
+    parentEl: getPageOverlayContainer(),
     Html: {
       videoAutoplay: false,
     },

ts/WoltLabSuite/Core/Form/Builder/Field/Dependency/Container/WysiwygTabMenu.ts

@@ -0,0 +1,36 @@
+/**
+ * Container visibility handler implementation for a wysiwyg tab menu that checks visibility
+ * based on the visibility of its tab menu list items.
+ *
+ * @author  Olaf BRaun
+ * @copyright 2001-2025 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since  6.2
+ */
+
+import Abstract from "./Abstract";
+import * as DependencyManager from "../Manager";
+import * as DomUtil from "../../../../../Dom/Util";
+
+export class WysiwygTabMenu extends Abstract {
+  public checkContainer(): void {
+    // only consider containers that have not been hidden by their own dependencies
+    if (DependencyManager.isHiddenByDependencies(this._container)) {
+      return;
+    }
+
+    const containerIsVisible = !this._container.hidden;
+    const listItems = this._container.parentNode!.querySelectorAll(
+      "#" + DomUtil.identify(this._container) + " > nav > ul > li",
+    );
+    const containerShouldBeVisible = Array.from(listItems).some((child: HTMLElement) => !child.hidden);
+
+    if (containerIsVisible !== containerShouldBeVisible) {
+      this._container.hidden = !containerShouldBeVisible;
+
+      // check containers again to make sure parent containers can react to
+      // changing the visibility of this container
+      DependencyManager.checkContainers();
+    }
+  }
+}

wcfsetup/install/files/acp/templates/usersAwaitingApprovalAcpDashboardBox.tpl

@@ -20,10 +20,8 @@
 	{/foreach}
 </ul>
 
-{if $usersAwaitingApproval > $users|count}
-	<div class="acpDashboardBox__cta">
-		<a href="{link controller='UserQuickSearch' mode='pendingActivation'}{/link}" class="button small">
-			{lang}wcf.global.button.showAll{/lang}
-		</a>
-	</div>
-{/if}
+<div class="acpDashboardBox__cta">
+	<a href="{link controller='UserQuickSearch' mode='pendingActivation'}{/link}" class="button small">
+		{lang}wcf.global.button.showAll{/lang}
+	</a>
+</div>