From 97ef1cbd57eb866e5fadc18e1b7819fe990795c4 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Tue, 11 Jun 2013 04:35:32 +0000
Subject: history - merge album/tags link into a single column (table is
 already very large and these columns are mutually exclusive - add tags link
 in the history table

git-svn-id: http://piwigo.org/svn/trunk@23151 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/history.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'admin/themes/default')

diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 717893c7e..74fdf52c5 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -105,6 +105,7 @@
 {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
 
 <table class="table2" id="detailedStats">
+<thead>
 <tr class="throw">
   <th>{'Date'|@translate}</th>
   <th>{'Time'|@translate}</th>
@@ -113,10 +114,10 @@
   <th>{'Element'|@translate}</th>
   <th>{'Element type'|@translate}</th>
   <th>{'Section'|@translate}</th>
-  <th>{'Album'|@translate}</th>
-  <th>{'Tags'|@translate}</th>
+	<th>{'Album'|@translate} / {'Tags'|@translate}</th>
 </tr>
-{if !empty($search_results) }
+</thead>
+{if !empty($search_results)}
 {foreach from=$search_results item=detail name=res_loop}
 <tr class="{if $smarty.foreach.res_loop.index is odd}row1{else}row2{/if}">
   <td class="hour">{$detail.DATE}</td>
@@ -126,8 +127,7 @@
   <td>{$detail.IMAGE}</td>
   <td>{$detail.TYPE}</td>
   <td>{$detail.SECTION}</td>
-  <td>{$detail.CATEGORY}</td>
-  <td>{$detail.TAGS}</td>
+	<td>{$detail.CATEGORY}{$detail.TAGS}</td>
 </tr>
 {/foreach}
 {/if}
-- 
cgit v1.2.3