diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-07-29 17:40:05 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-07-29 17:49:53 +0200 |
commit | bf3c9934d2dc02cead5995570239c5c6230ed5e5 (patch) | |
tree | 8add5495bf1080cfa09e5f8768d8ef2c558344d0 /tpl/default | |
parent | a4f0509a77a39d1ac834d4967e3e8f245de6d68d (diff) | |
download | Shaarli-bf3c9934d2dc02cead5995570239c5c6230ed5e5.tar.gz Shaarli-bf3c9934d2dc02cead5995570239c5c6230ed5e5.tar.zst Shaarli-bf3c9934d2dc02cead5995570239c5c6230ed5e5.zip |
Fix fatal error on daily page: use new thumbnail system
Also fix:
* include the login manager in the daily RSS feed function
* remove redirector setting in the vintage theme
Fixes #1190
Diffstat (limited to 'tpl/default')
-rw-r--r-- | tpl/default/daily.html | 12 | ||||
-rw-r--r-- | tpl/default/dailyrss.html | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 29d845d5..816e5d0a 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html | |||
@@ -69,9 +69,12 @@ | |||
69 | </a> | 69 | </a> |
70 | <a href="{$link.real_url}">{$link.title}</a> | 70 | <a href="{$link.real_url}">{$link.title}</a> |
71 | </div> | 71 | </div> |
72 | {$thumb=thumbnail($value.url)} | 72 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} |
73 | {if="$thumb!=false"} | 73 | <div class="daily-entry-thumbnail"> |
74 | <div class="daily-entry-thumbnail">{$thumb}</div> | 74 | <img data-src="{$link.thumbnail}#" class="b-lazy" |
75 | src="#" | ||
76 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | ||
77 | </div> | ||
75 | {/if} | 78 | {/if} |
76 | <div class="daily-entry-description">{$link.formatedDescription}</div> | 79 | <div class="daily-entry-description">{$link.formatedDescription}</div> |
77 | {if="$link.tags"} | 80 | {if="$link.tags"} |
@@ -83,7 +86,7 @@ | |||
83 | {/loop} | 86 | {/loop} |
84 | </div> | 87 | </div> |
85 | {/if} | 88 | {/if} |
86 | <div class="dailyEntryFooter"> | 89 | <div class="dailyEntryFooter clear"> |
87 | {loop="$link.link_plugin"} | 90 | {loop="$link.link_plugin"} |
88 | {$value} | 91 | {$value} |
89 | {/loop} | 92 | {/loop} |
@@ -108,6 +111,7 @@ | |||
108 | </div> | 111 | </div> |
109 | </div> | 112 | </div> |
110 | {include="page.footer"} | 113 | {include="page.footer"} |
114 | <script src="js/thumbnails.min.js?v={$version_hash}"></script> | ||
111 | </body> | 115 | </body> |
112 | </html> | 116 | </html> |
113 | 117 | ||
diff --git a/tpl/default/dailyrss.html b/tpl/default/dailyrss.html index b14a3859..f589b06e 100644 --- a/tpl/default/dailyrss.html +++ b/tpl/default/dailyrss.html | |||
@@ -8,7 +8,7 @@ | |||
8 | <h3><a href="{$value.url}">{$value.title}</a></h3> | 8 | <h3><a href="{$value.url}">{$value.title}</a></h3> |
9 | <small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br> | 9 | <small>{if="!$hide_timestamps"}{function="strftime('%c', $value.timestamp)"} - {/if}{if="$value.tags"}{$value.tags}{/if}<br> |
10 | {$value.url}</small><br> | 10 | {$value.url}</small><br> |
11 | {if="$value.thumbnail"}{$value.thumbnail}{/if}<br> | 11 | {if="$value.thumbnail"}<img src="{$index_url}{$value.thumbnail}#" alt="thumbnail" />{/if}<br> |
12 | {if="$value.description"}{$value.formatedDescription}{/if} | 12 | {if="$value.description"}{$value.formatedDescription}{/if} |
13 | <br><br><hr> | 13 | <br><br><hr> |
14 | {/loop} | 14 | {/loop} |