From c836299144d35a53b6deb2de1bbef5ef23ae7b0f Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 24 Mar 2016 12:03:56 +0100
Subject: [PATCH] Added proper marking as active for mobile menu

---
 com.woltlab.wcf/templates/pageMenuMobile.tpl                 | 2 +-
 .../install/files/js/WoltLab/WCF/Ui/Page/Menu/Abstract.js    | 2 +-
 wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php | 2 +-
 wcfsetup/install/files/style/ui/menuMobile.scss              | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index 5da65b6a52..870b1eeed3 100644
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -11,7 +11,7 @@
 				{foreach from=$__wcf->getBoxHandler()->getBoxes('mainMenu')[0]->getMenu()->getMenuItemNodeList() item=menuItemNode}
 				<li class="menuOverlayItem">
 					{assign var=__outstandingItems value=$menuItemNode->getMenuItem()->getOutstandingItems()}
-					<a href="{$menuItemNode->getMenuItem()->getURL()}" class="menuOverlayItemLink{if $__outstandingItems} menuOverlayItemBadge{/if}">
+					<a href="{$menuItemNode->getMenuItem()->getURL()}" class="menuOverlayItemLink{if $__outstandingItems} menuOverlayItemBadge{/if}{if $menuItemNode->isActiveNode()} active{/if}">
 						<span class="menuOverlayItemTitle">{lang}{$menuItemNode->getMenuItem()->title}{/lang}</span>
 						{if $__outstandingItems}
 							<span class="badge badgeUpdate">{#$__outstandingItems}</span>
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Menu/Abstract.js b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Menu/Abstract.js
index 82a3f831a3..d9c7850f7f 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Menu/Abstract.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ui/Page/Menu/Abstract.js
@@ -189,7 +189,7 @@ define(['Environment', 'EventHandler', 'ObjectMap', 'Dom/Traverse', 'Ui/Screen']
 				
 				var moreLink = elCreate('a');
 				elAttr(moreLink, 'href', '#');
-				moreLink.className = 'menuOverlayItemLinkIcon';
+				moreLink.className = 'menuOverlayItemLinkIcon' + (item.classList.contains('active') ? ' active' : '');
 				moreLink.innerHTML = '<span class="icon icon24 fa-angle-right"></span>';
 				moreLink.addEventListener(WCF_CLICK_EVENT, callbackLink);
 				wrapper.appendChild(moreLink);
diff --git a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
index bb5d50a0c1..a40d97c465 100644
--- a/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
+++ b/wcfsetup/install/files/lib/data/menu/item/MenuItem.class.php
@@ -1,7 +1,7 @@
 <?php
 namespace wcf\data\menu\item;
-use wcf\data\page\Page;
 use wcf\data\DatabaseObject;
+use wcf\data\page\Page;
 use wcf\data\page\PageCache;
 use wcf\system\exception\SystemException;
 use wcf\system\page\handler\ILookupPageHandler;
diff --git a/wcfsetup/install/files/style/ui/menuMobile.scss b/wcfsetup/install/files/style/ui/menuMobile.scss
index fa51ed543f..ae8eb623c6 100644
--- a/wcfsetup/install/files/style/ui/menuMobile.scss
+++ b/wcfsetup/install/files/style/ui/menuMobile.scss
@@ -180,6 +180,11 @@
 	}
 }
 
+.menuOverlayItemLink.active,
+.menuOverlayItemLinkIcon.active {
+	background-color: rgb(41, 128, 185);
+}
+
 .menuOverlayTitle {
 	color: rgb(204, 204, 204);
 	overflow: hidden;
-- 
2.20.1