diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-11-11 14:01:21 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2018-07-05 20:31:35 +0200 |
commit | e85b7a05a177f803ae36ba5c12835313f31177bc (patch) | |
tree | 99216fbcb3343b74eac2589d14bf75c0a6d5fb01 /tpl | |
parent | a3724717ec37d4bd54dc117ef439c8a182157882 (diff) | |
download | Shaarli-e85b7a05a177f803ae36ba5c12835313f31177bc.tar.gz Shaarli-e85b7a05a177f803ae36ba5c12835313f31177bc.tar.zst Shaarli-e85b7a05a177f803ae36ba5c12835313f31177bc.zip |
Update thumbnail integration after rebasing the branch
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/default/configure.html | 20 | ||||
-rw-r--r-- | tpl/default/linklist.html | 15 | ||||
-rw-r--r-- | tpl/default/page.header.html | 8 | ||||
-rw-r--r-- | tpl/default/picwall.html | 68 | ||||
-rw-r--r-- | tpl/vintage/linklist.html | 1 | ||||
-rw-r--r-- | tpl/vintage/picwall.html | 2 |
6 files changed, 79 insertions, 35 deletions
diff --git a/tpl/default/configure.html b/tpl/default/configure.html index a63c7ad3..b91fc07e 100644 --- a/tpl/default/configure.html +++ b/tpl/default/configure.html | |||
@@ -242,6 +242,26 @@ | |||
242 | </div> | 242 | </div> |
243 | </div> | 243 | </div> |
244 | </div> | 244 | </div> |
245 | <div class="pure-g"> | ||
246 | <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}"> | ||
247 | <div class="form-label"> | ||
248 | <label for="enableThumbnails"> | ||
249 | <span class="label-name">{'Enable thumbnails'|t}</span><br> | ||
250 | <span class="label-desc"> | ||
251 | {'Warning: '|t} | ||
252 | {'It\'s recommended to visit the picture wall after enabling this feature.'|t} | ||
253 | {'If you have a large database, the first retrieval may take a few minutes.'|t} | ||
254 | </span> | ||
255 | </label> | ||
256 | </div> | ||
257 | </div> | ||
258 | <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}"> | ||
259 | <div class="form-input"> | ||
260 | <input type="checkbox" name="enableThumbnails" id="enableThumbnails" | ||
261 | {if="$thumbnails_enabled"}checked{/if}/> | ||
262 | </div> | ||
263 | </div> | ||
264 | </div> | ||
245 | <div class="center"> | 265 | <div class="center"> |
246 | <input type="submit" value="{'Save'|t}" name="save"> | 266 | <input type="submit" value="{'Save'|t}" name="save"> |
247 | </div> | 267 | </div> |
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 322cddd5..bf88e161 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html | |||
@@ -131,9 +131,17 @@ | |||
131 | 131 | ||
132 | <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}"> | 132 | <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}"> |
133 | <div class="linklist-item-title"> | 133 | <div class="linklist-item-title"> |
134 | {$thumb=thumbnail($value.url)} | 134 | {if="$thumbnails_enabled && !empty($value.thumbnail)"} |
135 | {if="$thumb!=false"} | 135 | <div class="linklist-item-thumbnail"> |
136 | <div class="linklist-item-thumbnail">{$thumb}</div> | 136 | <div class="thumbnail"> |
137 | <a href="{$value.real_url}"> | ||
138 | {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" | ||
140 | src="#" | ||
141 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> | ||
142 | </a> | ||
143 | </div> | ||
144 | </div> | ||
137 | {/if} | 145 | {/if} |
138 | 146 | ||
139 | {if="$is_logged_in"} | 147 | {if="$is_logged_in"} |
@@ -268,5 +276,6 @@ | |||
268 | </div> | 276 | </div> |
269 | 277 | ||
270 | {include="page.footer"} | 278 | {include="page.footer"} |
279 | <script src="js/thumbnails.min.js?v={$version_hash}"></script> | ||
271 | </body> | 280 | </body> |
272 | </html> | 281 | </html> |
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html index 82568d63..840e4352 100644 --- a/tpl/default/page.header.html +++ b/tpl/default/page.header.html | |||
@@ -30,9 +30,11 @@ | |||
30 | <li class="pure-menu-item" id="shaarli-menu-tags"> | 30 | <li class="pure-menu-item" id="shaarli-menu-tags"> |
31 | <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a> | 31 | <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a> |
32 | </li> | 32 | </li> |
33 | <li class="pure-menu-item" id="shaarli-menu-picwall"> | 33 | {if="$thumbnails_enabled"} |
34 | <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a> | 34 | <li class="pure-menu-item" id="shaarli-menu-picwall"> |
35 | </li> | 35 | <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a> |
36 | </li> | ||
37 | {/if} | ||
36 | <li class="pure-menu-item" id="shaarli-menu-daily"> | 38 | <li class="pure-menu-item" id="shaarli-menu-daily"> |
37 | <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a> | 39 | <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a> |
38 | </li> | 40 | </li> |
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html index 2f7e03dc..1ea9c20a 100644 --- a/tpl/default/picwall.html +++ b/tpl/default/picwall.html | |||
@@ -5,41 +5,53 @@ | |||
5 | </head> | 5 | </head> |
6 | <body> | 6 | <body> |
7 | {include="page.header"} | 7 | {include="page.header"} |
8 | {if="!$thumbnails_enabled"} | ||
9 | <div class="pure-g pure-alert pure-alert-warning page-single-alert"> | ||
10 | <div class="pure-u-1 center"> | ||
11 | {'Picture wall unavailable (thumbnails are disabled).'|t} | ||
12 | </div> | ||
13 | </div> | ||
14 | {else} | ||
15 | <div class="pure-g"> | ||
16 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> | ||
17 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor"> | ||
18 | {$countPics=count($linksToDisplay)} | ||
19 | <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2> | ||
8 | 20 | ||
9 | <div class="pure-g"> | 21 | <div id="plugin_zone_start_picwall" class="plugin_zone"> |
10 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> | 22 | {loop="$plugin_start_zone"} |
11 | <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor"> | 23 | {$value} |
12 | {$countPics=count($linksToDisplay)} | 24 | {/loop} |
13 | <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2> | 25 | </div> |
14 | |||
15 | <div id="plugin_zone_start_picwall" class="plugin_zone"> | ||
16 | {loop="$plugin_start_zone"} | ||
17 | {$value} | ||
18 | {/loop} | ||
19 | </div> | ||
20 | 26 | ||
21 | <div id="picwall_container" class="picwall-container"> | 27 | <div id="picwall_container" class="picwall-container"> |
22 | {loop="$linksToDisplay"} | 28 | {loop="$linksToDisplay"} |
23 | <div class="picwall-pictureframe"> | 29 | <div class="picwall_pictureframe"> |
24 | {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a> | 30 | {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore} |
25 | {loop="$value.picwall_plugin"} | 31 | <img data-src="{$value.thumbnail}#" class="b-lazy" |
26 | {$value} | 32 | src="#" |
27 | {/loop} | 33 | alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" /> |
28 | </div> | 34 | <a href="{$value.real_url}"><span class="info">{$value.title}</span></a> |
29 | {/loop} | 35 | {loop="$value.picwall_plugin"} |
30 | <div class="clear"></div> | 36 | {$value} |
31 | </div> | 37 | {/loop} |
38 | </div> | ||
39 | {/loop} | ||
40 | <div class="clear"></div> | ||
41 | </div> | ||
32 | 42 | ||
33 | <div id="plugin_zone_end_picwall" class="plugin_zone"> | 43 | <div id="plugin_zone_end_picwall" class="plugin_zone"> |
34 | {loop="$plugin_end_zone"} | 44 | {loop="$plugin_end_zone"} |
35 | {$value} | 45 | {$value} |
36 | {/loop} | 46 | {/loop} |
47 | </div> | ||
37 | </div> | 48 | </div> |
49 | <div class="pure-u-lg-1-6 pure-u-1-24"></div> | ||
38 | </div> | 50 | </div> |
39 | </div> | 51 | {/if} |
40 | 52 | ||
41 | {include="page.footer"} | 53 | {include="page.footer"} |
42 | <script src="js/picwall.min.js?v={$version_hash}"></script> | 54 | <script src="js/thumbnails.min.js?v={$version_hash}"></script> |
43 | </body> | 55 | </body> |
44 | </html> | 56 | </html> |
45 | 57 | ||
diff --git a/tpl/vintage/linklist.html b/tpl/vintage/linklist.html index 9bdafa8c..3f202849 100644 --- a/tpl/vintage/linklist.html +++ b/tpl/vintage/linklist.html | |||
@@ -154,6 +154,7 @@ | |||
154 | </div> | 154 | </div> |
155 | 155 | ||
156 | {include="page.footer"} | 156 | {include="page.footer"} |
157 | <script src="js/thumbnails.min.js"></script> | ||
157 | 158 | ||
158 | </body> | 159 | </body> |
159 | </html> | 160 | </html> |
diff --git a/tpl/vintage/picwall.html b/tpl/vintage/picwall.html index 2ac11ec2..5f1d266e 100644 --- a/tpl/vintage/picwall.html +++ b/tpl/vintage/picwall.html | |||
@@ -38,6 +38,6 @@ | |||
38 | 38 | ||
39 | {include="page.footer"} | 39 | {include="page.footer"} |
40 | 40 | ||
41 | <script src="js/picwall.min.js"></script> | 41 | <script src="js/thumbnails.min.js"></script> |
42 | </body> | 42 | </body> |
43 | </html> | 43 | </html> |