Logging: move logm() from index.php to application/Utils.php

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

index 666748a7b3f2d4bf660ee116ed016af9b2dc32a3..6ce59dd85931f8cbd49a5442f6c4f03d66d4a587 100644 (file)
--- a/tpl/linklist.html
+++ b/tpl/linklist.html
@@ -7,15 +7,24 @@
  <body>
  <div id="pageheader">
      {include="page.header"}
+
      <div id="headerform" class="search">
          <form method="GET" class="searchform" name="searchform">
-            <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text" value="">
+            <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
+               {if="!empty($search_crits) && $search_type=='fulltext'"}
+                    value="{$search_crits}"
+               {/if}
+            >
              <input type="submit" value="Search" class="bigbutton">
          </form>
          <form method="GET" class="tagfilter" name="tagfilter">
-            <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag" value=""
-                   autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
-                   data-list="{loop="$tags"}{$key}, {/loop}">
+            <input type="text" tabindex="2" name="searchtags" id="tagfilter_value" placeholder="Filter by tag"
+                {if="!empty($search_crits) && $search_type=='tags'"}
+                    value="{function="implode(' ', $search_crits)"}"
+                {/if}
+                autocomplete="off" class="awesomplete" data-multiple data-minChars="1"
+                data-list="{loop="$tags"}{$key}, {/loop}">
+            >
              <input type="submit" value="Search" class="bigbutton">
          </form>
          {loop="$plugins_header.fields_toolbar"}
@@ -44,7 +53,7 @@
              <div id="searchcriteria">{$result_count} results for tags <i>
              {loop="search_crits"}
                  <span class="linktag" title="Remove tag">
-                    <a href="?removetag={$value}">{$value} <span class="remove">x</span></a>
+                    <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
                  </span>
              {/loop}</i></div>
          {/if}