From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 8 Aug 2016 14:27:33 +0000 (+0200)
Subject: Fixed outdated tab-menu in smiley-list
X-Git-Tag: 3.0.0_Beta_1~788
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=340d8c50669abe0bd05fd4f1cae6151d608942c5;p=GitHub%2FWoltLab%2FWCF.git

Fixed outdated tab-menu in smiley-list
---

diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index 62d7ab6c06..a312333b14 100644
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -32,40 +32,42 @@
 {/hascontent}
 
 {if $smileyCount}
-	<div class="section tabMenuContainer">
-		<nav class="menu">{*todo*}
+	<div class="section tabMenuContainer staticTabMenuContainer">
+		<nav class="tabMenu">
 			<ul>
 				{foreach from=$categories item=categoryLoop}
-					<li{if (!$category && !$categoryLoop->categoryID) || ($category && $category->categoryID == $categoryLoop->categoryID)} class="ui-state-active"{/if}><a href="{if $categoryLoop->categoryID}{link controller='SmileyList' object=$categoryLoop}{/link}{else}{link controller='SmileyList'}{/link}{/if}">{$categoryLoop->title|language}</a></li>
+					<li{if (!$category && !$categoryLoop->categoryID) || ($category && $category->categoryID == $categoryLoop->categoryID)} class="active"{/if}><a href="{if $categoryLoop->categoryID}{link controller='SmileyList' object=$categoryLoop}{/link}{else}{link controller='SmileyList'}{/link}{/if}">{$categoryLoop->title|language}</a></li>
 				{/foreach}
 			</ul>
 		</nav>
-		<section id="smileyList" class="sortableListContainer">
-			{if $objects|count}
-				<ol class="sortableList" data-object-id="0" start="{@($pageNo - 1) * $itemsPerPage + 1}">
-					{foreach from=$objects item=smiley}
-						<li class="sortableNode sortableNoNesting smileyRow" data-object-id="{@$smiley->smileyID}">
-							<span class="sortableNodeLabel">
-								<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt=""/ > {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge">{$alias}</span>{/foreach}
-								
-								<span class="statusDisplay sortableButtonContainer">
-									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
-									<span title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon icon16 fa-times" data-object-id="{@$smiley->smileyID}" data-confirm-message-html="{lang __encode=true}wcf.acp.smiley.delete.sure{/lang}">
+		<div class="tabMenuContent">
+			<section id="smileyList" class="sortableListContainer">
+				{if $objects|count}
+					<ol class="sortableList" data-object-id="0" start="{@($pageNo - 1) * $itemsPerPage + 1}">
+						{foreach from=$objects item=smiley}
+							<li class="sortableNode sortableNoNesting smileyRow" data-object-id="{@$smiley->smileyID}">
+								<span class="sortableNodeLabel">
+									<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><img src="{$smiley->getURL()}" alt=""/ > {lang}{$smiley->smileyTitle}{/lang}</a> <span class="badge">{$smiley->smileyCode}</span>{foreach from=$smiley->getAliases() item='alias'} <span class="badge" style="margin-left: 5px">{$alias}</span>{/foreach}
 									
-									{event name='itemButtons'}
+									<span class="statusDisplay sortableButtonContainer">
+										<a href="{link controller='SmileyEdit' id=$smiley->smileyID}{/link}"><span title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip icon icon16 fa-pencil"></a>
+										<span title="{lang}wcf.global.button.delete{/lang}" class="jsDeleteButton jsTooltip icon icon16 fa-times" data-object-id="{@$smiley->smileyID}" data-confirm-message-html="{lang __encode=true}wcf.acp.smiley.delete.sure{/lang}">
+										
+										{event name='itemButtons'}
+									</span>
 								</span>
-							</span>
-							<ol class="sortableList" data-object-id="{@$smiley->smileyID}"></ol></li>
-						</li>
-					{/foreach}
-				</ol>
-				<div class="formSubmit">
-					<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
-				</div>
-			{else}
-				<p class="info">{lang}wcf.global.noItems{/lang}</p>
-			{/if}
-		</section>
+								<ol class="sortableList" data-object-id="{@$smiley->smileyID}"></ol>
+							</li>
+						{/foreach}
+					</ol>
+					<div class="formSubmit">
+						<button class="button" data-type="submit">{lang}wcf.global.button.submit{/lang}</button>
+					</div>
+				{else}
+					<p class="info">{lang}wcf.global.noItems{/lang}</p>
+				{/if}
+			</section>
+		</div>	
 	</div>
 {else}
 	<p class="info">{lang}wcf.global.noItems{/lang}</p>