diff options
author | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:46:02 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:46:02 +0100 |
commit | af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e (patch) | |
tree | e461ef309a15e9b9da6058892350c4275558d783 /tpl | |
parent | 1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715 (diff) | |
parent | 1c03b65e2ea722b39e54b22c46014f35e34b575b (diff) | |
download | Shaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.tar.gz Shaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.tar.zst Shaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.zip |
Merge tag 'v0.10.3' into latest
Release v0.10.3
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/addlink.html | 3 | ||||
-rw-r--r-- | tpl/default/daily.html | 2 | ||||
-rw-r--r-- | tpl/default/includes.html | 20 | ||||
-rw-r--r-- | tpl/default/linklist.html | 22 | ||||
-rw-r--r-- | tpl/default/linklist.paging.html | 3 | ||||
-rw-r--r-- | tpl/default/page.header.html | 2 | ||||
-rw-r--r-- | tpl/default/picwall.html | 2 | ||||
-rw-r--r-- | tpl/vintage/daily.html | 2 | ||||
-rw-r--r-- | tpl/vintage/includes.html | 20 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 2 | ||||
-rw-r--r-- | tpl/vintage/picwall.html | 2 |
11 files changed, 71 insertions, 9 deletions
diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html index 2f956e06..55864a02 100644 --- a/tpl/default/addlink.html +++ b/tpl/default/addlink.html | |||
@@ -11,7 +11,8 @@ | |||
11 | <h2 class="window-title">{"Shaare a new link"|t}</h2> | 11 | <h2 class="window-title">{"Shaare a new link"|t}</h2> |
12 | <form method="GET" action="#" name="addform" class="addform"> | 12 | <form method="GET" action="#" name="addform" class="addform"> |
13 | <div> | 13 | <div> |
14 | <input type="text" name="post" placeholder="{'URL or leave empty to post a note'|t}" class="autofocus"> | 14 | <label for="shaare">{'URL or leave empty to post a note'|t}</label> |
15 | <input type="text" name="post" id="shaare" class="autofocus"> | ||
15 | </div> | 16 | </div> |
16 | <div> | 17 | <div> |
17 | <input type="submit" value="{'Add link'|t}"> | 18 | <input type="submit" value="{'Add link'|t}"> |
diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 816e5d0a..2c409478 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html | |||
@@ -72,7 +72,7 @@ | |||
72 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} | 72 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} |
73 | <div class="daily-entry-thumbnail"> | 73 | <div class="daily-entry-thumbnail"> |
74 | <img data-src="{$link.thumbnail}#" class="b-lazy" | 74 | <img data-src="{$link.thumbnail}#" class="b-lazy" |
75 | src="#" | 75 | src="" |
76 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 76 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
77 | </div> | 77 | </div> |
78 | {/if} | 78 | {/if} |
diff --git a/tpl/default/includes.html b/tpl/default/includes.html index 5ccacaaf..6c30d1bf 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html | |||
@@ -15,3 +15,23 @@ | |||
15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> | 15 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> |
16 | {/if} | 16 | {/if} |
17 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/> | 17 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle}"/> |
18 | {if="! empty($links) && count($links) === 1"} | ||
19 | {$link=reset($links)} | ||
20 | <meta property="og:title" content="{$link.title}" /> | ||
21 | <meta property="og:type" content="article" /> | ||
22 | <meta property="og:url" content="{$index_url}?{$link.shorturl}" /> | ||
23 | {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description} | ||
24 | <meta property="og:description" content="{function="substr(strip_tags($ogDescription), 0, 300)"}" /> | ||
25 | {if="$link.thumbnail"} | ||
26 | <meta property="og:image" content="{$index_url}{$link.thumbnail}" /> | ||
27 | {/if} | ||
28 | {if="!$hide_timestamps || $is_logged_in"} | ||
29 | <meta property="article:published_time" content="{$link.created->format(DateTime::ATOM)}" /> | ||
30 | {if="$link.updated"} | ||
31 | <meta property="article:modified_time" content="{$link.updated->format(DateTime::ATOM)}" /> | ||
32 | {/if} | ||
33 | {/if} | ||
34 | {loop="link.taglist"} | ||
35 | <meta property="article:tag" content="{$value}" /> | ||
36 | {/loop} | ||
37 | {/if} | ||
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 8ea2ce66..ed78f40a 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -125,6 +125,8 @@ | |||
125 | {$strPermalink=t('Permalink')} | 125 | {$strPermalink=t('Permalink')} |
126 | {$strPermalinkLc=t('permalink')} | 126 | {$strPermalinkLc=t('permalink')} |
127 | {$strAddTag=t('Add tag')} | 127 | {$strAddTag=t('Add tag')} |
128 | {$strToggleSticky=t('Toggle sticky')} | ||
129 | {$strSticky=t('Sticky')} | ||
128 | {ignore}End of translations{/ignore} | 130 | {ignore}End of translations{/ignore} |
129 | {loop="links"} | 131 | {loop="links"} |
130 | <div class="anchor" id="{$value.shorturl}"></div> | 132 | <div class="anchor" id="{$value.shorturl}"></div> |
@@ -137,7 +139,7 @@ | |||
137 | <a href="{$value.real_url}"> | 139 | <a href="{$value.real_url}"> |
138 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} | 140 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
139 | <img data-src="{$value.thumbnail}#" class="b-lazy" | 141 | <img data-src="{$value.thumbnail}#" class="b-lazy" |
140 | src="#" | 142 | src="" |
141 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 143 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
142 | </a> | 144 | </a> |
143 | </div> | 145 | </div> |
@@ -190,7 +192,7 @@ | |||
190 | {if="$is_logged_in"} | 192 | {if="$is_logged_in"} |
191 | <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> | 193 | <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> |
192 | <span class="linklist-item-infos-controls-item ctrl-checkbox"> | 194 | <span class="linklist-item-infos-controls-item ctrl-checkbox"> |
193 | <input type="checkbox" class="delete-checkbox" value="{$value.id}"> | 195 | <input type="checkbox" class="link-checkbox" value="{$value.id}"> |
194 | </span> | 196 | </span> |
195 | <span class="linklist-item-infos-controls-item ctrl-edit"> | 197 | <span class="linklist-item-infos-controls-item ctrl-edit"> |
196 | <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a> | 198 | <a href="?edit_link={$value.id}" title="{$strEdit}"><i class="fa fa-pencil-square-o edit-link"></i></a> |
@@ -201,7 +203,23 @@ | |||
201 | <i class="fa fa-trash"></i> | 203 | <i class="fa fa-trash"></i> |
202 | </a> | 204 | </a> |
203 | </span> | 205 | </span> |
206 | <span class="linklist-item-infos-controls-item ctrl-pin"> | ||
207 | <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 | <i class="fa fa-thumb-tack"></i> | ||
210 | </a> | ||
211 | </span> | ||
204 | </div> | 212 | </div> |
213 | {else} | ||
214 | {if="$value.sticky"} | ||
215 | <div class="linklist-item-infos-controls-group pure-u-0 pure-u-lg-visible"> | ||
216 | <span class="linklist-item-infos-controls-item ctrl-pin"> | ||
217 | <span title="{$strSticky}" class="pin-link pinned-link pure-u-0 pure-u-lg-visible"> | ||
218 | <i class="fa fa-thumb-tack"></i> | ||
219 | </span> | ||
220 | </span> | ||
221 | </div> | ||
222 | {/if} | ||
205 | {/if} | 223 | {/if} |
206 | <a href="?{$value.shorturl}" title="{$strPermalink}"> | 224 | <a href="?{$value.shorturl}" title="{$strPermalink}"> |
207 | {if="!$hide_timestamps || $is_logged_in"} | 225 | {if="!$hide_timestamps || $is_logged_in"} |
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html index 5309e348..fe665a84 100644 --- a/tpl/default/linklist.paging.html +++ b/tpl/default/linklist.paging.html | |||
@@ -16,6 +16,9 @@ | |||
16 | <a href="?untaggedonly" title="{'Filter untagged links'|t}" | 16 | <a href="?untaggedonly" 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"></i></a> |
19 | <a href="#" title="{'Select all'|t}" | ||
20 | class="filter-off select-all-button" | ||
21 | ><i class="fa fa-check-square-o"></i></a> | ||
19 | <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" title="{'Fold all'|t}"> |
20 | <i class="fa fa-chevron-up"></i> | 23 | <i class="fa fa-chevron-up"></i> |
21 | </a> | 24 | </a> |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 3b43a611..4f6dd4d8 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -118,7 +118,7 @@ | |||
118 | <div id="actions" class="subheader-form"> | 118 | <div id="actions" class="subheader-form"> |
119 | <div class="pure-g"> | 119 | <div class="pure-g"> |
120 | <div class="pure-u-1"> | 120 | <div class="pure-u-1"> |
121 | <a href="" id="actions-delete" class="button">Delete</a> | 121 | <a href="" id="actions-delete" class="button">{'Delete'|t}</a> |
122 | </div> | 122 | </div> |
123 | </div> | 123 | </div> |
124 | </div> | 124 | </div> |
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 9a0b10dc..4c325487 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -37,7 +37,7 @@ | |||
37 | <div class="picwall-pictureframe"> | 37 | <div class="picwall-pictureframe"> |
38 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} | 38 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
39 | <img data-src="{$value.thumbnail}#" class="b-lazy" | 39 | <img data-src="{$value.thumbnail}#" class="b-lazy" |
40 | src="#" | 40 | src="" |
41 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 41 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
42 | <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> | 42 | <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> |
43 | {loop="$value.picwall_plugin"} | 43 | {loop="$value.picwall_plugin"} |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index 00148a58..71d84475 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
@@ -71,7 +71,7 @@ | |||
71 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} | 71 | {if="$thumbnails_enabled && !empty($link.thumbnail)"} |
72 | <div class="dailyEntryThumbnail"> | 72 | <div class="dailyEntryThumbnail"> |
73 | <img data-src="{$link.thumbnail}#" class="b-lazy" | 73 | <img data-src="{$link.thumbnail}#" class="b-lazy" |
74 | src="#" | 74 | src="" |
75 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 75 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
76 | </div> | 76 | </div> |
77 | {/if} | 77 | {/if} |
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html index 410b466b..2efb6b10 100644 --- a/tpl/vintage/includes.html +++ b/tpl/vintage/includes.html | |||
@@ -12,3 +12,23 @@ | |||
12 | {/loop} | 12 | {/loop} |
13 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if} | 13 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if} |
14 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> | 14 | <link rel="search" type="application/opensearchdescription+xml" href="?do=opensearch#" title="Shaarli search - {$shaarlititle|htmlspecialchars}"/> |
15 | {if="! empty($links) && count($links) === 1"} | ||
16 | {$link=reset($links)} | ||
17 | <meta property="og:title" content="{$link.title}" /> | ||
18 | <meta property="og:type" content="article" /> | ||
19 | <meta property="og:url" content="{$index_url}?{$link.shorturl}" /> | ||
20 | {$ogDescription=isset($link.description_src) ? $link.description_src : $link.description} | ||
21 | <meta property="og:description" content="{function="mb_substr(strip_tags($ogDescription), 0, 300)"}" /> | ||
22 | {if="$link.thumbnail"} | ||
23 | <meta property="og:image" content="{$index_url}{$link.thumbnail}" /> | ||
24 | {/if} | ||
25 | {if="!$hide_timestamps || $is_logged_in"} | ||
26 | <meta property="article:published_time" content="{$link.created->format(DateTime::ATOM)}" /> | ||
27 | {if="$link.updated"} | ||
28 | <meta property="article:modified_time" content="{$link.updated->format(DateTime::ATOM)}" /> | ||
29 | {/if} | ||
30 | {/if} | ||
31 | {loop="link.taglist"} | ||
32 | <meta property="article:tag" content="{$value}" /> | ||
33 | {/loop} | ||
34 | {/if} | ||
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 3f202849..dcb14e90 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -85,7 +85,7 @@ | |||
85 | <a href="{$value.real_url}"> | 85 | <a href="{$value.real_url}"> |
86 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} | 86 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
87 | <img data-src="{$value.thumbnail}#" class="b-lazy" | 87 | <img data-src="{$value.thumbnail}#" class="b-lazy" |
88 | src="#" | 88 | src="" |
89 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 89 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
90 | </a> | 90 | </a> |
91 | </div> | 91 | </div> |
diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html index 5f1d266e..b3a16791 100644 --- a/tpl/vintage/picwall.html +++ b/tpl/vintage/picwall.html | |||
@@ -17,7 +17,7 @@ | |||
17 | <div class="picwall_pictureframe"> | 17 | <div class="picwall_pictureframe"> |
18 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} | 18 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
19 | <img data-src="{$value.thumbnail}#" class="b-lazy" | 19 | <img data-src="{$value.thumbnail}#" class="b-lazy" |
20 | src="#" | 20 | src="" |
21 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | 21 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
22 | <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> | 22 | <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> |
23 | {loop="$value.picwall_plugin"} | 23 | {loop="$value.picwall_plugin"} |