Fixed battleHall

jkroepke · Oct 30, 2015 · 8da41b8 · 8da41b8
1 parent 8e28a85
commit 8da41b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/includes/pages/game/ShowBattleHallPage.class.php b/includes/pages/game/ShowBattleHallPage.class.php
@@ -48,9 +48,6 @@ function show()
 			case 'date':
 				$key = '%%TOPKB%%.time '.$sort;
 				break;
-			case 'owner':
-				$key = '%%TOPKB%%.attacker '.$sort.',%%TOPKB%%.defender '.$sort;
-				break;
 			case 'units':
 			default:
 				$key = '%%TOPKB%%.units '.$sort;

diff --git a/styles/templates/game/page.battleHall.default.tpl b/styles/templates/game/page.battleHall.default.tpl
@@ -10,27 +10,25 @@
 </tr>
 <tr>
     <td>{$LNG.tkb_platz}</td>
-	<td><a href="game.php?page=battleHall&order=owner&sort={if $sort == "ASC"}DESC{else}ASC{/if}"{if $order == "owner"} style="font-weight:bold;"{/if}>{$LNG.tkb_owners}</a></td>
+	<td>{$LNG.tkb_owners}</td>
     <td><a href="game.php?page=battleHall&order=date&sort={if $sort == "ASC"}DESC{else}ASC{/if}"{if $order == "date"} style="font-weight:bold;"{/if}>{$LNG.tkb_datum}</a></td>
 	<td><a href="game.php?page=battleHall&order=units&sort={if $sort == "ASC"}DESC{else}ASC{/if}"{if $order == "units"} style="font-weight:bold;"{/if}>{$LNG.tkb_units}</a></td>
 </tr>
-{foreach $TopKBList as $hallCat}
-    {foreach $hallCat as $hallRow}
-    <tr class="day{floor($hallRow.date / 86400)} week{floor($hallRow.date / 604800)}">
-        <td>{$hallRow@iteration}</td>
-        <td><a href="game.php?page=raport&amp;mode=battlehall&amp;raport={$hallRow.rid}" target="_blank">
-        {if $hallRow.result == "a"}
-        <span style="color:#00FF00">{$hallRow.attacker}</span> VS <span style="color:#FF0000">{$hallRow.defender}</span>
-        {elseif $hallRow.result == "r"}
-        <span style="color:#FF0000">{$hallRow.attacker}</span> VS <span style="color:#00FF00">{$hallRow.defender}</span>
+{foreach $TopKBList as $row}
+    <tr class="day{floor($row.date / 86400)} week{floor($row.date / 604800)}">
+        <td>{$row@iteration}</td>
+        <td><a href="game.php?page=raport&amp;mode=battlehall&amp;raport={$row.rid}" target="_blank">
+        {if $row.result == "a"}
+        <span style="color:#00FF00">{$row.attacker}</span> VS <span style="color:#FF0000">{$row.defender}</span>
+        {elseif $row.result == "r"}
+        <span style="color:#FF0000">{$row.attacker}</span> VS <span style="color:#00FF00">{$row.defender}</span>
         {else}
-        {$hallRow.attacker} VS {$hallRow.defender}
+        {$row.attacker} VS {$row.defender}
         {/if}
         </a></td>
-        <td>{$hallRow.date}</td>
-        <td>{$hallRow.units|number}</td>
+        <td>{$row.date}</td>
+        <td>{$row.units|number}</td>
     </tr>
-    {/foreach}
 {/foreach}
 <tr>
 <td colspan="4">{$LNG.tkb_legende}<span style="color:#00FF00">{$LNG.tkb_gewinner}</span><span style="color:#FF0000">{$LNG.tkb_verlierer}</span></td></tr>