From c46655402b52c07a8f5932d1c8ce2898a543e36a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 12 Jun 2013 15:44:34 +0200
Subject: [PATCH] Small optimizations

---
 .../install/files/acp/templates/tagAdd.tpl    | 24 ++++++----------
 .../install/files/acp/templates/tagList.tpl   | 28 ++++++++++---------
 .../files/lib/acp/form/TagEditForm.class.php  |  3 +-
 wcfsetup/install/lang/de.xml                  |  2 +-
 wcfsetup/install/lang/en.xml                  |  2 +-
 5 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index cc34816c99..c3b312e913 100644
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -13,19 +13,13 @@
 {/if}
 
 <div class="contentNavigation">
-	{hascontent}
-		<nav>
-			<ul>
-				{content}
-					{if $__wcf->session->getPermission('admin.tag.canDeleteTag') || $__wcf->session->getPermission('admin.tag.canEditTag')}
-						<li><a href="{link controller='TagList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
-					{/if}
-					
-					{event name='contentNavigationButtons'}
-				{/content}
-			</ul>
-		</nav>
-	{/hascontent}
+	<nav>
+		<ul>
+			<li><a href="{link controller='TagList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.acp.menu.link.tag.list{/lang}</span></a></li>
+				
+			{event name='contentNavigationButtons'}
+		</ul>
+	</nav>
 </div>
 
 <form method="post" action="{if $action == 'add'}{link controller='TagAdd'}{/link}{else}{link controller='TagEdit' object=$tagObj}{/link}{/if}">
@@ -99,9 +93,9 @@
 				</script>
 			{elseif $tagObj|isset}
 				<dl>
-					<dt><label for="synonyms">{lang}wcf.acp.tag.synonyms{/lang}</label></dt>
+					<dt><label for="synonyms">{lang}wcf.acp.tag.synonymFor{/lang}</label></dt>
 					<dd>
-						<a href="{link controller='TagEdit' id=$tagObj->synonymFor}{/link}">{lang}wcf.acp.tag.synonyms.isSynonym{/lang}</a>
+						<a href="{link controller='TagEdit' id=$tagObj->synonymFor}{/link}" class="badge tag">{$synonym->name}</a>
 					</dd>
 				</dl>
 			{/if}
diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 513b413b20..11ad852106 100644
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -15,19 +15,21 @@
 {if $items}
 	<form action="{link controller='TagList'}{/link}">
 		<div class="container containerPadding marginTop">
-			<fieldset><legend>{lang}wcf.acp.tag.list.search{/lang}</legend>
+			<fieldset>
+				<legend>{lang}wcf.acp.tag.list.search{/lang}</legend>
+				
 				<dl>
-					<dt><label for="search">{lang}wcf.acp.tag.list.search.query{/lang}</label></dt>
+					<dt><label for="tagSearch">{lang}wcf.acp.tag.list.search.query{/lang}</label></dt>
 					<dd>
-						<input type="search" id="search" name="search" value="{$search}" autofocus="autofocus" class="medium" />
+						<input type="text" id="tagSearch" name="search" value="{$search}" autofocus="autofocus" class="medium" />
 					</dd>
 				</dl>
 			</fieldset>
-			
-			<div class="formSubmit">
-				<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-				{@SID_INPUT_TAG}
-			</div>
+		</div>
+		
+		<div class="formSubmit">
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			{@SID_INPUT_TAG}
 		</div>
 	</form>
 {/if}
