From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 12 Jul 2012 14:25:05 +0000 (-0700)
Subject: Merge pull request #639 from Gravatronics/bug/categoryListSortableNodeLabel
X-Git-Tag: 2.0.0_Beta_1~1008
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=32a9b035cfd8f812f26170a5477594f4b1236090;p=GitHub%2FWoltLab%2FWCF.git

Merge pull request #639 from Gravatronics/bug/categoryListSortableNodeLabel

Adds missing sortableNodeLabel span in categoryList template
---

32a9b035cfd8f812f26170a5477594f4b1236090
diff --cc wcfsetup/install/files/acp/templates/categoryList.tpl
index 2feda30ce8,9496d34102..956edb3389
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@@ -55,33 -55,37 +55,35 @@@
  		<ol class="categoryList sortableList" data-object-id="0">
  			{assign var=oldDepth value=0}
  			{foreach from=$categoryNodeList item=category}
 -				{if $categoryNodeList->getDepth() < $oldDepth}
 -					</ol></li>
 -				{/if}
 +				{section name=i loop=$oldDepth-$categoryNodeList->getDepth()}</ol></li>{/section}
  				
  				<li class="{if $objectType->getProcessor()->canEditCategory() && $categoryNodeList|count > 1}sortableNode {/if}jsCategory" data-object-id="{@$category->categoryID}"{if $collapsedCategoryIDs|is_array} data-is-open="{if $collapsedCategoryIDs[$category->categoryID]|isset}0{else}1{/if}"{/if}>
- 					<span class="buttons">
- 						{if $objectType->getProcessor()->canEditCategory()}
- 							<a href="{link controller=$editController id=$category->categoryID title=$category->getTitle()}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
- 						{else}
- 							<img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
- 						{/if}
+ 					<span class="sortableNodeLabel">
+ 						<span class="buttons">
+ 							{if $objectType->getProcessor()->canEditCategory()}
+ 								<a href="{link controller=$editController id=$category->categoryID title=$category->getTitle()}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
+ 							{else}
+ 								<img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
+ 							{/if}
  
- 						{if $objectType->getProcessor()->canDeleteCategory()}
- 							<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip" data-object-id="{@$category->categoryID}" data-confirm-message="{hascontent}{content}{lang __optional=true}{@$objectType->getProcessor()->getLangVarPrefix()}.delete.sure{/lang}{/content}{hascontentelse}{lang}wcf.category.delete.sure{/lang}{/hascontent}" />
- 						{else}
- 							<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
- 						{/if}
+ 							{if $objectType->getProcessor()->canDeleteCategory()}
+ 								<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip" data-object-id="{@$category->categoryID}" data-confirm-message="{hascontent}{content}{lang __optional=true}{@$objectType->getProcessor()->getLangVarPrefix()}.delete.sure{/lang}{/content}{hascontentelse}{lang}wcf.category.delete.sure{/lang}{/hascontent}" />
+ 							{else}
+ 								<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
+ 							{/if}
  
- 						{if $objectType->getProcessor()->canEditCategory()}
- 							<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}disable{else}enable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip" data-object-id="{@$category->categoryID}" />
- 						{else}
- 							<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 disabled" />
- 						{/if}
+ 							{if $objectType->getProcessor()->canEditCategory()}
+ 								<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}disable{else}enable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip" data-object-id="{@$category->categoryID}" />
+ 							{else}
+ 								<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 disabled" />
+ 							{/if}
  
- 						{event name='buttons'}
- 					</span>
+ 							{event name='buttons'}
+ 						</span>
  
- 					<span class="title">
- 						{$category->getTitle()}
+ 						<span class="title">
+ 							{$category->getTitle()}
+ 						</span>
  					</span>
  				
  					<ol class="categoryList sortableList" data-object-id="{@$category->categoryID}">