From 33724076bb4921263cd0568a24c991f4420a71a6 Mon Sep 17 00:00:00 2001
From: Keith Carangelo <mail@kcaran.com>
Date: Mon, 29 Mar 2021 11:55:46 -0400
Subject: [PATCH] Merged to latest shaarli - 2021-03-29

---
 addlink.html        |  1 +
 css/shaarli.css     | 21 ++++++++++++++-------
 editlink.batch.html |  8 ++++++--
 editlink.html       | 21 +++++++++++----------
 includes.html       |  2 +-
 pluginscontent.html | 13 +++++++++++++
 sass/shaarli.scss   | 19 +++++++++++++++++--
 server.html         | 16 ++++++++--------
 8 files changed, 71 insertions(+), 30 deletions(-)
 create mode 100644 pluginscontent.html

diff --git a/addlink.html b/addlink.html
index 3dbc611..503edc2 100644
--- a/addlink.html
+++ b/addlink.html
@@ -62,6 +62,7 @@ <h2 class="window-title">{"Shaare multiple new links"|t}</h2>
           </p>
 
           <p>
+            <input type="hidden" name="private" value="0">
             <label>
             <input type="checkbox" name="private" {if="$default_private_links"} checked="checked"{/if}>
             &nbsp; {'Private'|t}</label>
