diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-08-11 14:15:47 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-08-11 14:15:47 +0200 |
commit | e0a77f2cceba5295b04add1ab177020c8b028df5 (patch) | |
tree | 586a02a4274471e435f4de8c6427c1ce6b527d62 /tpl/vintage | |
parent | 32ee32517c9e999e61bda2a018c899e4b6fbd528 (diff) | |
parent | 9e3a97b36e17559e11768516749bd3f65ab971a5 (diff) | |
download | Shaarli-e0a77f2cceba5295b04add1ab177020c8b028df5.tar.gz Shaarli-e0a77f2cceba5295b04add1ab177020c8b028df5.tar.zst Shaarli-e0a77f2cceba5295b04add1ab177020c8b028df5.zip |
Merge tag 'v0.10.1' into latest
Release v0.10.1
Diffstat (limited to 'tpl/vintage')
-rw-r--r-- | tpl/vintage/configure.html | 8 | ||||
-rw-r--r-- | tpl/vintage/daily.html | 9 | ||||
-rw-r--r-- | tpl/vintage/dailyrss.html | 4 | ||||
-rw-r--r-- | tpl/vintage/tools.html | 32 |
4 files changed, 9 insertions, 44 deletions
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html index 9466c235..f1892fa1 100644 --- a/tpl/vintage/configure.html +++ b/tpl/vintage/configure.html | |||
@@ -59,14 +59,6 @@ | |||
59 | </tr> | 59 | </tr> |
60 | 60 | ||
61 | <tr> | 61 | <tr> |
62 | <td><b>Redirector</b></td> | ||
63 | <td> | ||
64 | <input type="text" name="redirector" id="redirector" size="50" value="{$redirector}"><br> | ||
65 | (e.g. <i>http://anonym.to/?</i> will mask the HTTP_REFERER) | ||
66 | </td> | ||
67 | </tr> | ||
68 | |||
69 | <tr> | ||
70 | <td><b>Security:</b></td> | 62 | <td><b>Security:</b></td> |
71 | <td> | 63 | <td> |
72 | <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" | 64 | <input type="checkbox" name="disablesessionprotection" id="disablesessionprotection" |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index ede35910..00148a58 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
@@ -68,8 +68,12 @@ | |||
68 | <div class="dailyEntryTitle"> | 68 | <div class="dailyEntryTitle"> |
69 | <a href="{$link.real_url}">{$link.title}</a> | 69 | <a href="{$link.real_url}">{$link.title}</a> |
70 | </div> | 70 | </div> |
71 | {if="$link.thumbnail"} | 71 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} |
72 | <div class="dailyEntryThumbnail">{$link.thumbnail}</div> | 72 | <div class="dailyEntryThumbnail"> |
73 | <img data-src="{$link.thumbnail}#" class="b-lazy" | ||
74 | src="#" | ||
75 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | ||
76 | </div> | ||
73 | {/if} | 77 | {/if} |
74 | <div class="dailyEntryDescription">{$link.formatedDescription}</div> | 78 | <div class="dailyEntryDescription">{$link.formatedDescription}</div> |
75 | 79 | ||
@@ -97,5 +101,6 @@ | |||
97 | <div id="closing"><img src="img/squiggle_closing.png" width="66" height="61" alt="-"></div> | 101 | <div id="closing"><img src="img/squiggle_closing.png" width="66" height="61" alt="-"></div> |
98 | </div> | 102 | </div> |
99 | {include="page.footer"} | 103 | {include="page.footer"} |
104 | <script src="js/thumbnails.min.js?v={$version_hash}"></script> | ||
100 | </body> | 105 | </body> |
101 | </html> | 106 | </html> |
diff --git a/tpl/vintage/dailyrss.html b/tpl/vintage/dailyrss.html index ddbd6c5e..f589b06e 100644 --- a/tpl/vintage/dailyrss.html +++ b/tpl/vintage/dailyrss.html | |||
@@ -4,11 +4,11 @@ | |||
4 | <link>{$absurl}</link> | 4 | <link>{$absurl}</link> |
5 | <pubDate>{$rssdate}</pubDate> | 5 | <pubDate>{$rssdate}</pubDate> |
6 | <description><![CDATA[ | 6 | <description><![CDATA[ |
7 | {loop="$links"} | 7 | {loop="links"} |
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} |
diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html index 3194844a..1cef726e 100644 --- a/tpl/vintage/tools.html +++ b/tpl/vintage/tools.html | |||
@@ -55,13 +55,6 @@ | |||
55 | </span> | 55 | </span> |
56 | </a><br><br> | 56 | </a><br><br> |
57 | 57 | ||
58 | {if="$sslenabled"} | ||
59 | <a class="smallbutton" onclick="activateFirefoxSocial(this)"><b>✚Add to Firefox social</b></a> | ||
60 | <a href="#"> | ||
61 | <span>⇐ Click on this button to add Shaarli to the "Share this page" button in Firefox.</span> | ||
62 | </a><br><br> | ||
63 | {/if} | ||
64 | |||
65 | {loop="$tools_plugin"} | 58 | {loop="$tools_plugin"} |
66 | {$value} | 59 | {$value} |
67 | {/loop} | 60 | {/loop} |
@@ -69,31 +62,6 @@ | |||
69 | <div class="clear"></div> | 62 | <div class="clear"></div> |
70 | 63 | ||
71 | <script> | 64 | <script> |
72 | {if="$sslenabled"} | ||
73 | function activateFirefoxSocial(node) { | ||
74 | var loc = location.href; | ||
75 | var baseURL = loc.substring(0, loc.lastIndexOf("/")); | ||
76 | |||
77 | // Keeping the data separated (ie. not in the DOM) so that it's maintainable and diffable. | ||
78 | var data = { | ||
79 | name: "{$shaarlititle}", | ||
80 | description: "The personal, minimalist, super-fast, no-database delicious clone.", | ||
81 | author: "Shaarli", | ||
82 | version: "1.0.0", | ||
83 | |||
84 | iconURL: baseURL + "/img/favicon.ico", | ||
85 | icon32URL: baseURL + "/img/favicon.ico", | ||
86 | icon64URL: baseURL + "/img/favicon.ico", | ||
87 | |||
88 | shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", | ||
89 | homepageURL: baseURL | ||
90 | }; | ||
91 | node.setAttribute("data-service", JSON.stringify(data)); | ||
92 | |||
93 | var activate = new CustomEvent("ActivateSocialFeature"); | ||
94 | node.dispatchEvent(activate); | ||
95 | } | ||
96 | {/if} | ||
97 | function alertBookmarklet() { | 65 | function alertBookmarklet() { |
98 | alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); | 66 | alert('Drag this link to your bookmarks toolbar, or right-click it and choose Bookmark This Link...'); |
99 | return false; | 67 | return false; |