From e85b7a05a177f803ae36ba5c12835313f31177bc Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 11 Nov 2017 14:01:21 +0100
Subject: Update thumbnail integration after rebasing the branch

---
 tpl/default/configure.html   | 20 +++++++++++++
 tpl/default/linklist.html    | 15 ++++++++--
 tpl/default/page.header.html |  8 ++++--
 tpl/default/picwall.html     | 68 ++++++++++++++++++++++++++------------------
 4 files changed, 77 insertions(+), 34 deletions(-)

(limited to 'tpl/default')

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 @@
           </div>
         </div>
       </div>
+      <div class="pure-g">
+        <div class="pure-u-lg-{$ratioLabel} pure-u-{$ratioLabelMobile}">
+          <div class="form-label">
+            <label for="enableThumbnails">
+              <span class="label-name">{'Enable thumbnails'|t}</span><br>
+              <span class="label-desc">
+                {'Warning: '|t}
+                {'It\'s recommended to visit the picture wall after enabling this feature.'|t}
+                {'If you have a large database, the first retrieval may take a few minutes.'|t}
+              </span>
+            </label>
+          </div>
+        </div>
+        <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
+          <div class="form-input">
+            <input type="checkbox" name="enableThumbnails" id="enableThumbnails"
+                   {if="$thumbnails_enabled"}checked{/if}/>
+          </div>
+        </div>
+      </div>
       <div class="center">
         <input type="submit" value="{'Save'|t}" name="save">
       </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 @@
 
         <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}">
           <div class="linklist-item-title">
