diff options
author | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:30:33 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:30:33 +0200 |
commit | 1b8ed48a0d3964186f4d66d443783f4d250e7147 (patch) | |
tree | 23597f312507ba0c1b461755b9aa086106374a4d /tpl | |
parent | 1aa24ed8d2974cda98733f74b36844b02942cc11 (diff) | |
parent | ed3365325d231e044dedc32608fde87b1b39fa34 (diff) | |
download | Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.tar.gz Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.tar.zst Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.zip |
Merge tag 'v0.11.0' into latest
Release v0.11.0
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/404.html | 4 | ||||
-rw-r--r-- | tpl/default/addlink.html | 2 | ||||
-rw-r--r-- | tpl/default/changepassword.html | 6 | ||||
-rw-r--r-- | tpl/default/changetag.html | 8 | ||||
-rw-r--r-- | tpl/default/configure.html | 18 | ||||
-rw-r--r-- | tpl/default/daily.html | 9 | ||||
-rw-r--r-- | tpl/default/editlink.html | 2 | ||||
-rw-r--r-- | tpl/default/export.html | 2 | ||||
-rw-r--r-- | tpl/default/import.html | 2 | ||||
-rw-r--r-- | tpl/default/install.html | 2 | ||||
-rw-r--r-- | tpl/default/linklist.html | 43 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 26 | ||||
-rw-r--r-- | tpl/default/loginform.html | 16 | ||||
-rw-r--r-- | tpl/default/page.footer.html | 5 | ||||
-rw-r--r-- | tpl/default/page.header.html | 39 | ||||
-rw-r--r-- | tpl/default/picwall.html | 2 | ||||
-rw-r--r-- | tpl/default/pluginsadmin.html | 2 | ||||
-rw-r--r-- | tpl/default/tag.cloud.html | 2 | ||||
-rw-r--r-- | tpl/default/tag.list.html | 2 | ||||
-rw-r--r-- | tpl/default/tag.sort.html | 6 | ||||
-rw-r--r-- | tpl/default/thumbnails.html | 2 | ||||
-rw-r--r-- | tpl/default/tools.html | 2 | ||||
-rw-r--r-- | tpl/vintage/configure.html | 8 | ||||
-rw-r--r-- | tpl/vintage/daily.html | 3 |
24 files changed, 129 insertions, 84 deletions
diff --git a/tpl/default/404.html b/tpl/default/404.html index fd337cad..472566a6 100644 --- a/tpl/default/404.html +++ b/tpl/default/404.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -8,7 +8,7 @@ | |||
8 | {include="page.header"} | 8 | {include="page.header"} |
9 | <div class="center" id="page404" class="page404-container"> | 9 | <div class="center" id="page404" class="page404-container"> |
10 | <h2>{'Sorry, nothing to see here.'|t}</h2> | 10 | <h2>{'Sorry, nothing to see here.'|t}</h2> |
11 | <img src="img/sad_star.png"> | 11 | <img src="img/sad_star.png" alt=""> |
12 | <p>{$error_message}</p> | 12 | <p>{$error_message}</p> |
13 | </div> | 13 | </div> |
14 | {include="page.footer"} | 14 | {include="page.footer"} |
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 55864a02..b4b4a0ec 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html index 2d15c92a..ab579433 100644 --- a/tpl/default/changepassword.html +++ b/tpl/default/changepassword.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -11,10 +11,10 @@ | |||
11 | <h2 class="window-title">{"Change password"|t}</h2> | 11 | <h2 class="window-title">{"Change password"|t}</h2> |
12 | <form method="POST" action="#" name="changepasswordform" id="changepasswordform"> | 12 | <form method="POST" action="#" name="changepasswordform" id="changepasswordform"> |
13 | <div> | 13 | <div> |
14 | <input type="password" name="oldpassword" placeholder="{'Current password'|t}" class="autofocus"> | 14 | <input type="password" name="oldpassword" aria-label="{'Current password'|t}" placeholder="{'Current password'|t}" class="autofocus"> |
15 | </div> | 15 | </div> |
16 | <div> | 16 | <div> |
17 | <input type="password" name="setpassword" placeholder="{'New password'|t}"> | 17 | <input type="password" name="setpassword" aria-label="{'New password'|t}" placeholder="{'New password'|t}"> |
18 | </div> | 18 | </div> |
19 | <input type="hidden" name="token" value="{$token}"> | 19 | <input type="hidden" name="token" value="{$token}"> |
20 | <div> | 20 | <div> |
diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html index 6606c4fa..ec6e0b46 100644 --- a/tpl/default/changetag.html +++ b/tpl/default/changetag.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -11,20 +11,20 @@ | |||
11 | <h2 class="window-title">{"Manage tags"|t}</h2> | 11 | <h2 class="window-title">{"Manage tags"|t}</h2> |
12 | <form method="POST" action="#" name="changetag" id="changetag"> | 12 | <form method="POST" action="#" name="changetag" id="changetag"> |
13 | <div> | 13 | <div> |
14 | <input type="text" name="fromtag" placeholder="{'Tag'|t}" value="{$fromtag}" | 14 | <input type="text" name="fromtag" aria-label="{'Tag'|t}" placeholder="{'Tag'|t}" value="{$fromtag}" |
15 | list="tagsList" autocomplete="off" class="awesomplete autofocus" data-minChars="1"> | 15 | list="tagsList" autocomplete="off" class="awesomplete autofocus" data-minChars="1"> |
16 | <datalist id="tagsList"> | 16 | <datalist id="tagsList"> |
17 | {loop="$tags"}<option>{$key}</option>{/loop} | 17 | {loop="$tags"}<option>{$key}</option>{/loop} |
18 | </datalist> | 18 | </datalist> |
19 | </div> | 19 | </div> |
20 | <div> | 20 | <div> |
21 | <input type="text" name="totag" placeholder="{'New name'|t}" | 21 | <input type="text" name="totag" aria-label="{'New name'|t}" placeholder="{'New name'|t}" |
22 | list="toTagsList" autocomplete="off" class="awesomplete" data-minChars="1"> | 22 | list="toTagsList" autocomplete="off" class="awesomplete" data-minChars="1"> |
23 | <datalist id="toTagsList"> | 23 | <datalist id="toTagsList"> |
24 | {loop="$tags"}<option>{$key}</option>{/loop} | 24 | {loop="$tags"}<option>{$key}</option>{/loop} |
25 | </datalist> | 25 | </datalist> |
26 | </div> | 26 | </div> |
27 | <div><i class="fa fa-info-circle"></i> {'Case sensitive'|t}</div> | 27 | <div><i class="fa fa-info-circle" aria-hidden="true"></i> {'Case sensitive'|t}</div> |
28 | <input type="hidden" name="token" value="{$token}"> | 28 | <input type="hidden" name="token" value="{$token}"> |
29 | <div> | 29 | <div> |
30 | <input type="submit" value="{'Rename'|t}" name="renametag"> | 30 | <input type="submit" value="{'Rename'|t}" name="renametag"> |
diff --git a/tpl/default/configure.html b/tpl/default/configure.html index 42e32230..83033624 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -215,6 +215,22 @@ | |||
215 | <div class="pure-g"> | 215 | <div class="pure-g"> |
216 | <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> | 216 | <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> |
217 | <div class="form-label"> | 217 | <div class="form-label"> |
218 | <label for="retrieveDescription"> | ||
219 | <span class="label-name">{'Automatically retrieve description for new bookmarks'|t}</span><br> | ||
220 | <span class="label-desc">{'Shaarli will try to retrieve the description from meta HTML headers'|t}</span> | ||
221 | </label> | ||
222 | </div> | ||
223 | </div> | ||
224 | <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}"> | ||
225 | <div class="form-input"> | ||
226 | <input type="checkbox" name="retrieveDescription" id="retrieveDescription" | ||
227 | {if="$retrieve_description"}checked{/if}/> | ||
228 | </div> | ||
229 | </div> | ||
230 | </div> | ||
231 | <div class="pure-g"> | ||
232 | <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> | ||
233 | <div class="form-label"> | ||
218 | <label for="enableApi"> | 234 | <label for="enableApi"> |
219 | <span class="label-name">{'Enable REST API'|t}</span><br> | 235 | <span class="label-name">{'Enable REST API'|t}</span><br> |
220 | <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span> | 236 | <span class="label-desc">{'Allow third party software to use Shaarli such as mobile application'|t}</span> |
diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 2c409478..6b5103a4 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -44,7 +44,12 @@ | |||
44 | </div> | 44 | </div> |
45 | </div> | 45 | </div> |
46 | <div> | 46 | <div> |
47 | <h3 class="window-subtitle">{function="format_date($dayDate, false)"}</h3> | 47 | <h3 class="window-subtitle"> |
48 | {if="!empty($dayDesc)"} | ||
49 | {$dayDesc} - | ||
50 | {/if} | ||
51 | {function="format_date($dayDate, false)"} | ||
52 | </h3> | ||
48 | 53 | ||
49 | <div id="plugin_zone_about_daily" class="plugin_zone"> | 54 | <div id="plugin_zone_about_daily" class="plugin_zone"> |
50 | {loop="$daily_about_plugin"} | 55 | {loop="$daily_about_plugin"} |
diff --git a/tpl/default/editlink.html b/tpl/default/editlink.html index d8c57155..df14535d 100644 --- a/tpl/default/editlink.html +++ b/tpl/default/editlink.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/export.html b/tpl/default/export.html index af1d6e33..99c01b11 100644 --- a/tpl/default/export.html +++ b/tpl/default/export.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/import.html b/tpl/default/import.html index bdc9086e..20f854d1 100644 --- a/tpl/default/import.html +++ b/tpl/default/import.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/install.html b/tpl/default/install.html index 6199b33d..f0e7040e 100644 --- a/tpl/default/install.html +++ b/tpl/default/install.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index ed78f40a..a025d53c 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -52,7 +52,7 @@ | |||
52 | {/loop} | 52 | {/loop} |
53 | 53 | ||
54 | <div id="linklist"> | 54 | <div id="linklist"> |
55 | <div id="link-count-block" class="pure-g"> | 55 | <div id="link-count-block" class="pure-g link-count-block"> |
56 | <div class="pure-u-lg-2-24 pure-u-1-24"></div> | 56 | <div class="pure-u-lg-2-24 pure-u-1-24"></div> |
57 | <div id="link-count-content" class="pure-u-lg-20-24 pure-u-22-24"> | 57 | <div id="link-count-content" class="pure-u-lg-20-24 pure-u-22-24"> |
58 | <div class="linkcount pure-u-lg-0 center"> | 58 | <div class="linkcount pure-u-lg-0 center"> |
@@ -94,7 +94,7 @@ | |||
94 | {'tagged'|t} | 94 | {'tagged'|t} |
95 | {loop="$exploded_tags"} | 95 | {loop="$exploded_tags"} |
96 | <span class="label label-tag" title="{'Remove tag'|t}"> | 96 | <span class="label label-tag" title="{'Remove tag'|t}"> |
97 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times"></i></span></a> | 97 | <a href="?removetag={function="urlencode($value)"}">{$value}<span class="remove"><i class="fa fa-times" aria-hidden="true"></i></span></a> |
98 | </span> | 98 | </span> |
99 | {/loop} | 99 | {/loop} |
100 | {/if} | 100 | {/if} |
@@ -146,13 +146,14 @@ | |||
146 | </div> | 146 | </div> |
147 | {/if} | 147 | {/if} |
148 | 148 | ||
149 | {if="$is_logged_in"} | 149 | <div class="linklist-item-editbuttons"> |
150 | <div class="linklist-item-editbuttons"> | 150 | {if="$value.sticky"} |
151 | {if="$value.private"} | 151 | <span class="label label-sticky">{$strSticky}</span> |
152 | <span class="label label-private">{$strPrivate}</span> | 152 | {/if} |
153 | {/if} | 153 | {if="$value.private"} |
154 | </div> | 154 | <span class="label label-private">{$strPrivate}</span> |
155 | {/if} | 155 | {/if} |
156 | </div> | ||
156 | 157 | ||
157 | <h2> | 158 | <h2> |
158 | <a href="{$value.real_url}"> | 159 | <a href="{$value.real_url}"> |
@@ -195,18 +196,18 @@ | |||
195 | <input type="checkbox" class="link-checkbox" value="{$value.id}"> | 196 | <input type="checkbox" class="link-checkbox" value="{$value.id}"> |
196 | </span> | 197 | </span> |
197 | <span class="linklist-item-infos-controls-item ctrl-edit"> | 198 | <span class="linklist-item-infos-controls-item ctrl-edit"> |
198 | <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a> | 199 | <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a> |
199 | </span> | 200 | </span> |
200 | <span class="linklist-item-infos-controls-item ctrl-delete"> | 201 | <span class="linklist-item-infos-controls-item ctrl-delete"> |
201 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 202 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" aria-label="{$strDelete}" |
202 | title="{$strDelete}" class="delete-link pure-u-0 pure-u-lg-visible confirm-delete"> | 203 | title="{$strDelete}" class="delete-link pure-u-0 pure-u-lg-visible confirm-delete"> |
203 | <i class="fa fa-trash"></i> | 204 | <i class="fa fa-trash" aria-hidden="true"></i> |
204 | </a> | 205 | </a> |
205 | </span> | 206 | </span> |
206 | <span class="linklist-item-infos-controls-item ctrl-pin"> | 207 | <span class="linklist-item-infos-controls-item ctrl-pin"> |
207 | <a href="?do=pin&id={$value.id}&token={$token}" | 208 | <a href="?do=pin&id={$value.id}&token={$token}" |
208 | title="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if} pure-u-0 pure-u-lg-visible"> | 209 | title="{$strToggleSticky}" aria-label="{$strToggleSticky}" class="pin-link {if="$value.sticky"}pinned-link{/if} pure-u-0 pure-u-lg-visible"> |
209 | <i class="fa fa-thumb-tack"></i> | 210 | <i class="fa fa-thumb-tack" aria-hidden="true"></i> |
210 | </a> | 211 | </a> |
211 | </span> | 212 | </span> |
212 | </div> | 213 | </div> |
@@ -248,10 +249,10 @@ | |||
248 | {ignore}do not add space or line break between these div - Firefox issue{/ignore} | 249 | {ignore}do not add space or line break between these div - Firefox issue{/ignore} |
249 | class="linklist-item-infos-url pure-u-lg-5-12 pure-u-1"> | 250 | class="linklist-item-infos-url pure-u-lg-5-12 pure-u-1"> |
250 | <a href="{$value.real_url}" title="{$value.title}"> | 251 | <a href="{$value.real_url}" title="{$value.title}"> |
251 | <i class="fa fa-link"></i> {$value.url} | 252 | <i class="fa fa-link" aria-hidden="true"></i> {$value.url} |
252 | </a> | 253 | </a> |
253 | <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible"> | 254 | <div class="linklist-item-buttons pure-u-0 pure-u-lg-visible"> |
254 | <a href="#" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up"></i></a> | 255 | <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button"><i class="fa fa-chevron-up" aria-hidden="true"></i></a> |
255 | </div> | 256 | </div> |
256 | </div> | 257 | </div> |
257 | <div class="mobile-buttons pure-u-1 pure-u-lg-0"> | 258 | <div class="mobile-buttons pure-u-1 pure-u-lg-0"> |
@@ -264,12 +265,12 @@ | |||
264 | {/if} | 265 | {/if} |
265 | {if="$is_logged_in"} | 266 | {if="$is_logged_in"} |
266 | · | 267 | · |
267 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" | 268 | <a href="?delete_link&lf_linkdate={$value.id}&token={$token}" aria-label="{$strDelete}" |
268 | title="{$strDelete}" class="delete-link confirm-delete"> | 269 | title="{$strDelete}" class="delete-link confirm-delete"> |
269 | <i class="fa fa-trash"></i> | 270 | <i class="fa fa-trash" aria-hidden="true"></i> |
270 | </a> | 271 | </a> |
271 | · | 272 | · |
272 | <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a> | 273 | <a href="?edit_link={$value.id}" aria-label="{$strEdit}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link" aria-hidden="true"></i></a> |
273 | {/if} | 274 | {/if} |
274 | </div> | 275 | </div> |
275 | </div> | 276 | </div> |
@@ -286,7 +287,7 @@ | |||
286 | {/loop} | 287 | {/loop} |
287 | </div> | 288 | </div> |
288 | 289 | ||
289 | <div id="linklist-paging-bottom-block" class="pure-g"> | 290 | <div id="linklist-paging-bottom-block" class="pure-g link-count-block"> |
290 | <div class="pure-u-lg-2-24 pure-u-1-24"></div> | 291 | <div class="pure-u-lg-2-24 pure-u-1-24"></div> |
291 | <div id="linklist-paging-bottom-content" class="pure-u-lg-20-24 pure-u-22-24"> | 292 | <div id="linklist-paging-bottom-content" class="pure-u-lg-20-24 pure-u-22-24"> |
292 | {include="linklist.paging"} | 293 | {include="linklist.paging"} |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index fe665a84..68947f92 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -6,21 +6,21 @@ | |||
6 | {'Filters'|t} | 6 | {'Filters'|t} |
7 | </span> | 7 | </span> |
8 | {if="$is_logged_in"} | 8 | {if="$is_logged_in"} |
9 | <a href="?visibility=private" title="{'Only display private links'|t}" | 9 | <a href="?visibility=private" aria-label="{'Only display private links'|t}" title="{'Only display private links'|t}" |
10 | class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}" | 10 | class="{if="$visibility==='private'"}filter-on{else}filter-off{/if}" |
11 | ><i class="fa fa-user-secret"></i></a> | 11 | ><i class="fa fa-user-secret" aria-hidden="true"></i></a> |
12 | <a href="?visibility=public" title="{'Only display public links'|t}" | 12 | <a href="?visibility=public" aria-label="{'Only display public links'|t}" title="{'Only display public links'|t}" |
13 | class="{if="$visibility==='public'"}filter-on{else}filter-off{/if}" | 13 | class="{if="$visibility==='public'"}filter-on{else}filter-off{/if}" |
14 | ><i class="fa fa-globe"></i></a> | 14 | ><i class="fa fa-globe" aria-hidden="true"></i></a> |
15 | {/if} | 15 | {/if} |
16 | <a href="?untaggedonly" title="{'Filter untagged links'|t}" | 16 | <a href="?untaggedonly" aria-label="{'Filter untagged links'|t}" title="{'Filter untagged links'|t}" |
17 | class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if} | 17 | class={if="$untaggedonly"}"filter-on"{else}"filter-off"{/if} |
18 | ><i class="fa fa-tag"></i></a> | 18 | ><i class="fa fa-tag" aria-hidden="true"></i></a> |
19 | <a href="#" title="{'Select all'|t}" | 19 | <a href="#" aria-label="{'Select all'|t}" title="{'Select all'|t}" |
20 | class="filter-off select-all-button" | 20 | class="filter-off select-all-button pure-u-0 pure-u-lg-visible" |
21 | ><i class="fa fa-check-square-o"></i></a> | 21 | ><i class="fa fa-check-square-o" aria-hidden="true"></i></a> |
22 | <a href="#" class="filter-off fold-all pure-u-lg-0" title="{'Fold all'|t}"> | 22 | <a href="#" class="filter-off fold-all pure-u-lg-0" aria-label="{'Fold all'|t}" title="{'Fold all'|t}"> |
23 | <i class="fa fa-chevron-up"></i> | 23 | <i class="fa fa-chevron-up" aria-hidden="true"></i> |
24 | </a> | 24 | </a> |
25 | {loop="$action_plugin"} | 25 | {loop="$action_plugin"} |
26 | {$value.attr.class=isset($value.attr.class) ? $value.attr.class : ''} | 26 | {$value.attr.class=isset($value.attr.class) ? $value.attr.class : ''} |
@@ -59,8 +59,8 @@ | |||
59 | <form method="GET" class="pure-u-0 pure-u-lg-visible"> | 59 | <form method="GET" class="pure-u-0 pure-u-lg-visible"> |
60 | <input type="text" name="linksperpage" placeholder="133"> | 60 | <input type="text" name="linksperpage" placeholder="133"> |
61 | </form> | 61 | </form> |
62 | <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" title="{'Fold all'|t}"> | 62 | <a href="#" class="filter-off fold-all pure-u-0 pure-u-lg-visible" aria-label="{'Fold all'|t}" title="{'Fold all'|t}"> |
63 | <i class="fa fa-chevron-up"></i> | 63 | <i class="fa fa-chevron-up" aria-hidden="true"></i> |
64 | </a> | 64 | </a> |
65 | </div> | 65 | </div> |
66 | </div> | 66 | </div> |
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 3cdab65a..761aec0c 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
@@ -9,7 +9,7 @@ | |||
9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> | 9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> |
10 | <div class="pure-u-2-24"></div> | 10 | <div class="pure-u-2-24"></div> |
11 | <div class="pure-u-20-24"> | 11 | <div class="pure-u-20-24"> |
12 | {'You have been banned after too many failed login attempts. Try again later.'|t} | 12 | <p>{'You have been banned after too many failed login attempts. Try again later.'|t}</p> |
13 | </div> | 13 | </div> |
14 | <div class="pure-u-2-24"> | 14 | <div class="pure-u-2-24"> |
15 | <i class="fa fa-times pure-alert-close"></i> | 15 | <i class="fa fa-times pure-alert-close"></i> |
@@ -22,20 +22,19 @@ | |||
22 | <form method="post" name="loginform"> | 22 | <form method="post" name="loginform"> |
23 | <h2 class="window-title">{'Login'|t}</h2> | 23 | <h2 class="window-title">{'Login'|t}</h2> |
24 | <div> | 24 | <div> |
25 | <input type="text" name="login" placeholder="{'Username'|t}" | 25 | <input type="text" name="login" aria-label="{'Username'|t}" placeholder="{'Username'|t}" |
26 | {if="!empty($username)"}value="{$username}"{/if} class="autofocus" tabindex="20"> | 26 | {if="!empty($username)"}value="{$username}"{/if} class="autofocus"> |
27 | </div> | 27 | </div> |
28 | <div> | 28 | <div> |
29 | <input type="password" name="password" placeholder="{'Password'|t}" class="autofocus" tabindex="21"> | 29 | <input type="password" name="password" aria-label="{'Password'|t}" placeholder="{'Password'|t}" class="autofocus"> |
30 | </div> | 30 | </div> |
31 | <div class="remember-me"> | 31 | <div class="remember-me"> |
32 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" | 32 | <input type="checkbox" name="longlastingsession" id="longlastingsessionform" |
33 | {if="$remember_user_default"}checked="checked"{/if} | 33 | {if="$remember_user_default"}checked="checked"{/if}> |
34 | tabindex="22"> | ||
35 | <label for="longlastingsessionform">{'Remember me'|t}</label> | 34 | <label for="longlastingsessionform">{'Remember me'|t}</label> |
36 | </div> | 35 | </div> |
37 | <div> | 36 | <div> |
38 | <input type="submit" value="{'Login'|t}" class="bigbutton" tabindex="23"> | 37 | <input type="submit" value="{'Login'|t}" class="bigbutton"> |
39 | </div> | 38 | </div> |
40 | <input type="hidden" name="token" value="{$token}"> | 39 | <input type="hidden" name="token" value="{$token}"> |
41 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} | 40 | {if="$returnurl"}<input type="hidden" name="returnurl" value="{$returnurl}">{/if} |
@@ -48,4 +47,3 @@ | |||
48 | {include="page.footer"} | 47 | {include="page.footer"} |
49 | </body> | 48 | </body> |
50 | </html> | 49 | </html> |
51 | |||
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 5af39be7..ce858e8c 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html | |||
@@ -2,7 +2,8 @@ | |||
2 | 2 | ||
3 | <div class="pure-g"> | 3 | <div class="pure-g"> |
4 | <div class="pure-u-2-24"></div> | 4 | <div class="pure-u-2-24"></div> |
5 | <div id="footer" class="pure-u-20-24 footer-container"> | 5 | <footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo"> |
6 | <i class="fa fa-shaarli" aria-hidden="true"></i> | ||
6 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> | 7 | <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> |
7 | {if="$is_logged_in===true"} | 8 | {if="$is_logged_in===true"} |
8 | {$version} | 9 | {$version} |
@@ -13,7 +14,7 @@ | |||
13 | {loop="$plugins_footer.text"} | 14 | {loop="$plugins_footer.text"} |
14 | {$value} | 15 | {$value} |
15 | {/loop} | 16 | {/loop} |
16 | </div> | 17 | </footer> |
17 | <div class="pure-u-2-24"></div> | 18 | <div class="pure-u-2-24"></div> |
18 | </div> | 19 | </div> |
19 | 20 | ||
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 4f6dd4d8..0ba1993f 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -1,11 +1,13 @@ | |||
1 | <div class="shaarli-menu pure-g" id="shaarli-menu"> | 1 | <div class="shaarli-menu pure-g" id="shaarli-menu"> |
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 | <header role="banner"> | ||
4 | <a href="{$titleLink}" class="pure-menu-link shaarli-title" id="shaarli-title-mobile"> | 5 | <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="" /> | 6 | <i class="fa fa-shaarli" aria-hidden="true"></i> |
6 | {$shaarlititle} | 7 | {$shaarlititle} |
7 | </a> | 8 | </a> |
8 | <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a> | 9 | </header> |
10 | <a href="#" class="menu-toggle" id="menu-toggle" aria-label="Menu"><s class="bar" aria-hidden="true"></s><s class="bar" aria-hidden="true"></s></a> | ||
9 | </div> | 11 | </div> |
10 | </div> | 12 | </div> |
11 | <div class="pure-u-1"> | 13 | <div class="pure-u-1"> |
@@ -13,14 +15,14 @@ | |||
13 | <ul class="pure-menu-list pure-u-lg-5-6 pure-u-1"> | 15 | <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"> | 16 | <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"> | 17 | <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="" /> | 18 | <i class="fa fa-shaarli" aria-hidden="true"></i> |
17 | {$shaarlititle} | 19 | {$shaarlititle} |
18 | </a> | 20 | </a> |
19 | </li> | 21 | </li> |
20 | {if="$is_logged_in || $openshaarli"} | 22 | {if="$is_logged_in || $openshaarli"} |
21 | <li class="pure-menu-item"> | 23 | <li class="pure-menu-item"> |
22 | <a href="?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare"> | 24 | <a href="?do=addlink" class="pure-menu-link" id="shaarli-menu-shaare"> |
23 | <i class="fa fa-plus" ></i> {'Shaare'|t} | 25 | <i class="fa fa-plus" aria-hidden="true"></i> {'Shaare'|t} |
24 | </a> | 26 | </a> |
25 | </li> | 27 | </li> |
26 | <li class="pure-menu-item" id="shaarli-menu-tools"> | 28 | <li class="pure-menu-item" id="shaarli-menu-tools"> |
@@ -67,27 +69,27 @@ | |||
67 | <li class="pure-menu-item" id="shaarli-menu-desktop-search"> | 69 | <li class="pure-menu-item" id="shaarli-menu-desktop-search"> |
68 | <a href="#" class="pure-menu-link subheader-opener" | 70 | <a href="#" class="pure-menu-link subheader-opener" |
69 | data-open-id="search" | 71 | data-open-id="search" |
70 | id="search-button" title="{'Search'|t}"> | 72 | id="search-button" aria-label="{'Search'|t}" title="{'Search'|t}"> |
71 | <i class="fa fa-search"></i> | 73 | <i class="fa fa-search" aria-hidden="true"></i> |
72 | </a> | 74 | </a> |
73 | </li> | 75 | </li> |
74 | <li class="pure-menu-item" id="shaarli-menu-desktop-rss"> | 76 | <li class="pure-menu-item" id="shaarli-menu-desktop-rss"> |
75 | <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}"> | 77 | <a href="?do={$feed_type}{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}" aria-label="{'RSS Feed'|t}"> |
76 | <i class="fa fa-rss"></i> | 78 | <i class="fa fa-rss" aria-hidden="true"></i> |
77 | </a> | 79 | </a> |
78 | </li> | 80 | </li> |
79 | {if="!$is_logged_in"} | 81 | {if="!$is_logged_in"} |
80 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> | 82 | <li class="pure-menu-item" id="shaarli-menu-desktop-login"> |
81 | <a href="?do=login" class="pure-menu-link" | 83 | <a href="?do=login" class="pure-menu-link" |
82 | data-open-id="header-login-form" | 84 | data-open-id="header-login-form" |
83 | id="login-button" title="{'Login'|t}"> | 85 | id="login-button" aria-label="{'Login'|t}" title="{'Login'|t}"> |
84 | <i class="fa fa-user"></i> | 86 | <i class="fa fa-user" aria-hidden="true"></i> |
85 | </a> | 87 | </a> |
86 | </li> | 88 | </li> |
87 | {else} | 89 | {else} |
88 | <li class="pure-menu-item" id="shaarli-menu-desktop-logout"> | 90 | <li class="pure-menu-item" id="shaarli-menu-desktop-logout"> |
89 | <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}"> | 91 | <a href="?do=logout" class="pure-menu-link" aria-label="{'Logout'|t}" title="{'Logout'|t}"> |
90 | <i class="fa fa-sign-out"></i> | 92 | <i class="fa fa-sign-out" aria-hidden="true"></i> |
91 | </a> | 93 | </a> |
92 | </li> | 94 | </li> |
93 | {/if} | 95 | {/if} |
@@ -118,7 +120,18 @@ | |||
118 | <div id="actions" class="subheader-form"> | 120 | <div id="actions" class="subheader-form"> |
119 | <div class="pure-g"> | 121 | <div class="pure-g"> |
120 | <div class="pure-u-1"> | 122 | <div class="pure-u-1"> |
121 | <a href="" id="actions-delete" class="button">{'Delete'|t}</a> | 123 | <a href="" id="actions-delete" class="button"> |
124 | <i class="fa fa-trash"></i> | ||
125 | {'Delete'|t} | ||
126 | </a> | ||
127 | <a href="" class="actions-change-visibility button" data-visibility="public"> | ||
128 | <i class="fa fa-globe"></i> | ||
129 | {'Set public'|t} | ||
130 | </a> | ||
131 | <a href="" class="actions-change-visibility button" data-visibility="private"> | ||
132 | <i class="fa fa-user-secret"></i> | ||
133 | {'Set private'|t} | ||
134 | </a> | ||
122 | </div> | 135 | </div> |
123 | </div> | 136 | </div> |
124 | </div> | 137 | </div> |
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 4c325487..5a959244 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index 82041972..4bfaa934 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/tag.cloud.html b/tpl/default/tag.cloud.html index 9e52158d..bedf3f8c 100644 --- a/tpl/default/tag.cloud.html +++ b/tpl/default/tag.cloud.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/tag.list.html b/tpl/default/tag.list.html index bcddcd56..41eab246 100644 --- a/tpl/default/tag.list.html +++ b/tpl/default/tag.list.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/tag.sort.html b/tpl/default/tag.sort.html index 89acda0d..d24c9f64 100644 --- a/tpl/default/tag.sort.html +++ b/tpl/default/tag.sort.html | |||
@@ -1,8 +1,8 @@ | |||
1 | <div class="pure-g"> | 1 | <div class="pure-g"> |
2 | <div class="pure-u-1 pure-alert pure-alert-success tag-sort"> | 2 | <div class="pure-u-1 pure-alert pure-alert-success tag-sort"> |
3 | {'Sort by:'|t} | 3 | {'Sort by:'|t} |
4 | <a href="?do=tagcloud" title="cloud">{'Cloud'|t}</a> · | 4 | <a href="?do=tagcloud">{'Cloud'|t}</a> · |
5 | <a href="?do=taglist&sort=usage" title="cloud">{'Most used'|t}</a> · | 5 | <a href="?do=taglist&sort=usage">{'Most used'|t}</a> · |
6 | <a href="?do=taglist&sort=alpha" title="cloud">{'Alphabetical'|t}</a> | 6 | <a href="?do=taglist&sort=alpha">{'Alphabetical'|t}</a> |
7 | </div> | 7 | </div> |
8 | </div> \ No newline at end of file | 8 | </div> \ No newline at end of file |
diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html index a8cf904e..f1939798 100644 --- a/tpl/default/thumbnails.html +++ b/tpl/default/thumbnails.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/default/tools.html b/tpl/default/tools.html index c9ce1eaf..20d0c893 100644 --- a/tpl/default/tools.html +++ b/tpl/default/tools.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html{if="$language !== 'auto'"} lang="{$language}"{/if}> |
3 | <head> | 3 | <head> |
4 | {include="includes"} | 4 | {include="includes"} |
5 | </head> | 5 | </head> |
diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html index f1892fa1..160286a5 100644 --- a/tpl/vintage/configure.html +++ b/tpl/vintage/configure.html | |||
@@ -107,6 +107,14 @@ | |||
107 | </td> | 107 | </td> |
108 | </tr> | 108 | </tr> |
109 | <tr> | 109 | <tr> |
110 | <td valign="top"><b>Automatically retrieve description for new bookmarks:</b></td> | ||
111 | <td> | ||
112 | <input type="checkbox" name="retrieveDescription" id="retrieveDescription" | ||
113 | {if="$retrieve_description"}checked{/if}/> | ||
114 | <label for="retrieveDescription"> Shaarli will try to retrieve the description from meta HTML headers</label> | ||
115 | </td> | ||
116 | </tr> | ||
117 | <tr> | ||
110 | <td valign="top"><b>Enable REST API</b></td> | 118 | <td valign="top"><b>Enable REST API</b></td> |
111 | <td> | 119 | <td> |
112 | <input type="checkbox" name="enableApi" id="enableApi" | 120 | <input type="checkbox" name="enableApi" id="enableApi" |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index 71d84475..00f18e26 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
@@ -35,6 +35,9 @@ | |||
35 | 35 | ||
36 | <div class="dailyDate"> | 36 | <div class="dailyDate"> |
37 | <span class="nomobile">———————————</span> | 37 | <span class="nomobile">———————————</span> |
38 | {if="!empty($dayDesc)"} | ||
39 | {$dayDesc} - | ||
40 | {/if} | ||
38 | {function="strftime('%A %d, %B %Y', $day)"} | 41 | {function="strftime('%A %d, %B %Y', $day)"} |
39 | <span class="nomobile">———————————</span> | 42 | <span class="nomobile">———————————</span> |
40 | </div> | 43 | </div> |