diff options
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/daily.html | 12 | ||||
-rw-r--r-- | tpl/default/dailyrss.html | 2 | ||||
-rw-r--r-- | tpl/default/page.header.html | 4 | ||||
-rw-r--r-- | tpl/default/tools.html | 28 | ||||
-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 |
8 files changed, 24 insertions, 75 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} |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index fc03404e..3b43a611 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -2,7 +2,7 @@ | |||
2 | <div class="pure-u-lg-0 pure-u-1"> | 2 | <div class="pure-u-lg-0 pure-u-1"> |
3 | <div class="pure-menu"> | 3 | <div class="pure-menu"> |
4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> | 4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> |
5 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="logo" /> | 5 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> |
6 | {$shaarlititle} | 6 | {$shaarlititle} |
7 | </a> | 7 | </a> |
8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> | 8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> |
@@ -13,7 +13,7 @@ | |||
13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> | 13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> |
14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> | 14 | <li class="pure-menu-item pure-u-0 pure-u-lg-visible"> |
15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> | 15 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-desktop"> |
16 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="logo" /> | 16 | <img src="img/icon.png" width="16" height="16" class="head-logo" alt="" /> |
17 | {$shaarlititle} | 17 | {$shaarlititle} |
18 | </a> | 18 | </a> |
19 | </li> | 19 | </li> |
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index 20060994..c9ce1eaf 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -120,47 +120,27 @@ | |||
120 | </div> | 120 | </div> |
121 | </div> | 121 | </div> |
122 | 122 | ||
123 | {if="$sslenabled"} | ||
124 | <div class="pure-g"> | ||
125 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> | ||
126 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> | ||
127 | <h2 class="window-title">Firefox Social API</h2> | ||
128 | <p>{'You need to browse your Shaarli over <strong>HTTPS</strong> to use this functionality.'|t}</p> | ||
129 | |||
130 | <div class="tools-item"> | ||
131 | <a title="{'Click on this button to add Shaarli to the 'Share this page' button in Firefox" | ||
132 | id="ff-social-button"> | ||
133 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">✚ {'Add to'|t} Firefox Social</span> | ||
134 | </a> | ||
135 | </div> | ||
136 | </div> | ||
137 | </div> | ||
138 | {/if} | ||
139 | |||
140 | <div class="pure-g"> | 123 | <div class="pure-g"> |
141 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> | 124 | <div class="pure-u-lg-1-3 pure-u-1-24"></div> |
142 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> | 125 | <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light"> |
143 | <h2 class="window-title">{'3rd party'|t}</h2> | 126 | <h2 class="window-title">{'3rd party'|t}</h2> |
144 | <div class="tools-item"> | 127 | <div class="tools-item"> |
145 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/" title="Firefox {'Plugin'|t}"> | 128 | <a href="https://addons.mozilla.org/fr/firefox/addon/shaarli/"> |
146 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> | 129 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Firefox {'plugin'|t}</span> |
147 | </a> | 130 | </a> |
148 | </div> | 131 | </div> |
149 | <div class="tools-item"> | 132 | <div class="tools-item"> |
150 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin" | 133 | <a href="https://chrome.google.com/webstore/detail/shiny-shaarli/hajdfkmbdmadjmmpkkbbcnllepomekin"> |
151 | title="Chrome {'Plugin'|t}"> | ||
152 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> | 134 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span> |
153 | </a> | 135 | </a> |
154 | </div> | 136 | </div> |
155 | <div class="tools-item"> | 137 | <div class="tools-item"> |
156 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr" | 138 | <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr"> |
157 | title="Android Shaarlier"> | ||
158 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> | 139 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Shaarlier</span> |
159 | </a> | 140 | </a> |
160 | </div> | 141 | </div> |
161 | <div class="tools-item"> | 142 | <div class="tools-item"> |
162 | <a href="https://stakali.toneiv.eu/" | 143 | <a href="https://stakali.toneiv.eu/"> |
163 | title="Android Stakali"> | ||
164 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> | 144 | <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android Stakali</span> |
165 | </a> | 145 | </a> |
166 | </div> | 146 | </div> |
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; |