diff options
| author | rvelices <rv-github@modusoptimus.com> | 2013-06-11 04:35:32 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2013-06-11 04:35:32 +0000 |
| commit | 97ef1cbd57eb866e5fadc18e1b7819fe990795c4 (patch) | |
| tree | 6ecac48a8fd64ad75fc002e88b6c702d502d76e9 | |
| parent | 0c2e87cb581356f0e2e600bd8246fe022714bb11 (diff) | |
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
Diffstat (limited to '')
| -rw-r--r-- | admin/history.php | 9 | ||||
| -rw-r--r-- | admin/themes/default/template/history.tpl | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/admin/history.php b/admin/history.php index 0412113f5..25a25ee67 100644 --- a/admin/history.php +++ b/admin/history.php @@ -337,9 +337,14 @@ SELECT $query = ' SELECT id, - name + name, url_name FROM '.TAGS_TABLE; - $name_of_tag = simple_hash_from_query($query, 'id', 'name'); + $name_of_tag = array(); + $result = pwg_query($query); + while ($row=pwg_db_fetch_assoc($result)) + { + $name_of_tag[ $row['id'] ] = '<a href="'.make_index_url( array('tags'=>array($row))).'">'.trigger_event("render_tag_name", $row['name']).'</a>'; + } } $i = 0; 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} |