-            {$thumb=thumbnail($value.url)}
-            {if="$thumb!=false"}
-              <div class="linklist-item-thumbnail">{$thumb}</div>
+            {if="$thumbnails_enabled && !empty($value.thumbnail)"}
+              <div class="linklist-item-thumbnail">
+                <div class="thumbnail">
+                  <a href="{$value.real_url}">
+                  {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
+                  <img data-src="{$value.thumbnail}#" class="b-lazy"
+                    src="#"
+                    alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
+                  </a>
+                </div>
+              </div>
             {/if}
 
             {if="$is_logged_in"}
@@ -268,5 +276,6 @@
 </div>
 
 {include="page.footer"}
+<script src="js/thumbnails.min.js?v={$version_hash}"></script>
 </body>
 </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 @@
         <li class="pure-menu-item" id="shaarli-menu-tags">
           <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a>
         </li>
-        <li class="pure-menu-item" id="shaarli-menu-picwall">
-          <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a>
-        </li>
+        {if="$thumbnails_enabled"}
+          <li class="pure-menu-item" id="shaarli-menu-picwall">
+            <a href="?do=picwall{$searchcrits}" class="pure-menu-link">{'Picture wall'|t}</a>
+          </li>
+        {/if}
         <li class="pure-menu-item" id="shaarli-menu-daily">
           <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a>
         </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 @@
 </head>
 <body>
 {include="page.header"}
+{if="!$thumbnails_enabled"}
+<div class="pure-g pure-alert pure-alert-warning page-single-alert">
+  <div class="pure-u-1 center">
+    {'Picture wall unavailable (thumbnails are disabled).'|t}
+  </div>
+</div>
+{else}
+  <div class="pure-g">
+    <div class="pure-u-lg-1-6 pure-u-1-24"></div>
+    <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
+      {$countPics=count($linksToDisplay)}
+      <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2>
 
-<div class="pure-g">
-  <div class="pure-u-lg-1-6 pure-u-1-24"></div>
-  <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
-    {$countPics=count($linksToDisplay)}
-    <h2 class="window-title">{'Picture Wall'|t} - {$countPics} {'pics'|t}</h2>
-
-    <div id="plugin_zone_start_picwall" class="plugin_zone">
-      {loop="$plugin_start_zone"}
-        {$value}
-      {/loop}
-    </div>
+      <div id="plugin_zone_start_picwall" class="plugin_zone">
+        {loop="$plugin_start_zone"}
+          {$value}
+        {/loop}
+      </div>
 
-    <div id="picwall_container" class="picwall-container">
-      {loop="$linksToDisplay"}
-        <div class="picwall-pictureframe">
-          {$value.thumbnail}<a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
-          {loop="$value.picwall_plugin"}
-            {$value}
-          {/loop}
-        </div>
-      {/loop}
-      <div class="clear"></div>
-    </div>
+      <div id="picwall_container" class="picwall-container">
+        {loop="$linksToDisplay"}
+          <div class="picwall_pictureframe">
+            {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
+            <img data-src="{$value.thumbnail}#" class="b-lazy"
+                 src="#"
+                 alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
+            <a href="{$value.real_url}"><span class="info">{$value.title}</span></a>
+            {loop="$value.picwall_plugin"}
+              {$value}
+            {/loop}
+          </div>
+        {/loop}
+        <div class="clear"></div>
+      </div>
 
-    <div id="plugin_zone_end_picwall" class="plugin_zone">
-      {loop="$plugin_end_zone"}
-        {$value}
-      {/loop}
+      <div id="plugin_zone_end_picwall" class="plugin_zone">
+        {loop="$plugin_end_zone"}
+          {$value}
+        {/loop}
+      </div>
     </div>
+    <div class="pure-u-lg-1-6 pure-u-1-24"></div>
   </div>
-</div>
+{/if}
 
 {include="page.footer"}
-<script src="js/picwall.min.js?v={$version_hash}"></script>
+<script src="js/thumbnails.min.js?v={$version_hash}"></script>
 </body>
 </html>
 
-- 
cgit v1.2.3


From 787faa42f3a2bcbf83a7853f23f3667a6febf9da Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 6 Apr 2018 18:21:47 +0200
Subject: Take code review into account Upgrade web-thumbnailer and display
 thumbs right after download

---
 tpl/default/configure.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'tpl/default')

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index b91fc07e..5695ae8e 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -249,8 +249,12 @@
               <span class="label-name">{'Enable thumbnails'|t}</span><br>
               <span class="label-desc">
                 {'Warning: '|t}
-                {'It\'s recommended to visit the picture wall after enabling this feature.'|t}
-                {'If you have a large database, the first retrieval may take a few minutes.'|t}
+                {if="$gd_enabled"}
+                  {'It\'s recommended to visit the picture wall after enabling this feature.'|t}
+                  {'If you have a large database, the first retrieval may take a few minutes.'|t}
+                {else}
+                  {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
+                {/if}
               </span>
             </label>
           </div>
@@ -258,7 +262,7 @@
         <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
           <div class="form-input">
             <input type="checkbox" name="enableThumbnails" id="enableThumbnails"
-                   {if="$thumbnails_enabled"}checked{/if}/>
+                   {if="$thumbnails_enabled"}checked{/if} {if="!$gd_enabled"}disabled{/if} />
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From 28f26524609338316cc6e51c743058e6e8c7b12b Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 8 Jun 2018 12:50:49 +0200
Subject: Add a page to update all thumbnails through AJAX requests in both
 templates

---
 tpl/default/configure.html   |  8 +++-----
 tpl/default/page.header.html | 14 +++++++++++++
 tpl/default/thumbnails.html  | 48 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 tpl/default/thumbnails.html

(limited to 'tpl/default')

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 5695ae8e..dca9503b 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -248,12 +248,10 @@
             <label for="enableThumbnails">
               <span class="label-name">{'Enable thumbnails'|t}</span><br>
               <span class="label-desc">
-                {'Warning: '|t}
-                {if="$gd_enabled"}
-                  {'It\'s recommended to visit the picture wall after enabling this feature.'|t}
-                  {'If you have a large database, the first retrieval may take a few minutes.'|t}
-                {else}
+                {if="! $gd_enabled"}
                   {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
+                {elseif="$thumbnails_enabled"}
+                  <a href="?do=thumbs_update">{'Synchonize thumbnails'|t}</a>
                 {/if}
               </span>
             </label>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 840e4352..fc03404e 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -171,4 +171,18 @@
   </div>
 {/if}
 
+{if="!empty($global_warnings) && $is_logged_in"}
+  <div class="pure-g pure-alert pure-alert-warning pure-alert-closable" id="shaarli-warnings-alert">
+    <div class="pure-u-2-24"></div>
+    <div class="pure-u-20-24">
+      {loop="global_warnings"}
+        <p>{$value}</p>
+      {/loop}
+    </div>
+    <div class="pure-u-2-24">
+      <i class="fa fa-times pure-alert-close"></i>
+    </div>
+  </div>
+{/if}
+
   <div class="clear"></div>
diff --git a/tpl/default/thumbnails.html b/tpl/default/thumbnails.html
new file mode 100644
index 00000000..a8cf904e
--- /dev/null
+++ b/tpl/default/thumbnails.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+  {include="includes"}
+</head>
+<body>
+{include="page.header"}
+
+<div class="pure-g thumbnails-page-container">
+  <div class="pure-u-lg-1-3 pure-u-1-24"></div>
+  <div class="pure-u-lg-1-3 pure-u-22-24 page-form page-form-light">
+    <h2 class="window-title">{'Thumbnails update'|t}</h2>
+
+    <div class="pure-g">
+      <div class="pure-u-lg-1-3 pure-u-1-24"></div>
+      <div class="pure-u-lg-1-3 pure-u-22-24">
+        <div class="thumbnail-placeholder" style="width: {$thumbnails_width}px; height: {$thumbnails_height}px;"></div>
+      </div>
+    </div>
+
+    <div class="pure-g">
+      <div class="pure-u-1-12"></div>
+      <div class="pure-u-5-6">
+        <div class="thumbnail-link-title"></div>
+
+        <div class="progressbar">
+          <div></div>
+        </div>
+      </div>
+    </div>
+
+    <div class="pure-g">
+      <div class="pure-u-lg-1-3 pure-u-1-24"></div>
+      <div class="pure-u-lg-1-3 pure-u-22-24">
+        <div class="progress-counter">
+          <span class="progress-current">0</span> / <span class="progress-total">{$ids|count}</span>
+        </div>
+      </div>
+    </div>
+
+    <input type="hidden" name="ids" value="{function="implode($ids, ',')"}" />
+  </div>
+</div>
+
+{include="page.footer"}
+<script src="js/thumbnails_update.min.js?v={$version_hash}"></script>
+</body>
+</html>
-- 
cgit v1.2.3


From fcba541e2f12c85ac56c6915ba1319fbdd3e6962 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 1 Jul 2018 11:44:35 +0200
Subject: Bump WT version

---
 tpl/default/picwall.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl/default')

diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 1ea9c20a..1b8bf3b9 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -24,9 +24,9 @@
         {/loop}
       </div>
 
-      <div id="picwall_container" class="picwall-container">
+      <div id="picwall-container" class="picwall-container">
         {loop="$linksToDisplay"}
-          <div class="picwall_pictureframe">
+          <div class="picwall-pictureframe">
             {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
             <img data-src="{$value.thumbnail}#" class="b-lazy"
                  src="#"
-- 
cgit v1.2.3


From b302b3c584b84f22f0e6f187b072180ecbacdfab Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Thu, 5 Jul 2018 20:29:55 +0200
Subject: Thumbnails: add a common mode to only retrieve thumbs from popular
 media websites

---
 tpl/default/configure.html | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'tpl/default')

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index dca9503b..9711d151 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -259,8 +259,17 @@
         </div>
         <div class="pure-u-lg-{$ratioInput} pure-u-{$ratioInputMobile}">
           <div class="form-input">
-            <input type="checkbox" name="enableThumbnails" id="enableThumbnails"
-                   {if="$thumbnails_enabled"}checked{/if} {if="!$gd_enabled"}disabled{/if} />
+            <select name="enableThumbnails" id="enableThumbnails" class="align">
+              <option value="all"    {if="$thumbnails_mode=='all'"}selected{/if}>
+                {'All'|t}
+              </option>
+              <option value="common" {if="$thumbnails_mode=='common'"}selected{/if}>
+                {'Only common media hosts'|t}
+              </option>
+              <option value="none"   {if="$thumbnails_mode=='none'"}selected{/if}>
+                {'None'|t}
+              </option>
+            </select>
           </div>
         </div>
       </div>
-- 
cgit v1.2.3


From 7b4fea0e39be9e74e9aef13e73af9bbd2b1a6397 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Tue, 17 Jul 2018 13:13:26 +0200
Subject: Bunch of improvement for thumbnails integration:

  - add a default thumb size value (125x90px)
  - improve private vertical bar visual, especially with thumbnails
  - translations
  - add a sync thumbs button in tool and empty picwall page
  - fixes WT download mode in JSON config
---
 tpl/default/configure.html | 2 +-
 tpl/default/linklist.html  | 2 +-
 tpl/default/picwall.html   | 8 ++++++++
 tpl/default/tools.html     | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'tpl/default')

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 9711d151..42e32230 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -251,7 +251,7 @@
                 {if="! $gd_enabled"}
                   {'You need to enable the extension <code>php-gd</code> to use thumbnails.'|t}
                 {elseif="$thumbnails_enabled"}
-                  <a href="?do=thumbs_update">{'Synchonize thumbnails'|t}</a>
+                  <a href="?do=thumbs_update">{'Synchronize thumbnails'|t}</a>
                 {/if}
               </span>
             </label>
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index bf88e161..8ea2ce66 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -132,7 +132,7 @@
         <div class="linklist-item linklist-item{if="$value.class"} {$value.class}{/if}" data-id="{$value.id}">
           <div class="linklist-item-title">
             {if="$thumbnails_enabled && !empty($value.thumbnail)"}
-              <div class="linklist-item-thumbnail">
+              <div class="linklist-item-thumbnail" style="width:{$thumbnails_width}px;height:{$thumbnails_height}px;">
                 <div class="thumbnail">
                   <a href="{$value.real_url}">
                   {ignore}RainTPL hack: put the 2 src on two different line to avoid path replace bug{/ignore}
diff --git a/tpl/default/picwall.html b/tpl/default/picwall.html
index 1b8bf3b9..9a0b10dc 100644
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -12,6 +12,14 @@
   </div>
 </div>
 {else}
+  {if="count($linksToDisplay)===0 && $is_logged_in"}
+    <div class="pure-g pure-alert pure-alert-warning page-single-alert">
+      <div class="pure-u-1 center">
+        {'There is no cached thumbnail. Try to <a href="?do=thumbs_update">synchronize them</a>.'|t}
+      </div>
+    </div>
+  {/if}
+
   <div class="pure-g">
     <div class="pure-u-lg-1-6 pure-u-1-24"></div>
     <div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor">
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index ece66884..20060994 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -45,6 +45,14 @@
       </a>
     </div>
 
+    {if="$thumbnails_enabled"}
+      <div class="tools-item">
+        <a href="?do=thumbs_update" title="{'Synchronize all link thumbnails'|t}">
+          <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Synchronize thumbnails'|t}</span>
+        </a>
+      </div>
+    {/if}
+
     {loop="$tools_plugin"}
       <div class="tools-item">
         {$value}
-- 
cgit v1.2.3