[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[48282] branches/12.x/templates

[<jon...@us...>]

Revision: 48282
          http://sourceforge.net/p/tikiwiki/code/48282
Author:   jonnybradley
Date:     2013-10-31 20:03:13 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
[FIX] articles: Add expireDate column to article submissions and use date only format on both lists (with the datetime on a tooltip)

Modified Paths:
--------------
    branches/12.x/templates/tiki-list_articles.tpl
    branches/12.x/templates/tiki-list_submissions.tpl

Modified: branches/12.x/templates/tiki-list_articles.tpl
===================================================================
--- branches/12.x/templates/tiki-list_articles.tpl	2013-10-31 19:40:53 UTC (rev 48281)
+++ branches/12.x/templates/tiki-list_articles.tpl	2013-10-31 20:03:13 UTC (rev 48282)
@@ -122,10 +122,10 @@
 					<td class="text">{$listpages[changes].topicName|escape}</td>
 				{/if}
 				{if $prefs.art_list_date eq 'y'}
-					<td class="date">{$listpages[changes].publishDate|tiki_short_datetime}</td>
+					<td class="date" title="{$listpages[changes].publishDate|tiki_short_datetime}">{$listpages[changes].publishDate|tiki_short_date}</td>
 				{/if}
 				{if $prefs.art_list_expire eq 'y'}
-					<td class="date">{$listpages[changes].expireDate|tiki_short_datetime}</td>
+					<td class="date" title="{$listpages[changes].expireDate|tiki_short_datetime}">{$listpages[changes].expireDate|tiki_short_date}</td>
 				{/if}
 				{if $prefs.art_list_visible eq 'y'}
 					<td class="text">{tr}{$listpages[changes].disp_article}{/tr}</td>

Modified: branches/12.x/templates/tiki-list_submissions.tpl
===================================================================
--- branches/12.x/templates/tiki-list_submissions.tpl	2013-10-31 19:40:53 UTC (rev 48281)
+++ branches/12.x/templates/tiki-list_submissions.tpl	2013-10-31 20:03:13 UTC (rev 48282)
@@ -40,6 +40,12 @@
 					<a href="tiki-list_submissions.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'publishDate_desc'}publishDate_asc{else}publishDate_desc{/if}">{tr}Publish Date{/tr}</a>
 				</th>
 			{/if}
+			{if $prefs.art_list_expire eq 'y'}
+				{assign var=numbercol value=$numbercol+1}
+				<th>
+					<a href="tiki-list_submissions.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'expireDate_desc'}expireDate_asc{else}expireDate_desc{/if}">{tr}Expiry Date{/tr}</a>
+				</th>
+			{/if}
 			{if $prefs.art_list_size eq 'y'}
 				{assign var=numbercol value=$numbercol+1}
 				<th style="text-align:right;">
@@ -82,8 +88,11 @@
 					<td class="text">{$listpages[changes].topicName|escape}</td>
 				{/if}
 				{if $prefs.art_list_date eq 'y'}
-					<td class="date">{$listpages[changes].publishDate|tiki_short_datetime}</td>
+					<td class="date" title="{$listpages[changes].publishDate|tiki_short_datetime}">{$listpages[changes].publishDate|tiki_short_date}</td>
 				{/if}
+				{if $prefs.art_list_expire eq 'y'}
+					<td class="date" title="{$listpages[changes].expireDate|tiki_short_datetime}">{$listpages[changes].expireDate|tiki_short_date}</td>
+				{/if}
 				{if $prefs.art_list_size eq 'y'}
 					<td class="integer">{$listpages[changes].size|kbsize}</td>
 				{/if}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.