Merge remote-tracking branch 'ArthurHoaro/daily-date' into next

[github/shaarli/Shaarli.git] / tpl / linklist.html
diff --git a/tpl/linklist.html b/tpl/linklist.html

index 16fc842d048a87d48c7821af77399a49f034dd6f..47e67e71effd6e96ac8e93984c5c205ac532bb65 100644 (file)
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -1,12 +1,21 @@
  <!DOCTYPE html>
  <html>
-<head>{include="includes"}</head>
+<head>
+    <link type="text/css" rel="stylesheet" href="../inc/awesomplete.css" />
+    {include="includes"}
+</head>
  <body>
  <div id="pageheader">
      {include="page.header"}
      <div id="headerform" class="search">
-        <form method="GET" class="searchform" name="searchform"><input type="text" id="searchform_value" name="searchterm" value=""> <input type="submit" value="Search" class="bigbutton"></form>
-        <form method="GET" class="tagfilter" name="tagfilter"><input type="text" name="searchtags" id="tagfilter_value" value=""> <input type="submit" value="Filter by tag" class="bigbutton"></form>
+        <form method="GET" class="searchform" name="searchform"><input type="text" id="searchform_value" name="searchterm" placeholder="Search text" value=""> <input type="submit" value="Search" class="bigbutton"></form>
+        <form method="GET" class="tagfilter" name="tagfilter">
+            <input type="text" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" value="" list="tagsList" autocomplete="off" class="awesomplete" data-minChars="1">
+            <datalist id="tagsList">
+                {loop="$tags"}<option>{$key}</option>{/loop}
+            </datalist>
+            <input type="submit" value="Search" class="bigbutton">
+        </form>
      </div>
  </div>
  
@@ -44,7 +53,7 @@
                  <br>
                  {if="$value.description"}<div class="linkdescription">{$value.description}</div>{/if}
                  {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
-                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{$value.localdate|htmlspecialchars} - permalink</a> - </span>
+                    <span class="linkdate" title="Permalink"><a href="?{$value.linkdate|smallHash}">{function="strftime('%c', $value.timestamp)"} - permalink</a> - </span>
                  {else}
                      <span class="linkdate" title="Short link here"><a href="?{$value.linkdate|smallHash}">permalink</a> - </span>
                  {/if}
@@ -53,7 +62,7 @@
                  {/if}
                  <div class="linkqrcode"><a href="http://qrfree.kaywa.com/?l=1&amp;s=8&amp;d={$scripturl|urlencode}%3F{$value.linkdate|smallHash}"
                      onclick="return showQrCode(this);" class="qrcode" data-permalink="{$scripturl}?{$value.linkdate|smallHash}">
-                   <img src="images/qrcode.png#" alt="QR-Code" title="{$value.localdate|htmlspecialchars}"></a></div> -
+                   <img src="images/qrcode.png#" alt="QR-Code" title="{function="strftime('%c', $value.timestamp)"}"></a></div> -
                  <a href="{$value.url|htmlspecialchars}"><span class="linkurl" title="Short link">{$value.url|htmlspecialchars}</span></a><br>
                  {if="$value.tags"}
                      <div class="linktaglist">
@@ -97,7 +106,7 @@ function showQrCode(caller,loading)
          if (!loading)  // If javascript lib is still loading, do not append script to body.
          {
              var element = document.createElement("script");
-            element.src = "inc/qr.min.js";
+            element.src = "inc/qr-1.1.3.min.js";
              document.body.appendChild(element);
          }
          setTimeout(function() { showQrCode(caller,true);}, 200); // Retry in 200 milliseconds.
@@ -129,5 +138,6 @@ function showQrCode(caller,loading)
      return false;
  }
  </script>
+<script src="inc/awesomplete.min.js#"></script>
  </body>
  </html>