diff options
author | ArthurHoaro <arthur@hoa.ro> | 2018-02-24 18:34:50 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-03-26 19:29:20 +0200 |
commit | 758fe7201eec7a8894eb473377ae18e9ebaf12ac (patch) | |
tree | 098a201c1250c19391daa178beaed176ee18a551 /tpl | |
parent | d42da5435024b4270d5abac11e6fcfa38354f3e9 (diff) | |
download | Shaarli-758fe7201eec7a8894eb473377ae18e9ebaf12ac.tar.gz Shaarli-758fe7201eec7a8894eb473377ae18e9ebaf12ac.tar.zst Shaarli-758fe7201eec7a8894eb473377ae18e9ebaf12ac.zip |
Webpack / Update front paths in template files
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/includes.html | 7 | ||||
-rw-r--r-- | tpl/default/linklist.html | 1 | ||||
-rw-r--r-- | tpl/default/page.footer.html | 4 | ||||
-rw-r--r-- | tpl/default/picwall.html | 2 | ||||
-rw-r--r-- | tpl/default/pluginsadmin.html | 2 | ||||
-rw-r--r-- | tpl/vintage/changetag.html | 2 | ||||
-rw-r--r-- | tpl/vintage/daily.html | 10 | ||||
-rw-r--r-- | tpl/vintage/editlink.html | 5 | ||||
-rw-r--r-- | tpl/vintage/includes.html | 5 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 11 | ||||
-rw-r--r-- | tpl/vintage/linklist.paging.html | 8 | ||||
-rw-r--r-- | tpl/vintage/page.footer.html | 4 | ||||
-rw-r--r-- | tpl/vintage/picwall.html | 7 | ||||
-rw-r--r-- | tpl/vintage/pluginsadmin.html | 73 | ||||
-rw-r--r-- | tpl/vintage/tools.html | 6 |
15 files changed, 97 insertions, 50 deletions
diff --git a/tpl/default/includes.html b/tpl/default/includes.html index b2bfec30..2c56d3c9 100644 --- a/tpl/default/includes.html +++ b/tpl/default/includes.html | |||
@@ -6,12 +6,7 @@ | |||
6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> | 6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> |
7 | <link href="img/favicon.png" rel="shortcut icon" type="image/png" /> | 7 | <link href="img/favicon.png" rel="shortcut icon" type="image/png" /> |
8 | <link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" /> | 8 | <link href="img/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" /> |
9 | <link type="text/css" rel="stylesheet" href="css/pure.min.css?v={$version_hash}" /> | 9 | <link type="text/css" rel="stylesheet" href="css/shaarli.min.css?v={$version_hash}" /> |
10 | <link type="text/css" rel="stylesheet" href="css/grids-responsive.min.css?v={$version_hash}"> | ||
11 | <link type="text/css" rel="stylesheet" href="css/pure-extras.css?v={$version_hash}"> | ||
12 | <link type="text/css" rel="stylesheet" href="css/font-awesome.min.css?v={$version_hash}" /> | ||
13 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css?v={$version_hash}#" /> | ||
14 | <link type="text/css" rel="stylesheet" href="css/shaarli.css?v={$version_hash}" /> | ||
15 | {if="is_file('data/user.css')"} | 10 | {if="is_file('data/user.css')"} |
16 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> | 11 | <link type="text/css" rel="stylesheet" href="data/user.css#" /> |
17 | {/if} | 12 | {/if} |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index c666e30a..933c1ef2 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -16,7 +16,6 @@ | |||
16 | </div> | 16 | </div> |
17 | 17 | ||
18 | <input type="hidden" name="token" value="{$token}"> | 18 | <input type="hidden" name="token" value="{$token}"> |
19 | |||
20 | <div id="search-linklist"> | 19 | <div id="search-linklist"> |
21 | 20 | ||
22 | <form method="GET" class="pure-form searchform" name="searchform"> | 21 | <form method="GET" class="pure-form searchform" name="searchform"> |
diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html index 659e8c7f..f4f09e92 100644 --- a/tpl/default/page.footer.html +++ b/tpl/default/page.footer.html | |||
@@ -38,6 +38,4 @@ | |||
38 | </span> | 38 | </span> |
39 | </div> | 39 | </div> |
40 | 40 | ||
41 | <script src="js/shaarli.js?v={$version_hash}"></script> | 41 | <script src="js/shaarli.min.js?v={$version_hash}"></script> |
42 | <script src="inc/awesomplete.js?v={$version_hash}#"></script> | ||
43 | <script src="inc/awesomplete-multiple-tags.js?v={$version_hash}#"></script> | ||
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 248e56df..23796ac9 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -39,7 +39,7 @@ | |||
39 | </div> | 39 | </div> |
40 | 40 | ||
41 | {include="page.footer"} | 41 | {include="page.footer"} |
42 | <script src="inc/blazy-1.3.1.min.js#"></script> | 42 | <script src="js/picwall.min.js?v={$version_hash}"></script> |
43 | </body> | 43 | </body> |
44 | </html> | 44 | </html> |
45 | 45 | ||
diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html index b2d7cdc5..fa26c859 100644 --- a/tpl/default/pluginsadmin.html +++ b/tpl/default/pluginsadmin.html | |||
@@ -176,7 +176,7 @@ | |||
176 | </form> | 176 | </form> |
177 | 177 | ||
178 | {include="page.footer"} | 178 | {include="page.footer"} |
179 | <script src="inc/plugin_admin.js#"></script> | 179 | <script src="js/pluginsadmin.min.js?v={$version_hash}"></script> |
180 | 180 | ||
181 | </body> | 181 | </body> |
182 | </html> | 182 | </html> |
diff --git a/tpl/vintage/changetag.html b/tpl/vintage/changetag.html index a0df3328..670a8dd7 100644 --- a/tpl/vintage/changetag.html +++ b/tpl/vintage/changetag.html | |||
@@ -1,8 +1,6 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html> |
3 | <head>{include="includes"} | 3 | <head>{include="includes"} |
4 | <link type="text/css" rel="stylesheet" href="inc/awesomplete.css#" /> | ||
5 | <script src="inc/awesomplete.min.js#"></script> | ||
6 | </head> | 4 | </head> |
7 | <body onload="document.changetag.fromtag.focus();"> | 5 | <body onload="document.changetag.fromtag.focus();"> |
8 | <div id="pageheader"> | 6 | <div id="pageheader"> |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index e86e90b1..42db16a7 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
@@ -24,13 +24,13 @@ | |||
24 | {/loop} | 24 | {/loop} |
25 | 25 | ||
26 | <br> | 26 | <br> |
27 | <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a> | 27 | <a href="?do=dailyrss" title="1 RSS entry per day"><img src="img/feed-icon-14x14.png" alt="rss_feed">Daily RSS Feed</a> |
28 | </div> | 28 | </div> |
29 | 29 | ||
30 | <div class="dailyTitle"> | 30 | <div class="dailyTitle"> |
31 | <img src="images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> | 31 | <img src="img/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> |
32 | The Daily Shaarli | 32 | The Daily Shaarli |
33 | <img src="images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"> | 33 | <img src="img/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"> |
34 | </div> | 34 | </div> |
35 | 35 | ||
36 | <div class="dailyDate"> | 36 | <div class="dailyDate"> |
@@ -50,7 +50,7 @@ | |||
50 | <div class="dailyEntry"> | 50 | <div class="dailyEntry"> |
51 | <div class="dailyEntryPermalink"> | 51 | <div class="dailyEntryPermalink"> |
52 | <a href="?{$value.shorturl}"> | 52 | <a href="?{$value.shorturl}"> |
53 | <img src="images/squiggle.png" width="25" height="26" title="permalink" alt="permalink"> | 53 | <img src="img/squiggle.png" width="25" height="26" title="permalink" alt="permalink"> |
54 | </a> | 54 | </a> |
55 | </div> | 55 | </div> |
56 | {if="!$hide_timestamps || isLoggedIn()"} | 56 | {if="!$hide_timestamps || isLoggedIn()"} |
@@ -94,7 +94,7 @@ | |||
94 | {$value} | 94 | {$value} |
95 | {/loop} | 95 | {/loop} |
96 | </div> | 96 | </div> |
97 | <div id="closing"><img src="images/squiggle_closing.png" width="66" height="61" alt="-"></div> | 97 | <div id="closing"><img src="img/squiggle_closing.png" width="66" height="61" alt="-"></div> |
98 | </div> | 98 | </div> |
99 | {include="page.footer"} | 99 | {include="page.footer"} |
100 | </body> | 100 | </body> |
diff --git a/tpl/vintage/editlink.html b/tpl/vintage/editlink.html index f855dfb1..5fa7d194 100644 --- a/tpl/vintage/editlink.html +++ b/tpl/vintage/editlink.html | |||
@@ -54,10 +54,5 @@ | |||
54 | {if="$source !== 'firefoxsocialapi'"} | 54 | {if="$source !== 'firefoxsocialapi'"} |
55 | {include="page.footer"} | 55 | {include="page.footer"} |
56 | {/if} | 56 | {/if} |
57 | <script src="inc/awesomplete.min.js#"></script> | ||
58 | <script src="inc/awesomplete-multiple-tags.js#"></script> | ||
59 | <script> | ||
60 | awesompleteUniqueTag('#lf_tags'); | ||
61 | </script> | ||
62 | </body> | 57 | </body> |
63 | </html> | 58 | </html> |
diff --git a/tpl/vintage/includes.html b/tpl/vintage/includes.html index 17b78b17..4ddfc840 100644 --- a/tpl/vintage/includes.html +++ b/tpl/vintage/includes.html | |||
@@ -5,9 +5,8 @@ | |||
5 | <meta name="referrer" content="same-origin"> | 5 | <meta name="referrer" content="same-origin"> |
6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> | 6 | <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> |
7 | <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> | 7 | <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> |
8 | <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> | 8 | <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon" /> |
9 | <link type="text/css" rel="stylesheet" href="css/reset.css" /> | 9 | <link type="text/css" rel="stylesheet" href="css/shaarli.min.css" /> |
10 | <link type="text/css" rel="stylesheet" href="css/shaarli.css" /> | ||
11 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if} | 10 | {if="is_file('data/user.css')"}<link type="text/css" rel="stylesheet" href="data/user.css#" />{/if} |
12 | {loop="$plugins_includes.css_files"} | 11 | {loop="$plugins_includes.css_files"} |
13 | <link type="text/css" rel="stylesheet" href="{$value}#"/> | 12 | <link type="text/css" rel="stylesheet" href="{$value}#"/> |
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 8458caa1..e7137246 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -22,7 +22,7 @@ | |||
22 | {if="!empty($search_tags)"} | 22 | {if="!empty($search_tags)"} |
23 | value="{$search_tags}" | 23 | value="{$search_tags}" |
24 | {/if} | 24 | {/if} |
25 | autocomplete="off" class="awesomplete" data-multiple data-minChars="1" | 25 | autocomplete="off" data-multiple data-minChars="1" |
26 | data-list="{loop="$tags"}{$key}, {/loop}" | 26 | data-list="{loop="$tags"}{$key}, {/loop}" |
27 | > | 27 | > |
28 | <input type="submit" value="Search" class="bigbutton"> | 28 | <input type="submit" value="Search" class="bigbutton"> |
@@ -86,13 +86,13 @@ | |||
86 | <div class="linkeditbuttons"> | 86 | <div class="linkeditbuttons"> |
87 | <form method="GET" class="buttoneditform"> | 87 | <form method="GET" class="buttoneditform"> |
88 | <input type="hidden" name="edit_link" value="{$value.id}"> | 88 | <input type="hidden" name="edit_link" value="{$value.id}"> |
89 | <input type="image" alt="Edit" src="images/edit_icon.png#" title="Edit" class="button_edit"> | 89 | <input type="image" alt="Edit" src="img/edit_icon.png" title="Edit" class="button_edit"> |
90 | </form><br> | 90 | </form><br> |
91 | <form method="GET" class="buttoneditform"> | 91 | <form method="GET" class="buttoneditform"> |
92 | <input type="hidden" name="lf_linkdate" value="{$value.id}"> | 92 | <input type="hidden" name="lf_linkdate" value="{$value.id}"> |
93 | <input type="hidden" name="token" value="{$token}"> | 93 | <input type="hidden" name="token" value="{$token}"> |
94 | <input type="hidden" name="delete_link"> | 94 | <input type="hidden" name="delete_link"> |
95 | <input type="image" alt="Delete" src="images/delete_icon.png#" title="Delete" | 95 | <input type="image" alt="Delete" src="img/delete_icon.png" title="Delete" |
96 | class="button_delete" onClick="return confirmDeleteLink();"> | 96 | class="button_delete" onClick="return confirmDeleteLink();"> |
97 | </form> | 97 | </form> |
98 | </div> | 98 | </div> |
@@ -146,10 +146,5 @@ | |||
146 | 146 | ||
147 | {include="page.footer"} | 147 | {include="page.footer"} |
148 | 148 | ||
149 | <script src="inc/awesomplete.min.js#"></script> | ||
150 | <script src="inc/awesomplete-multiple-tags.js#"></script> | ||
151 | <script> | ||
152 | awesompleteUniqueTag('#tagfilter_value'); | ||
153 | </script> | ||
154 | </body> | 149 | </body> |
155 | </html> | 150 | </html> |
diff --git a/tpl/vintage/linklist.paging.html b/tpl/vintage/linklist.paging.html index 12828a97..e3b88ee6 100644 --- a/tpl/vintage/linklist.paging.html +++ b/tpl/vintage/linklist.paging.html | |||
@@ -1,11 +1,11 @@ | |||
1 | <div class="paging"> | 1 | <div class="paging"> |
2 | {if="isLoggedIn()"} | 2 | {if="isLoggedIn()"} |
3 | <div class="paging_privatelinks"> | 3 | <div class="paging_privatelinks"> |
4 | <a href="?visibility=private"> | 4 | <a href="?visibility=private"> |
5 | {if="$visibility=='private'"} | 5 | {if="$visibility=='private'"} |
6 | <img src="images/private_16x16_active.png#" width="16" height="16" title="Filter links by visibility" alt="Filter links by visibility"> | 6 | <img src="img/private_16x16_active.png" width="16" height="16" title="Click to see all links" alt="Click to see all links"> |
7 | {else} | 7 | {else} |
8 | <img src="images/private_16x16.png#" width="16" height="16" title="Filter links by visibility" alt="Filter links by visibility"> | 8 | <img src="img/private_16x16.png" width="16" height="16" title="Click to see only private links" alt="Click to see only private links"> |
9 | {/if} | 9 | {/if} |
10 | </a> | 10 | </a> |
11 | 11 | ||
diff --git a/tpl/vintage/page.footer.html b/tpl/vintage/page.footer.html index 4ce0803a..1485e1ce 100644 --- a/tpl/vintage/page.footer.html +++ b/tpl/vintage/page.footer.html | |||
@@ -22,11 +22,13 @@ | |||
22 | Error: {$versionError} | 22 | Error: {$versionError} |
23 | </div> | 23 | </div> |
24 | {/if} | 24 | {/if} |
25 | |||
26 | <script src="js/shaarli.min.js"></script> | ||
27 | |||
25 | {if="isLoggedIn()"} | 28 | {if="isLoggedIn()"} |
26 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> | 29 | <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> |
27 | {/if} | 30 | {/if} |
28 | 31 | ||
29 | <script src="js/shaarli.js"></script> | ||
30 | {loop="$plugins_footer.js_files"} | 32 | {loop="$plugins_footer.js_files"} |
31 | <script src="{$value}#"></script> | 33 | <script src="{$value}#"></script> |
32 | {/loop} | 34 | {/loop} |
diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html index 4e227e37..29688914 100644 --- a/tpl/vintage/picwall.html +++ b/tpl/vintage/picwall.html | |||
@@ -1,7 +1,6 @@ | |||
1 | <!DOCTYPE html> | 1 | <!DOCTYPE html> |
2 | <html> | 2 | <html> |
3 | <head>{include="includes"} | 3 | <head>{include="includes"} |
4 | <script src="inc/blazy-1.3.1.min.js#"></script> | ||
5 | </head> | 4 | </head> |
6 | <body> | 5 | <body> |
7 | <div id="pageheader">{include="page.header"}</div> | 6 | <div id="pageheader">{include="page.header"}</div> |
@@ -35,10 +34,6 @@ | |||
35 | 34 | ||
36 | {include="page.footer"} | 35 | {include="page.footer"} |
37 | 36 | ||
38 | <script> | 37 | <script src="js/picwall.min.js"></script> |
39 | window.onload = function() { | ||
40 | var bLazy = new Blazy(); | ||
41 | } | ||
42 | </script> | ||
43 | </body> | 38 | </body> |
44 | </html> | 39 | </html> |
diff --git a/tpl/vintage/pluginsadmin.html b/tpl/vintage/pluginsadmin.html index ead1734e..63b45cac 100644 --- a/tpl/vintage/pluginsadmin.html +++ b/tpl/vintage/pluginsadmin.html | |||
@@ -129,6 +129,77 @@ | |||
129 | </div> | 129 | </div> |
130 | {include="page.footer"} | 130 | {include="page.footer"} |
131 | 131 | ||
132 | <script src="inc/plugin_admin.js#"></script> | 132 | <script> |
133 | /** | ||
134 | * Change the position counter of a row. | ||
135 | * | ||
136 | * @param elem Element Node to change. | ||
137 | * @param toPos int New position. | ||
138 | */ | ||
139 | function changePos(elem, toPos) { | ||
140 | var elemName = elem.getAttribute('data-line'); | ||
141 | |||
142 | elem.setAttribute('data-order', toPos); | ||
143 | var hiddenInput = document.querySelector('[name="order_' + elemName + '"]'); | ||
144 | hiddenInput.setAttribute('value', toPos); | ||
145 | } | ||
146 | |||
147 | /** | ||
148 | * Move a row up or down. | ||
149 | * | ||
150 | * @param pos Element Node to move. | ||
151 | * @param move int Move: +1 (down) or -1 (up) | ||
152 | */ | ||
153 | function changeOrder(pos, move) { | ||
154 | var newpos = parseInt(pos) + move; | ||
155 | var lines = document.querySelectorAll('[data-order="' + pos + '"]'); | ||
156 | var changelines = document.querySelectorAll('[data-order="' + newpos + '"]'); | ||
157 | |||
158 | // If we go down reverse lines to preserve the rows order | ||
159 | if (move > 0) { | ||
160 | lines = [].slice.call(lines).reverse(); | ||
161 | } | ||
162 | |||
163 | for (var i = 0; i < lines.length; i++) { | ||
164 | var parent = changelines[0].parentNode; | ||
165 | changePos(lines[i], newpos); | ||
166 | changePos(changelines[i], parseInt(pos)); | ||
167 | var changeItem = move < 0 ? changelines[0] : changelines[changelines.length - 1].nextSibling; | ||
168 | parent.insertBefore(lines[i], changeItem); | ||
169 | } | ||
170 | } | ||
171 | |||
172 | /** | ||
173 | * Move a row up in the table. | ||
174 | * | ||
175 | * @param pos int row counter. | ||
176 | * | ||
177 | * @returns false | ||
178 | */ | ||
179 | function orderUp(pos) { | ||
180 | if (pos == 0) { | ||
181 | return false; | ||
182 | } | ||
183 | changeOrder(pos, -1); | ||
184 | return false; | ||
185 | } | ||
186 | |||
187 | /** | ||
188 | * Move a row down in the table. | ||
189 | * | ||
190 | * @param pos int row counter. | ||
191 | * | ||
192 | * @returns false | ||
193 | */ | ||
194 | function orderDown(pos) { | ||
195 | var lastpos = document.querySelector('[data-order]:last-child').getAttribute('data-order'); | ||
196 | if (pos == lastpos) { | ||
197 | return false; | ||
198 | } | ||
199 | |||
200 | changeOrder(pos, +1); | ||
201 | return false; | ||
202 | } | ||
203 | </script> | ||
133 | </body> | 204 | </body> |
134 | </html> | 205 | </html> |
diff --git a/tpl/vintage/tools.html b/tpl/vintage/tools.html index 69689807..3194844a 100644 --- a/tpl/vintage/tools.html +++ b/tpl/vintage/tools.html | |||
@@ -81,9 +81,9 @@ | |||
81 | author: "Shaarli", | 81 | author: "Shaarli", |
82 | version: "1.0.0", | 82 | version: "1.0.0", |
83 | 83 | ||
84 | iconURL: baseURL + "/images/favicon.ico", | 84 | iconURL: baseURL + "/img/favicon.ico", |
85 | icon32URL: baseURL + "/images/favicon.ico", | 85 | icon32URL: baseURL + "/img/favicon.ico", |
86 | icon64URL: baseURL + "/images/favicon.ico", | 86 | icon64URL: baseURL + "/img/favicon.ico", |
87 | 87 | ||
88 | shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", | 88 | shareURL: baseURL + "{noparse}?post=%{url}&title=%{title}&description=%{text}&source=firefoxsocialapi{/noparse}", |
89 | homepageURL: baseURL | 89 | homepageURL: baseURL |