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

diff --git a/application/Updater.php b/application/Updater.php
index 2a4c807cbcccda5e77180fa80297fc476e51547b..c2aa1568cdc01534a3e1efd885e494536884342e 100644 (file)
--- a/application/Updater.php
+++ b/application/Updater.php
@@ -511,7 +511,7 @@ class Updater
 
         if ($thumbnailsEnabled) {
             $this->session['warnings'][] = t(
 
         if ($thumbnailsEnabled) {
             $this->session['warnings'][] = t(

-                'You have enabled thumbnails. <a href="?do=thumbs_update">Please synchonize them</a>.'
+                'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchronize them</a>.'

             );
         }
 
             );
         }
 

diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index 96e2e91274c6f296912a0f1cea645ff400f901ab..32aaea48e870ab13af7714c5a53d84cf0356d613 100644 (file)
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -384,6 +384,9 @@ class ConfigManager
         $this->setEmpty('redirector.url', '');
         $this->setEmpty('redirector.encode_url', true);
 
         $this->setEmpty('redirector.url', '');
         $this->setEmpty('redirector.encode_url', true);
 

+        $this->setEmpty('thumbnails.width', '125');
+        $this->setEmpty('thumbnails.height', '90');
+

         $this->setEmpty('translation.language', 'auto');
         $this->setEmpty('translation.mode', 'php');
         $this->setEmpty('translation.extensions', []);
         $this->setEmpty('translation.language', 'auto');
         $this->setEmpty('translation.mode', 'php');
         $this->setEmpty('translation.extensions', []);

diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss
index 6a8a8bc712d295f58fa683293d53134bd8016463..6b286f1ecdebdea0893f6a33ea04da1073472c52 100644 (file)
--- a/assets/default/scss/shaarli.scss
+++ b/assets/default/scss/shaarli.scss
@@ -636,23 +636,22 @@ body,
 }
 
 .linklist-item {
 }
 
 .linklist-item {

+  position: relative;

   margin: 0 0 10px;
   box-shadow: 1px 1px 3px $light-grey;
   background: $almost-white;
 
   &.private {
   margin: 0 0 10px;
   box-shadow: 1px 1px 3px $light-grey;
   background: $almost-white;
 
   &.private {

-    .linklist-item-title {
-      &::before {
-        @extend %private-border;
-        margin-top: 3px;
-      }
-    }
-
-    .linklist-item-description {
-      &::before {
-        @extend %private-border;
-        height: 100%;
-      }
+    &::before {
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      background: $orange;
+      width: 2px;
+      height: 100%;
+      content: '';

     }
   }
 }
     }
   }
 }

diff --git a/composer.lock b/composer.lock
index 5ba4bdce6f20be3464166c9df9f0e69950654def..08e915cf14b0523c33276ade15dec1a1f92abfa2 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "arthurhoaro/web-thumbnailer",
     "packages": [
         {
             "name": "arthurhoaro/web-thumbnailer",

-            "version": "v1.2.0",
+            "version": "v1.2.1",

             "source": {
                 "type": "git",
                 "url": "https://github.com/ArthurHoaro/web-thumbnailer.git",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ArthurHoaro/web-thumbnailer.git",

-                "reference": "d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6"
+                "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1"

             },
             "dist": {
                 "type": "zip",
             },
             "dist": {
                 "type": "zip",

-                "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6",
-                "reference": "d6bc683c7081ee6a0bdedc317ad88a9d9cddc4d6",
+                "url": "https://api.github.com/repos/ArthurHoaro/web-thumbnailer/zipball/a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1",
+                "reference": "a5a52f69e8e8f3c71fab9649e2a927e2d3f418f1",

                 "shasum": ""
             },
             "require": {
                 "shasum": ""
             },
             "require": {


@@ -52,7 +52,7 @@
                 }
             ],
             "description": "PHP library which will retrieve a thumbnail for any given URL",
                 }
             ],
             "description": "PHP library which will retrieve a thumbnail for any given URL",