diff --git a/css/shaarli.css b/css/shaarli.css
index dc8e6f5..0280722 100644
--- a/css/shaarli.css
+++ b/css/shaarli.css
@@ -4514,7 +4514,7 @@ h2.linklist-item-title {
   width: 100%;
   color: #252525; }
 
-.pure-g .page-form .pure-button, .pure-g .page-form input[type="submit"], .pure-g .page-form button, .pure-g .page-form .button {
+.pure-g .page-form .pure-button, .pure-g .page-form input[type="submit"], .pure-g .page-form button, .pure-g .page-form .button, .pure-button-shaarli {
   display: inline-block;
   position: relative;
   top: -1px;
@@ -4530,9 +4530,9 @@ h2.linklist-item-title {
   border-radius: 5px;
   font-size: 1.2em;
   font-weight: normal; }
-  .pure-g .page-form .pure-button .fa, .pure-g .page-form input[type="submit"] .fa, .pure-g .page-form button .fa, .pure-g .page-form .button .fa {
+  .pure-g .page-form .pure-button .fa, .pure-g .page-form input[type="submit"] .fa, .pure-g .page-form button .fa, .pure-g .page-form .button .fa, .pure-button-shaarli .fa {
     font-size: 20px; }
-  .pure-g .page-form .pure-button:hover, .pure-g .page-form input:hover[type="submit"], .pure-g .page-form button:hover, .pure-g .page-form .button:hover {
+  .pure-g .page-form .pure-button:hover, .pure-g .page-form input:hover[type="submit"], .pure-g .page-form button:hover, .pure-g .page-form .button:hover, .pure-button-shaarli:hover {
     background-color: var(--dark-main-color); }
 
 .pure-g .page-form {
@@ -4567,6 +4567,7 @@ h2.linklist-item-title {
   .pure-g .page-form input[type="password"]::-webkit-input-placeholder {
     color: #707070; }
   .pure-g .page-form textarea {
+    line-height: 1.5;
     padding: 15px 5px 3px 15px;
     min-height: 265px;
     resize: vertical;
@@ -4642,7 +4643,7 @@ form[name='linkform'].page-form {
   color: #252525; }
 
 .edit-link-container {
-  margin-bottom: 300px; }
+  margin-bottom: 32px; }
   .edit-link-container .created-date {
     float: right;
     margin-top: -52px;
@@ -5009,8 +5010,10 @@ form[name='linkform'].page-form {
     margin-left: 8px; }
   .linklist-item-infos {
     position: relative;
-    top: 4px;
-    right: -16px; }
+    top: 6px;
+    right: -16px;
+    display: flex;
+    justify-content: flex-end; }
   .linklist-filters {
     right: 8px; }
     .linklist-filters a {
@@ -5059,7 +5062,11 @@ form[name='linkform'].page-form {
       border-bottom-style: none; }
   .timezone-continent::after {
     white-space: pre;
-    content: '\a\a'; } }
+    content: '\a\a'; }
+  .pure-g .server-tables table {
+    margin: 16px -6px;
+    width: auto;
+    font-size: 12px; } }
 
 @media print {
   .shaarli-menu {
diff --git a/editlink.batch.html b/editlink.batch.html
index b1f8e5b..5ed1353 100644
--- a/editlink.batch.html
+++ b/editlink.batch.html
@@ -15,18 +15,22 @@
 
 {include="page.header"}
 
-<div class="center">
+<div class="pure-g pure-g-full">
+<div class="pure-u-4-24"></div>
   <input type="submit" name="save_edit_batch" class="pure-button-shaarli" value="{'Save all'|t}">
 </div>
 
 {loop="$links"}
+  {$batchId=$key}
   {include="editlink"}
 {/loop}
 
-<div class="center">
+<div class="pure-g pure-g-full">
+<div class="pure-u-4-24"></div>
   <input type="submit" name="save_edit_batch" class="pure-button-shaarli" value="{'Save all'|t}">
 </div>
 
+
 {include="page.footer"}
 {if="$async_metadata"}<script src="{$asset_path}/js/metadata.min.js?v={$version_hash}#"></script>{/if}
 <script src="{$asset_path}/js/shaare_batch.min.js?v={$version_hash}#"></script>
diff --git a/editlink.html b/editlink.html
index 7ca885c..cd0bced 100644
--- a/editlink.html
+++ b/editlink.html
@@ -1,3 +1,4 @@
+{$batchId=isset($batchId) ? $batchId : ''}
 {if="empty($batch_mode)"}
 <!DOCTYPE html>
 <html{if="$language !== 'auto'"} lang="{$language}"{/if}>
@@ -10,7 +11,7 @@
   {ignore}Lil hack: when included in a loop in batch mode, `$value` is assigned by RainTPL with template vars.{/ignore}
   {function="extract($value) ? '' : ''"}
 {/if}
-  <div id="editlinkform" class="edit-link-container pure-g pure-g-full">
+  <div id="editlinkform{$batchId}" class="edit-link-container pure-g pure-g-full">
     <div class="pure-u-2-24"></div>
     <form method="post"
           name="linkform"
@@ -29,7 +30,7 @@ <h2 class="window-title">
 
       <div class="mark-private">
         <label>
-        <input type="checkbox"  name="lf_private" id="lf_private"
+        <input type="checkbox"  name="lf_private" id="lf_private{$batchId}"
         {if="$link.private == true"}
           checked="checked"
         {/if}>
@@ -37,14 +38,14 @@ <h2 class="window-title">
       </div>
 
       <p>
-        <label for="lf_url">{'URL'|t}
-        <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input">
+        <label for="lf_url{$batchId}">{'URL'|t}
+        <input type="text" name="lf_url" id="lf_url{$batchId}" value="{$link.url}" class="lf_input">
         </label>
       </p>
 
       <p class="{$asyncLoadClass}">
-        <label for="lf_title">{'Title'|t}
-        <input type="text" name="lf_title" id="lf_title" value="{$link.title}"
+        <label for="lf_title{$batchId}">{'Title'|t}
+        <input type="text" name="lf_title" id="lf_title{$batchId}" value="{$link.title}"
          class="lf_input {if="!$async_metadata"}autofocus{/if}"
         >
         </label>
@@ -59,14 +60,14 @@ <h2 class="window-title">
       {/if}
 
       <p class="{if="$retrieve_description"}{$asyncLoadClass}{/if}">
-        <label for="lf_description">{'Description'|t}
-        <textarea name="lf_description" id="lf_description" class="autofocus">{$link.description}</textarea>
+        <label for="lf_description{$batchId}">{'Description'|t}
+        <textarea name="lf_description" id="lf_description{$batchId}" class="autofocus">{$link.description}</textarea>
        </label>
       </p>
 
       <p class="{if="$retrieve_description"}{$asyncLoadClass}{/if}">
-        <label for="lf_tags">{'Tags'|t}
-        <input type="text" name="lf_tags" id="lf_tags" value="{$link.tags}" class="lf_input autofocus"
+        <label for="lf_tags{$batchId}">{'Tags'|t}
+        <input type="text" name="lf_tags" id="lf_tags{$batchId}" value="{$link.tags}" class="lf_input autofocus"
           data-list="{loop="$tags"}{$key}, {/loop}" data-multiple data-autofirst autocomplete="off" >
         </label>
       </p>
diff --git a/includes.html b/includes.html
index 975b8ee..56c9f6d 100644
--- a/includes.html
+++ b/includes.html
@@ -19,7 +19,7 @@
 {/if}
 <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
       title="Shaarli search - {$shaarlititle}" />
-{if="! empty($links) && count($links) === 1"}
+{if="$template === 'linklist' && ! empty($links) && count($links) === 1"}
   {$link=reset($links)}
   <meta property="og:title" content="{$link.title}" />
   <meta property="og:type" content="article" />
diff --git a/pluginscontent.html b/pluginscontent.html
new file mode 100644
index 0000000..1e4f6b8
--- /dev/null
+++ b/pluginscontent.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html{if="$language !== 'auto'"} lang="{$language}"{/if}>
+<head>
+  {include="includes"}
+</head>
+<body>
+  {include="page.header"}
+
+  {$content}
+
+  {include="page.footer"}
+</body>
+</html>
diff --git a/sass/shaarli.scss b/sass/shaarli.scss
index 53a2a71..f0aab57 100644
--- a/sass/shaarli.scss
+++ b/sass/shaarli.scss
@@ -1059,6 +1059,7 @@ h2.linklist-item-title {
   textarea {
     @extend %page-form-input;
 
+	line-height: 1.5;
     padding: 15px 5px 3px 15px;
     min-height: 265px;
     resize: vertical;
@@ -1193,7 +1194,7 @@ form {
 
 // EDIT LINK
 .edit-link-container {
-	margin-bottom: 300px;
+	margin-bottom: 32px;
   .created-date {
 	float: right;
     margin-top: -52px;
@@ -1641,6 +1642,10 @@ form {
 	}
 }
 
+.pure-button-shaarli {
+  @extend %page-form-button;
+}
+
 @media screen and (max-width: 64em) {
 	.pure-g-full {
 		width: 100%;
@@ -1753,8 +1758,10 @@ form {
 
 	.linklist-item-infos {
 		position: relative;
-		top: 4px;
+		top: 6px;
 		right: -16px;
+		display: flex;
+		justify-content: flex-end;
 	}
 
 	.linklist-filters {
@@ -1849,6 +1856,14 @@ form {
       content: '\a\a';
     }
   }
+
+  .pure-g .server-tables {
+    table {
+      margin: 16px -6px;
+      width: auto;
+      font-size: 12px;
+    }
+  }
 }
 
 // Print rules
diff --git a/server.html b/server.html
index 88a96bf..5a6a096 100644
--- a/server.html
+++ b/server.html
@@ -56,11 +56,11 @@ <h3 class="window-subtitle">{'General'|t}</h3>
 
     {include="server.requirements"}
 
-    <h3 class="window-subtitle">Version</h3>
+    <h3 class="window-subtitle">{'Version'|t}</h3>
 
     <div class="pure-g server-row">
       <div class="pure-u-lg-1-3 pure-u-1 server-label">
-        <p>Current version</p>
+        <p>{'Current version'|t}</p>
       </div>
       <div class="pure-u-lg-2-3 pure-u-1">
         <p>{$current_version}</p>
@@ -69,7 +69,7 @@ <h3 class="window-subtitle">Version</h3>
 
     <div class="pure-g server-row">
       <div class="pure-u-lg-1-3 pure-u-1 server-label">
-        <p>Latest release</p>
+        <p>{'Latest release'|t}</p>
       </div>
       <div class="pure-u-lg-2-3 pure-u-1">
         <p>
@@ -80,11 +80,11 @@ <h3 class="window-subtitle">Version</h3>
       </div>
     </div>
 
-    <h3 class="window-subtitle">Thumbnails</h3>
+    <h3 class="window-subtitle">{'Thumbnails'|t}</h3>
 
     <div class="pure-g server-row">
       <div class="pure-u-lg-1-3 pure-u-1 server-label">
-        <p>Thumbnails status</p>
+        <p>{'Thumbnails status'|t}</p>
       </div>
       <div class="pure-u-lg-2-3 pure-u-1">
         <p>
@@ -107,17 +107,17 @@ <h3 class="window-subtitle">Thumbnails</h3>
     </div>
     {/if}
 
-    <h3 class="window-subtitle">Cache</h3>
+    <h3 class="window-subtitle">{'Cache'|t}</h3>
 
     <div class="tools-item">
       <a href="{$base_path}/admin/clear-cache?type=main">
-        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Clear main cache</span>
+        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Clear main cache'|t}</span>
       </a>
     </div>
 
     <div class="tools-item">
       <a href="{$base_path}/admin/clear-cache?type=thumbnails">
-        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Clear thumbnails cache</span>
+        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">{'Clear thumbnails cache'|t}</span>
       </a>
     </div>
   </div>