From: Tim Düsterhus <timwolla@arcor.de>
Date: Thu, 9 Feb 2012 17:02:42 +0000 (+0100)
Subject: Merge branch 'master' into cacheListPageCompiledTemplatesPlusLanguage
X-Git-Tag: 2.0.0_Beta_1~1358^2~17^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e4a24561ef85eccd23a4f916890f2ff3ffbf530;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into cacheListPageCompiledTemplatesPlusLanguage

Conflicts:
	wcfsetup/install/files/acp/templates/cacheList.tpl
---

8e4a24561ef85eccd23a4f916890f2ff3ffbf530
diff --cc wcfsetup/install/files/acp/templates/cacheList.tpl
index 4daf5766e0,ad921ce53a..420999ab36
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@@ -62,12 -62,12 +62,12 @@@
  	{counter name=cacheIndex assign=cacheIndex print=false start=0}
  	{if $files|count}
  		<div class="wcf-border wcf-boxTitle">
- 			<a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
 -			<a class="collapsible" data-is-open="1" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
++			<a class="collapsible" data-is-open="0" data-collapsible-container="cache{@$cacheIndex}"><img src="{@RELATIVE_WCF_DIR}icon/closed2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="jsTooltip" /></a>
  			<hgroup>
- 				<h1>{$cache} <span class="badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
+ 				<h1>{$cache} <span class="wcf-badge" title="{lang}wcf.acp.cache.data.files.count{/lang}">{#$files|count}</span></h1>
  			</hgroup>
  			
- 			<table id="cache{@$cacheIndex}" style="display: none;">
 -			<table id="cache{@$cacheIndex}" class="wcf-table">
++			<table id="cache{@$cacheIndex}" style="display: none;" class="wcf-table">
  				<thead>
  					<tr>
  						<th class="columnTitle">{lang}wcf.acp.cache.list.name{/lang}</th>