@@ -55,8 +57,8 @@
 				<tr>
 					<th class="columnID columnTagID{if $sortField == 'tagID'} active {@$sortOrder}{/if}" colspan="2"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=tagID&sortOrder={if $sortField == 'tagID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
 					<th class="columnTitle columnName{if $sortField == 'name'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=name&sortOrder={if $sortField == 'name' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.name{/lang}</a></th>
-					<th class="columnNumber columnUsageCount{if $sortField == 'usageCount'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=usageCount&sortOrder={if $sortField == 'usageCount' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.usageCount{/lang}</a></th>
-					<th class="columnText columnLanguage{if $sortField == 'language'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=language&sortOrder={if $sortField == 'language' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.languageID{/lang}</a></th>
+					<th class="columnDigits columnUsageCount{if $sortField == 'usageCount'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=usageCount&sortOrder={if $sortField == 'usageCount' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.usageCount{/lang}</a></th>
+					<th class="columnText columnLanguage{if $sortField == 'languageID'} active {@$sortOrder}{/if}"><a href="{link controller='TagList'}pageNo={@$pageNo}&sortField=languageID&sortOrder={if $sortField == 'languageID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}&search={@$search|rawurlencode}{/link}">{lang}wcf.acp.tag.languageID{/lang}</a></th>
 					<th class="columnText columnSynonymFor">{lang}wcf.acp.tag.synonymFor{/lang}</th>
 					
 					{event name='columnHeads'}
@@ -73,10 +75,10 @@
 							{event name='rowButtons'}
 						</td>
 						<td class="columnID">{#$tag->tagID}</td>
-						<td class="columnTitle columnName"><a href="{link controller='TagEdit' object=$tag}{/link}" class="badge">{$tag->name}</a></td>
-						<td class="columnNumber columnUsageCount">{if $tag->synonymFor === null}{#$tag->usageCount}{/if}</td>
+						<td class="columnTitle columnName"><a href="{link controller='TagEdit' object=$tag}{/link}" class="badge tag">{$tag->name}</a></td>
+						<td class="columnDigits columnUsageCount">{if $tag->synonymFor === null}{#$tag->usageCount}{/if}</td>
 						<td class="columnText columnLanguage">{if $tag->languageName !== null}{$tag->languageName} ({$tag->languageCode}){/if}</td>
-						<td class="columnText columnSynonymFor">{if $tag->synonymFor !== null}<a href="{link controller='TagList'}search={@$tag->synonymName|rawurlencode}{/link}" class="badge">{$tag->synonymName}</a>{/if}</td>
+						<td class="columnText columnSynonymFor">{if $tag->synonymFor !== null}<a href="{link controller='TagList'}search={@$tag->synonymName|rawurlencode}{/link}" class="badge tag">{$tag->synonymName}</a>{/if}</td>
 						
 						{event name='columns'}
 					</tr>
diff --git a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
index 6d6323635e..d592a3b2db 100644
--- a/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TagEditForm.class.php
@@ -134,7 +134,8 @@ class TagEditForm extends TagAddForm {
 		
 		WCF::getTPL()->assign(array(
 			'tagObj' => $this->tagObj,
-			'action' => 'edit'
+			'action' => 'edit',
+			'synonym' => (($this->tagObj !== null && $this->tagObj->synonymFor) ? new Tag($this->tagObj->synonymFor) : null)
 		));
 	}
 }
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7dbc9a8469..5e0817a5e5 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1061,7 +1061,7 @@
 		<item name="wcf.acp.tag.delete.sure"><![CDATA[Wollen Sie den Tag „{$tag}“ wirklich löschen?]]></item>
 		<item name="wcf.acp.tag.error.languageID.notFound"><![CDATA[Die gewählte Sprache ist ungültig]]></item>
 		<item name="wcf.acp.tag.languageID"><![CDATA[Sprache]]></item>
-		<item name="wcf.acp.tag.list"><![CDATA[Tags auflisten]]></item>
+		<item name="wcf.acp.tag.list"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.tag.list.search"><![CDATA[Tags suchen]]></item>
 		<item name="wcf.acp.tag.list.search.query"><![CDATA[Suchbegriff]]></item>
 		<item name="wcf.acp.tag.name"><![CDATA[Name]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ac47898dda..63f4099e16 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1060,7 +1060,7 @@ Examples for medium ID detection:
 		<item name="wcf.acp.tag.delete.sure"><![CDATA[Do you really want to delete the tag “{$tag}”?]]></item>
 		<item name="wcf.acp.tag.error.languageID.notFound"><![CDATA[Selected language is invalid]]></item>
 		<item name="wcf.acp.tag.languageID"><![CDATA[Language]]></item>
-		<item name="wcf.acp.tag.list"><![CDATA[List Tags]]></item>
+		<item name="wcf.acp.tag.list"><![CDATA[Tags]]></item>
 		<item name="wcf.acp.tag.list.search"><![CDATA[Search Tags]]></item>
 		<item name="wcf.acp.tag.list.search.query"><![CDATA[Search Term]]></item>
 		<item name="wcf.acp.tag.name"><![CDATA[Name]]></item>
-- 
2.20.1