diff options
author | Arthur <arthur@hoa.ro> | 2016-10-12 14:51:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 14:51:37 +0200 |
commit | 03542572665bae57705a2f57b0737ed43f4f1415 (patch) | |
tree | ed4f096826babda6ad25eba4951a6a76cbad2a34 /tpl | |
parent | adcdac1dec45090e2fa1cd4a340e91a40c7a205f (diff) | |
parent | c6d876bb2afe7e9ec1a64c74e766360e2fa441e0 (diff) | |
download | Shaarli-03542572665bae57705a2f57b0737ed43f4f1415.tar.gz Shaarli-03542572665bae57705a2f57b0737ed43f4f1415.tar.zst Shaarli-03542572665bae57705a2f57b0737ed43f4f1415.zip |
Merge pull request #622 from ArthurHoaro/update-date
Save link update dates and render it in templates and feeds
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/feed.atom.html | 3 | ||||
-rw-r--r-- | tpl/feed.rss.html | 3 | ||||
-rw-r--r-- | tpl/linklist.html | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/tpl/feed.atom.html b/tpl/feed.atom.html index 2ebb162a..1932f507 100644 --- a/tpl/feed.atom.html +++ b/tpl/feed.atom.html | |||
@@ -27,7 +27,8 @@ | |||
27 | {/if} | 27 | {/if} |
28 | <id>{$value.guid}</id> | 28 | <id>{$value.guid}</id> |
29 | {if="$show_dates"} | 29 | {if="$show_dates"} |
30 | <updated>{$value.iso_date}</updated> | 30 | <published>{$value.pub_iso_date}</published> |
31 | <updated>{$value.up_iso_date}</updated> | ||
31 | {/if} | 32 | {/if} |
32 | <content type="html" xml:lang="{$language}"> | 33 | <content type="html" xml:lang="{$language}"> |
33 | <![CDATA[{$value.description}]]> | 34 | <![CDATA[{$value.description}]]> |
diff --git a/tpl/feed.rss.html b/tpl/feed.rss.html index 26de7f19..4bfe4196 100644 --- a/tpl/feed.rss.html +++ b/tpl/feed.rss.html | |||
@@ -22,7 +22,8 @@ | |||
22 | <link>{$value.url}</link> | 22 | <link>{$value.url}</link> |
23 | {/if} | 23 | {/if} |
24 | {if="$show_dates"} | 24 | {if="$show_dates"} |
25 | <pubDate>{$value.iso_date}</pubDate> | 25 | <pubDate>{$value.pub_iso_date}</pubDate> |
26 | <atom:modified>{$value.up_iso_date}</atom:modified> | ||
26 | {/if} | 27 | {/if} |
27 | <description><![CDATA[{$value.description}]]></description> | 28 | <description><![CDATA[{$value.description}]]></description> |
28 | {loop="$value.taglist"} | 29 | {loop="$value.taglist"} |
diff --git a/tpl/linklist.html b/tpl/linklist.html index 2316f145..9979f12a 100644 --- a/tpl/linklist.html +++ b/tpl/linklist.html | |||
@@ -89,7 +89,16 @@ | |||
89 | <br> | 89 | <br> |
90 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} | 90 | {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if} |
91 | {if="!$hide_timestamps || isLoggedIn()"} | 91 | {if="!$hide_timestamps || isLoggedIn()"} |
92 | <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span> | 92 | {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'} |
93 | <span class="linkdate" title="Permalink"> | ||
94 | <a href="?{$value.linkdate|smallHash}"> | ||
95 | <span title="{$updated}"> | ||
96 | {function="strftime('%c', $value.timestamp)"} | ||
97 | {if="$value.updated_timestamp"}*{/if} | ||
98 | </span> | ||
99 | - permalink | ||
100 | </a> - | ||
101 | </span> | ||
93 | {else} | 102 | {else} |
94 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> | 103 | <span class="linkdate" title="Short link here"><a href="?{$value.shorturl}">permalink</a> - </span> |
95 | {/if} | 104 | {/if} |