Merged changes from master 2020-10-23

changetag.html

@@ -30,8 +30,8 @@ <h2 class="window-title">{"Manage tags"|t}</h2>
 
       <input type="hidden" name="token" value="{$token}">
       <div class="submit-buttons">
-        <input type="submit" value="{'Rename'|t}" name="renametag">
-        <input type="submit" value="{'Delete'|t}" name="deletetag" class="button button-red confirm-delete">
+        <input type="submit" value="{'Rename tag'|t}" name="renametag">
+        <input type="submit" value="{'Delete tag'|t}" name="deletetag" class="button button-red confirm-delete">
       </div>
 
       <p>{'You can also edit tags in the'|t} <a href="{$base_path}/tags/list?sort=usage">{'tag list'|t}</a>.</p>

daily.html

@@ -72,7 +72,7 @@ <h3>
                   </div>
                   {if="$thumbnails_enabled && !empty($link.thumbnail)"}
                     <div class="daily-entry-thumbnail">
-                      <img data-src="{$link.thumbnail}#" class="b-lazy"
+                      <img data-src="{$root_path}/{$link.thumbnail}#" class="b-lazy"
                            src=""
                            alt="thumbnail" width="{$thumbnails_width}" height="{$thumbnails_height}" />
                     </div>

editlink.html

@@ -10,7 +10,10 @@
     <form method="post"
           name="linkform"
           action="{$base_path}/admin/shaare"
-          class="page-form pure-u-20-24">
+          class="page-form pure-u-20-24"
+    >
+      {$asyncLoadClass=$link_is_new && $async_metadata && empty($link.title) ? 'loading-input' : ''}
+
       <h2 class="window-title">
         {if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if}
       </h2>
@@ -20,7 +23,7 @@ <h2 class="window-title">
       {if="!$link_is_new"}<div class="created-date">{'Created:'|t} {$link.created|format_date}</div>{/if}
 
       <div class="mark-private">
-		<label>
+        <label>
         <input type="checkbox"  name="lf_private" id="lf_private"
         {if="($link_is_new && $default_private_links || $link.private == true)"}
           checked="checked"
@@ -31,13 +34,15 @@ <h2 class="window-title">
       <p>
         <label for="lf_url">{'URL'|t}
         <input type="text" name="lf_url" id="lf_url" value="{$link.url}" class="lf_input">
-		</label>
+        </label>
       </p>
 
-      <p>
-      <label for="lf_title">{'Title'|t}
-        <input type="text" name="lf_title" id="lf_title" value="{$link.title}" class="lf_input autofocus">
-      </label>
+      <p class="{$asyncLoadClass}">
+        <label for="lf_title">{'Title'|t}
+        <input type="text" name="lf_title" id="lf_title" value="{$link.title}"
+         class="lf_input {if="!$async_metadata"}autofocus{/if}"
+        >
+        </label>
       </p>
 
       {if="$formatter==='markdown'"}
@@ -48,13 +53,13 @@ <h2 class="window-title">
         </div>
       {/if}
 
-      <p>
+      <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>
+       </label>
       </p>
 
-      <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"
           data-list="{loop="$tags"}{$key}, {/loop}" data-multiple data-autofirst autocomplete="off" >
@@ -67,9 +72,10 @@ <h2 class="window-title">
         {/loop}
       </div>
 
+
       <div class="submit-buttons">
         <input type="submit" name="save_edit" class="" id="button-save-edit"
-               value="{if="$link_is_new"}{'Save'|t}{else}{'Update'|t}{/if}">
+               value="{if="$link_is_new"}{'Save'|t}{else}{'Apply Changes'|t}{/if}">
         {if="!$link_is_new"}
         <a href="{$base_path}/admin/shaare/delete?id={$link.id}&amp;token={$token}"
            title="" name="delete_link" class="pure-button button-red confirm-delete">
@@ -86,5 +92,6 @@ <h2 class="window-title">
     </form>
   </div>
   {include="page.footer"}
+  {if="$link_is_new && $async_metadata"}<script src="{$asset_path}/js/metadata.min.js?v={$version_hash}#"></script>{/if}
 </body>
 </html>

includes.html

@@ -8,14 +8,14 @@
 <link href="{$asset_path}/img/favicon.png#" rel="shortcut icon" type="image/png" />
 <link href="{$asset_path}/img/apple-touch-icon.png#" rel="apple-touch-icon" sizes="180x180" />
 <link type="text/css" rel="stylesheet" href="{$asset_path}/css/shaarli.css?v={$version_hash}#" />
-{if="$formatter==='markdown'"}
+{if="strpos($formatter, 'markdown') !== false"}
   <link type="text/css" rel="stylesheet" href="{$asset_path}/css/markdown.min.css?v={$version_hash}#" />
 {/if}
 {loop="$plugins_includes.css_files"}
-  <link type="text/css" rel="stylesheet" href="{$value}?v={$version_hash}#"/>
+  <link type="text/css" rel="stylesheet" href="{$root_path}/{$value}?v={$version_hash}#"/>
 {/loop}
 {if="is_file('data/user.css')"}
-  <link type="text/css" rel="stylesheet" href="{$base_path}/data/user.css#" />
+  <link type="text/css" rel="stylesheet" href="{$root_path}/data/user.css#" />
 {/if}
 <link rel="search" type="application/opensearchdescription+xml" href="{$base_path}/open-search#"
       title="Shaarli search - {$shaarlititle}" />

js/metadata.min.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! https://mths.be/he v1.2.0 by @mathias | MIT license */

js/shaarli.min.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! https://mths.be/he v1.2.0 by @mathias | MIT license */