-            "time": "2018-06-30T12:12:07+00:00"
+            "time": "2018-07-17T10:21:14+00:00"

         },
         {
             "name": "container-interop/container-interop",
         },
         {
             "name": "container-interop/container-interop",

diff --git a/inc/languages/fr/LC_MESSAGES/shaarli.po b/inc/languages/fr/LC_MESSAGES/shaarli.po
index f51894787451061f3fa2850c98d706b8c304ac20..155eb52ee2de3c71c5ca8f0ca6d2689d09baba7c 100644 (file)
--- a/inc/languages/fr/LC_MESSAGES/shaarli.po
+++ b/inc/languages/fr/LC_MESSAGES/shaarli.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Shaarli\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Shaarli\n"

-"POT-Creation-Date: 2018-05-05 12:48+0200\n"
-"PO-Revision-Date: 2018-05-05 12:49+0200\n"
+"POT-Creation-Date: 2018-07-17 13:04+0200\n"
+"PO-Revision-Date: 2018-07-17 13:07+0200\n"

 "Last-Translator: \n"
 "Language-Team: Shaarli\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: \n"
 "Language-Team: Shaarli\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.9\n"

 "X-Poedit-Basepath: ../../../..\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../../../..\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"


@@ -167,11 +167,11 @@ msgstr ""
 "a été importé avec succès en %d secondes : %d liens importés, %d liens "
 "écrasés, %d liens ignorés."
 
 "a été importé avec succès en %d secondes : %d liens importés, %d liens "
 "écrasés, %d liens ignorés."
 

-#: application/PageBuilder.php:173
+#: application/PageBuilder.php:200

 msgid "The page you are trying to reach does not exist or has been deleted."
 msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée."
 
 msgid "The page you are trying to reach does not exist or has been deleted."
 msgstr "La page que vous essayez de consulter n'existe pas ou a été supprimée."
 

-#: application/PageBuilder.php:175
+#: application/PageBuilder.php:202

 msgid "404 Not Found"
 msgstr "404 Introuvable"
 
 msgid "404 Not Found"
 msgstr "404 Introuvable"
 


@@ -180,7 +180,7 @@ msgstr "404 Introuvable"
 msgid "Plugin \"%s\" files not found."
 msgstr "Les fichiers de l'extension \"%s\" sont introuvables."
 
 msgid "Plugin \"%s\" files not found."
 msgstr "Les fichiers de l'extension \"%s\" sont introuvables."
 

-#: application/Thumbnailer.php:40
+#: application/Thumbnailer.php:61

 msgid ""
 "php-gd extension must be loaded to use thumbnails. Thumbnails are now "
 "disabled. Please reload the page."
 msgid ""
 "php-gd extension must be loaded to use thumbnails. Thumbnails are now "
 "disabled. Please reload the page."


@@ -188,21 +188,29 @@ msgstr ""
 "php-gd extension must be loaded to use thumbnails. Thumbnails are now "
 "disabled. Please reload the page."
 
 "php-gd extension must be loaded to use thumbnails. Thumbnails are now "
 "disabled. Please reload the page."
 

-#: application/Updater.php:76
+#: application/Updater.php:86

 msgid "Couldn't retrieve Updater class methods."
 msgstr "Impossible de récupérer les méthodes de la classe Updater."
 
 msgid "Couldn't retrieve Updater class methods."
 msgstr "Impossible de récupérer les méthodes de la classe Updater."
 

-#: application/Updater.php:544
+#: application/Updater.php:514 index.php:1023
+msgid ""
+"You have enabled or changed thumbnails mode. <a href=\"?do=thumbs_update"
+"\">Please synchronize them</a>."
+msgstr ""
+"Vous avez activé ou changé le mode de miniatures. <a href=\"?do=thumbs_update"
+"\">Merci de les synchroniser</a>."
+
+#: application/Updater.php:566

 msgid "An error occurred while running the update "
 msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour "
 
 msgid "An error occurred while running the update "
 msgstr "Une erreur s'est produite lors de l'exécution de la mise à jour "
 

-#: application/Updater.php:584
+#: application/Updater.php:606

 msgid "Updates file path is not set, can't write updates."
 msgstr ""
 "Le chemin vers le fichier de mise à jour n'est pas défini, impossible "
 "d'écrire les mises à jour."
 
 msgid "Updates file path is not set, can't write updates."
 msgstr ""
 "Le chemin vers le fichier de mise à jour n'est pas défini, impossible "
 "d'écrire les mises à jour."
 

-#: application/Updater.php:589
+#: application/Updater.php:611

 msgid "Unable to write updates in "
 msgstr "Impossible d'écrire les mises à jour dans "
 
 msgid "Unable to write updates in "
 msgstr "Impossible d'écrire les mises à jour dans "
 


@@ -272,20 +280,20 @@ msgstr "Liens partagés sur "
 msgid "Insufficient permissions:"
 msgstr "Permissions insuffisantes :"
 
 msgid "Insufficient permissions:"
 msgstr "Permissions insuffisantes :"
 

-#: index.php:304
+#: index.php:201

 msgid "I said: NO. You are banned for the moment. Go away."
 msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard."
 
 msgid "I said: NO. You are banned for the moment. Go away."
 msgstr "NON. Vous êtes banni pour le moment. Revenez plus tard."
 

-#: index.php:369
+#: index.php:273

 msgid "Wrong login/password."
 msgstr "Nom d'utilisateur ou mot de passe incorrects."
 
 msgid "Wrong login/password."
 msgstr "Nom d'utilisateur ou mot de passe incorrects."
 

-#: index.php:577 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46
+#: index.php:483 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:46

 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:46
 msgid "Daily"
 msgstr "Quotidien"
 
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:46
 msgid "Daily"
 msgstr "Quotidien"
 

-#: index.php:682 tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28
+#: index.php:589 tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:28

 #: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75
 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99
 #: tmp/loginform.b91ef64efc3688266305ea9b42e5017e.rtpl.php:44
 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:75
 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:99


@@ -294,103 +302,103 @@ msgstr "Quotidien"
 msgid "Login"
 msgstr "Connexion"
 
 msgid "Login"
 msgstr "Connexion"
 

-#: index.php:750 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
+#: index.php:606 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41

 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:41
 msgid "Picture wall"
 msgstr "Mur d'images"
 
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:41
 msgid "Picture wall"
 msgstr "Mur d'images"
 

-#: index.php:798 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
+#: index.php:683 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36

 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36
 #: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:36
 #: tmp/tag.cloud.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 

-#: index.php:831 tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19
+#: index.php:716 tmp/tag.list.b91ef64efc3688266305ea9b42e5017e.rtpl.php:19

 msgid "Tag list"
 msgstr "Liste des tags"
 
 msgid "Tag list"
 msgstr "Liste des tags"
 

-#: index.php:1056 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
+#: index.php:941 tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31

 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31
 msgid "Tools"
 msgstr "Outils"
 
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:31
 msgid "Tools"
 msgstr "Outils"
 

-#: index.php:1065
+#: index.php:950

 msgid "You are not supposed to change a password on an Open Shaarli."
 msgstr ""
 "Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert."
 
 msgid "You are not supposed to change a password on an Open Shaarli."
 msgstr ""
 "Vous n'êtes pas censé modifier le mot de passe d'un Shaarli en mode ouvert."
 

-#: index.php:1070 index.php:1112 index.php:1190 index.php:1221 index.php:1326
+#: index.php:955 index.php:997 index.php:1085 index.php:1116 index.php:1221

 msgid "Wrong token."
 msgstr "Jeton invalide."
 
 msgid "Wrong token."
 msgstr "Jeton invalide."
 

-#: index.php:1075
+#: index.php:960

 msgid "The old password is not correct."
 msgstr "L'ancien mot de passe est incorrect."
 
 msgid "The old password is not correct."
 msgstr "L'ancien mot de passe est incorrect."
 

-#: index.php:1095
+#: index.php:980

 msgid "Your password has been changed"
 msgstr "Votre mot de passe a été modifié"
 
 msgid "Your password has been changed"
 msgstr "Votre mot de passe a été modifié"
 

-#: index.php:1100
+#: index.php:985

 #: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29
 msgid "Change password"
 msgstr "Modification du mot de passe"
 
 #: tmp/changepassword.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:29
 msgid "Change password"
 msgstr "Modification du mot de passe"
 

-#: index.php:1149
+#: index.php:1043

 msgid "Configuration was saved."
 msgstr "La configuration a été sauvegardé."
 
 msgid "Configuration was saved."
 msgstr "La configuration a été sauvegardé."
 

-#: index.php:1173 tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
+#: index.php:1068 tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24

 msgid "Configure"
 msgstr "Configurer"
 
 msgid "Configure"
 msgstr "Configurer"
 

-#: index.php:1184 tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
+#: index.php:1079 tmp/changetag.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13

 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
 msgid "Manage tags"
 msgstr "Gérer les tags"
 
 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36
 msgid "Manage tags"
 msgstr "Gérer les tags"
 

-#: index.php:1202
+#: index.php:1097

 #, php-format
 msgid "The tag was removed from %d link."
 msgid_plural "The tag was removed from %d links."
 msgstr[0] "Le tag a été supprimé de %d lien."
 msgstr[1] "Le tag a été supprimé de %d liens."
 
 #, php-format
 msgid "The tag was removed from %d link."
 msgid_plural "The tag was removed from %d links."
 msgstr[0] "Le tag a été supprimé de %d lien."
 msgstr[1] "Le tag a été supprimé de %d liens."
 

-#: index.php:1203
+#: index.php:1098

 #, php-format
 msgid "The tag was renamed in %d link."
 msgid_plural "The tag was renamed in %d links."
 msgstr[0] "Le tag a été renommé dans %d lien."
 msgstr[1] "Le tag a été renommé dans %d liens."
 
 #, php-format
 msgid "The tag was renamed in %d link."
 msgid_plural "The tag was renamed in %d links."
 msgstr[0] "Le tag a été renommé dans %d lien."
 msgstr[1] "Le tag a été renommé dans %d liens."
 

-#: index.php:1211 tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13
+#: index.php:1106 tmp/addlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:13

 msgid "Shaare a new link"
 msgstr "Partager un nouveau lien"
 
 msgid "Shaare a new link"
 msgstr "Partager un nouveau lien"
 

-#: index.php:1386 tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169
+#: index.php:1281 tmp/linklist.b91ef64efc3688266305ea9b42e5017e.rtpl.php:169

 msgid "Edit"
 msgstr "Modifier"
 
 msgid "Edit"
 msgstr "Modifier"
 

-#: index.php:1386 index.php:1456
+#: index.php:1281 index.php:1351

 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26
 msgid "Shaare"
 msgstr "Shaare"
 
 #: tmp/page.header.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
 #: tmp/page.header.cedf684561d925457130839629000a81.rtpl.php:26
 msgid "Shaare"
 msgstr "Shaare"
 

-#: index.php:1425
+#: index.php:1320

 msgid "Note: "
 msgstr "Note : "
 
 msgid "Note: "
 msgstr "Note : "
 

-#: index.php:1465 tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:65
+#: index.php:1360 tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:65

 msgid "Export"
 msgstr "Exporter"
 
 msgid "Export"
 msgstr "Exporter"
 

-#: index.php:1527 tmp/import.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83
+#: index.php:1422 tmp/import.b91ef64efc3688266305ea9b42e5017e.rtpl.php:83

 msgid "Import"
 msgstr "Importer"
 
 msgid "Import"
 msgstr "Importer"
 

-#: index.php:1537
+#: index.php:1432

 #, php-format
 msgid ""
 "The file you are trying to upload is probably bigger than what this "
 #, php-format
 msgid ""
 "The file you are trying to upload is probably bigger than what this "


@@ -400,16 +408,20 @@ msgstr ""
 "le serveur web peut accepter (%s). Merci de l'envoyer en parties plus "
 "légères."
 
 "le serveur web peut accepter (%s). Merci de l'envoyer en parties plus "
 "légères."
 

-#: index.php:1576 tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26
+#: index.php:1471 tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:26

 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22
 msgid "Plugin administration"
 msgstr "Administration des extensions"
 
 #: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:22
 msgid "Plugin administration"
 msgstr "Administration des extensions"
 

-#: index.php:1761
+#: index.php:1523 tmp/thumbnails.b91ef64efc3688266305ea9b42e5017e.rtpl.php:14
+msgid "Thumbnails update"
+msgstr "Mise à jour des miniatures"
+
+#: index.php:1695

 msgid "Search: "
 msgstr "Recherche : "
 
 msgid "Search: "
 msgstr "Recherche : "
 

-#: index.php:1800
+#: index.php:1735

 #, php-format
 msgid ""
 "<pre>Sessions do not seem to work correctly on your server.<br>Make sure the "
 #, php-format
 msgid ""
 "<pre>Sessions do not seem to work correctly on your server.<br>Make sure the "


@@ -428,7 +440,7 @@ msgstr ""
 "cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse "
 "IP ou un <em>Fully Qualified Domain Name</em>.<br>"
 
 "cookies. Nous vous recommandons d'accéder à votre serveur depuis son adresse "
 "IP ou un <em>Fully Qualified Domain Name</em>.<br>"
 

-#: index.php:1810
+#: index.php:1745

 msgid "Click to try again."
 msgstr "Cliquer ici pour réessayer."
 
 msgid "Click to try again."
 msgstr "Cliquer ici pour réessayer."
 


@@ -478,19 +490,19 @@ msgstr ""
 msgid "Isso server URL (without 'http://')"
 msgstr "URL du serveur Isso (sans 'http://')"
 
 msgid "Isso server URL (without 'http://')"
 msgstr "URL du serveur Isso (sans 'http://')"
 

-#: plugins/markdown/markdown.php:158
+#: plugins/markdown/markdown.php:161

 msgid "Description will be rendered with"
 msgstr "La description sera générée avec"
 
 msgid "Description will be rendered with"
 msgstr "La description sera générée avec"
 

-#: plugins/markdown/markdown.php:159
+#: plugins/markdown/markdown.php:162

 msgid "Markdown syntax documentation"
 msgstr "Documentation sur la syntaxe Markdown"
 
 msgid "Markdown syntax documentation"
 msgstr "Documentation sur la syntaxe Markdown"
 

-#: plugins/markdown/markdown.php:160
+#: plugins/markdown/markdown.php:163

 msgid "Markdown syntax"
 msgstr "la syntaxe Markdown"
 
 msgid "Markdown syntax"
 msgstr "la syntaxe Markdown"
 

-#: plugins/markdown/markdown.php:339
+#: plugins/markdown/markdown.php:347

 msgid ""
 "Render shaare description with Markdown syntax.<br><strong>Warning</"
 "strong>:\n"
 msgid ""
 "Render shaare description with Markdown syntax.<br><strong>Warning</"
 "strong>:\n"


@@ -751,30 +763,31 @@ msgstr "Clé d'API secrète"
 msgid "Enable thumbnails"
 msgstr "Activer les miniatures"
 
 msgid "Enable thumbnails"
 msgstr "Activer les miniatures"
 

-#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:279
-msgid "Warning: "
-msgstr "Attention : "
-
-#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:283
-msgid "It's recommended to visit the picture wall after enabling this feature."
-msgstr ""
-"Il est recommandé de visiter le Mur d'images après avoir activé cette "
-"fonctionnalité."
-
-#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:285
-msgid ""
-"If you have a large database, the first retrieval may take a few minutes."
-msgstr ""
-"Si vous avez beaucoup de liens, la première récupération peut prendre "
-"plusieurs minutes."
-
-#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:289
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:281

 msgid "You need to enable the extension <code>php-gd</code> to use thumbnails."
 msgstr ""
 "Vous devez activer l'extension <code>php-gd</code> pour utiliser les "
 "miniatures."
 
 msgid "You need to enable the extension <code>php-gd</code> to use thumbnails."
 msgstr ""
 "Vous devez activer l'extension <code>php-gd</code> pour utiliser les "
 "miniatures."
 

-#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:305
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:285
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:56
+msgid "Synchronize thumbnails"
+msgstr "Synchroniser les miniatures"
+
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:296
+#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
+msgid "All"
+msgstr "Tous"
+
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:300
+msgid "Only common media hosts"
+msgstr "Seulement les hébergeurs de média connus"
+
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:304
+msgid "None"
+msgstr "Aucune"
+
+#: tmp/configure.b91ef64efc3688266305ea9b42e5017e.rtpl.php:312

 #: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72
 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139
 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:199
 #: tmp/editlink.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72
 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139
 #: tmp/pluginsadmin.b91ef64efc3688266305ea9b42e5017e.rtpl.php:199


@@ -851,10 +864,6 @@ msgstr "Exporter les données"
 msgid "Selection"
 msgstr "Choisir"
 
 msgid "Selection"
 msgstr "Choisir"
 

-#: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:31
-msgid "All"
-msgstr "Tous"
-

 #: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
 msgid "Public"
 msgstr "Publics"
 #: tmp/export.b91ef64efc3688266305ea9b42e5017e.rtpl.php:41
 msgid "Public"
 msgstr "Publics"


@@ -1122,11 +1131,23 @@ msgid "Picture wall unavailable (thumbnails are disabled)."
 msgstr ""
 "Le mur d'images n'est pas disponible (les miniatures sont désactivées)."
 
 msgstr ""
 "Le mur d'images n'est pas disponible (les miniatures sont désactivées)."
 

-#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25
+#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:24
+#, fuzzy
+#| msgid ""
+#| "You don't have any cached thumbnail. Try to <a href=\"?do=thumbs_update"
+#| "\">synchronize them</a>."
+msgid ""
+"There is no cached thumbnail. Try to <a href=\"?do=thumbs_update"
+"\">synchronize them</a>."
+msgstr ""
+"Il n'y a aucune miniature en cache. Essayer de <a href=\"?do=thumbs_update"
+"\">les synchroniser</a>."
+
+#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36

 msgid "Picture Wall"
 msgstr "Mur d'images"
 
 msgid "Picture Wall"
 msgstr "Mur d'images"
 

-#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:25
+#: tmp/picwall.b91ef64efc3688266305ea9b42e5017e.rtpl.php:36

 msgid "pics"
 msgstr "images"
 
 msgid "pics"
 msgstr "images"
 


@@ -1268,7 +1289,11 @@ msgstr ""
 msgid "Export database"
 msgstr "Exporter les données"
 
 msgid "Export database"
 msgstr "Exporter les données"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:71
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:55
+msgid "Synchronize all link thumbnails"
+msgstr "Synchroniser toutes les miniatures"
+
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:81

 msgid ""
 "Drag one of these button to your bookmarks toolbar or right-click it and "
 "\"Bookmark This Link\""
 msgid ""
 "Drag one of these button to your bookmarks toolbar or right-click it and "
 "\"Bookmark This Link\""


@@ -1276,13 +1301,13 @@ msgstr ""
 "Glisser un de ces bouttons dans votre barre de favoris ou cliquer droit "
 "dessus et « Ajouter aux favoris »"
 
 "Glisser un de ces bouttons dans votre barre de favoris ou cliquer droit "
 "dessus et « Ajouter aux favoris »"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:72
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:82

 msgid "then click on the bookmarklet in any page you want to share."
 msgstr ""
 "puis cliquer sur le marque page depuis un site que vous souhaitez partager."
 
 msgid "then click on the bookmarklet in any page you want to share."
 msgstr ""
 "puis cliquer sur le marque page depuis un site que vous souhaitez partager."
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:76
-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:100
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:110

 msgid ""
 "Drag this link to your bookmarks toolbar or right-click it and Bookmark This "
 "Link"
 msgid ""
 "Drag this link to your bookmarks toolbar or right-click it and Bookmark This "
 "Link"


@@ -1290,31 +1315,31 @@ msgstr ""
 "Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
 "Ajouter aux favoris »"
 
 "Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
 "Ajouter aux favoris »"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:77
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:87

 msgid "then click ✚Shaare link button in any page you want to share"
 msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager"
 
 msgid "then click ✚Shaare link button in any page you want to share"
 msgstr "puis cliquer sur ✚Shaare depuis un site que vous souhaitez partager"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:86
-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:108
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:118

 msgid "The selected text is too long, it will be truncated."
 msgstr "Le texte sélectionné est trop long, il sera tronqué."
 
 msgid "The selected text is too long, it will be truncated."
 msgstr "Le texte sélectionné est trop long, il sera tronqué."
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:96
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:106

 msgid "Shaare link"
 msgstr "Shaare"
 
 msgid "Shaare link"
 msgstr "Shaare"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:101
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:111

 msgid ""
 "Then click ✚Add Note button anytime to start composing a private Note (text "
 "post) to your Shaarli"
 msgstr ""
 "Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli"
 
 msgid ""
 "Then click ✚Add Note button anytime to start composing a private Note (text "
 "post) to your Shaarli"
 msgstr ""
 "Puis cliquer sur ✚Add Note pour commencer à rédiger une Note sur Shaarli"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:117
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:127

 msgid "Add Note"
 msgstr "Ajouter une Note"
 
 msgid "Add Note"
 msgstr "Ajouter une Note"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:129
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:139

 msgid ""
 "You need to browse your Shaarli over <strong>HTTPS</strong> to use this "
 "functionality."
 msgid ""
 "You need to browse your Shaarli over <strong>HTTPS</strong> to use this "
 "functionality."


@@ -1322,25 +1347,25 @@ msgstr ""
 "Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette "
 "fonctionalité."
 
 "Vous devez utiliser Shaarli en <strong>HTTPS</strong> pour utiliser cette "
 "fonctionalité."
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:134
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:144

 msgid "Add to"
 msgstr "Ajouter à"
 
 msgid "Add to"
 msgstr "Ajouter à"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:145
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:155

 msgid "3rd party"
 msgstr "Applications tierces"
 
 msgid "3rd party"
 msgstr "Applications tierces"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:147
-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:153
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:157
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:163

 msgid "Plugin"
 msgstr "Extension"
 
 msgid "Plugin"
 msgstr "Extension"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:148
-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:154
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:158
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:164

 msgid "plugin"
 msgstr "extension"
 
 msgid "plugin"
 msgstr "extension"
 

-#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:175
+#: tmp/tools.b91ef64efc3688266305ea9b42e5017e.rtpl.php:191

 msgid ""
 "Drag this link to your bookmarks toolbar, or right-click it and choose "
 "Bookmark This Link"
 msgid ""
 "Drag this link to your bookmarks toolbar, or right-click it and choose "
 "Bookmark This Link"


@@ -1348,6 +1373,26 @@ msgstr ""
 "Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
 "Ajouter aux favoris »"
 
 "Glisser ce lien dans votre barre de favoris ou cliquer droit dessus et « "
 "Ajouter aux favoris »"
 

+#, fuzzy
+#~| msgid "Enable thumbnails"
+#~ msgid "Synchonize thumbnails"
+#~ msgstr "Activer les miniatures"
+
+#~ msgid "Warning: "
+#~ msgstr "Attention : "
+
+#~ msgid ""
+#~ "It's recommended to visit the picture wall after enabling this feature."
+#~ msgstr ""
+#~ "Il est recommandé de visiter le Mur d'images après avoir activé cette "
+#~ "fonctionnalité."
+
+#~ msgid ""
+#~ "If you have a large database, the first retrieval may take a few minutes."
+#~ msgstr ""
+#~ "Si vous avez beaucoup de liens, la première récupération peut prendre "
+#~ "plusieurs minutes."
+

 #, fuzzy
 #~| msgid "Change"
 #~ msgid "range"
 #, fuzzy
 #~| msgid "Change"
 #~ msgid "range"

diff --git a/inc/web-thumbnailer.json b/inc/web-thumbnailer.json
index b8db561edcb6597badf4c5e232b7daa7dc3f35e2..dcaa149ef624fb59deae97aa57ae8834e0091fcf 100644 (file)
--- a/inc/web-thumbnailer.json
+++ b/inc/web-thumbnailer.json
@@ -1,7 +1,7 @@
 {
   "settings": {
     "default": {
 {
   "settings": {
     "default": {

-      "download_mode": "HOTLINK",
+      "download_mode": "DOWNLOAD",

       "_comment": "infinite cache",
       "cache_duration": -1,
       "timeout": 10
       "_comment": "infinite cache",
       "cache_duration": -1,
       "timeout": 10


@@ -10,4 +10,4 @@
       "cache": "cache/"
     }
   }
       "cache": "cache/"
     }
   }

-}
\ No newline at end of file
+}

diff --git a/index.php b/index.php
index 299d6d9b9e8dbba0462e6cdb4b830af9f1cd9803..ac0baf7dbb0173a16df5433a5f464662d53dfc30 100644 (file)
--- a/index.php
+++ b/index.php
@@ -632,6 +632,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
             $PAGE->assign($key, $value);
         }
 
             $PAGE->assign($key, $value);
         }
 

+

         $PAGE->renderPage('picwall');
         exit;
     }
         $PAGE->renderPage('picwall');
         exit;
     }


@@ -1015,9 +1016,11 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
             $conf->set('translation.language', escape($_POST['language']));
 
             $thumbnailsMode = extension_loaded('gd') ? $_POST['enableThumbnails'] : Thumbnailer::MODE_NONE;
             $conf->set('translation.language', escape($_POST['language']));
 
             $thumbnailsMode = extension_loaded('gd') ? $_POST['enableThumbnails'] : Thumbnailer::MODE_NONE;

-            if ($conf->get('thumbnails.enabled', Thumbnailer::MODE_NONE) !== Thumbnailer::MODE_NONE) {
+            if ($thumbnailsMode !== Thumbnailer::MODE_NONE
+                && $thumbnailsMode !== $conf->get('thumbnails.mode', Thumbnailer::MODE_NONE)
+            ) {

                 $_SESSION['warnings'][] = t(
                 $_SESSION['warnings'][] = t(

-                    'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchonize them</a>.'
+                    'You have enabled or changed thumbnails mode. <a href="?do=thumbs_update">Please synchronize them</a>.'

                 );
             }
             $conf->set('thumbnails.mode', $thumbnailsMode);
                 );
             }
             $conf->set('thumbnails.mode', $thumbnailsMode);


@@ -1517,7 +1520,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
             $ids[] = $link['id'];
         }
         $PAGE->assign('ids', $ids);
             $ids[] = $link['id'];
         }
         $PAGE->assign('ids', $ids);

-        $PAGE->assign('pagetitle', t('Thumbnail update') .' - '. $conf->get('general.title', 'Shaarli'));
+        $PAGE->assign('pagetitle', t('Thumbnails update') .' - '. $conf->get('general.title', 'Shaarli'));

         $PAGE->renderPage('thumbnails');
         exit;
     }
         $PAGE->renderPage('thumbnails');
         exit;
     }

diff --git a/tests/Updater/UpdaterTest.php b/tests/Updater/UpdaterTest.php
index 05f4b8e104e3eabdc0a494fc4e75cef94f038072..cacee2d2da25b247e8f5084a1192fe09640693f4 100644 (file)
--- a/tests/Updater/UpdaterTest.php
+++ b/tests/Updater/UpdaterTest.php
@@ -700,7 +700,7 @@ $GLOBALS[\'privateLinkByDefault\'] = true;';
         $this->assertEquals(\Shaarli\Thumbnailer::MODE_ALL, $this->conf->get('thumbnails.mode'));
         $this->assertEquals(125, $this->conf->get('thumbnails.width'));
         $this->assertEquals(90, $this->conf->get('thumbnails.height'));
         $this->assertEquals(\Shaarli\Thumbnailer::MODE_ALL, $this->conf->get('thumbnails.mode'));
         $this->assertEquals(125, $this->conf->get('thumbnails.width'));
         $this->assertEquals(90, $this->conf->get('thumbnails.height'));

-        $this->assertContains('You have enabled thumbnails', $_SESSION['warnings'][0]);
+        $this->assertContains('You have enabled or changed thumbnails', $_SESSION['warnings'][0]);

     }
 
     /**
     }
 
     /**

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 9711d151a4cfd0fd4736cb0f38a343d88ee46084..42e32230b7bacb88cad86354e06072bac72078c0 100644 (file)
--- 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"}
                 {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>
                 {/if}
               </span>
             </label>

diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index bf88e161b778c6181f219fb07d74048ce216669e..8ea2ce66194ef728581cd75f8c5a7dfa5cf157e8 100644 (file)
--- 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 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}
                 <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 1b8bf3b96a6c9a2692277399404624f5e6cf32ab..9a0b10dc6084e2e3ac7e29d0fa562a6728c56426 100644 (file)
--- a/tpl/default/picwall.html
+++ b/tpl/default/picwall.html
@@ -12,6 +12,14 @@
   </div>
 </div>
 {else}
   </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">
   <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 ece66884c3438cb9f524131b73f810db877bc4c4..20060994452eafce857378cbff0687dbff8cccdb 100644 (file)
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -45,6 +45,14 @@
       </a>
     </div>
 
       </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}
     {loop="$tools_plugin"}
       <div class="tools-item">
         {$value}