From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 5 Aug 2016 10:31:18 +0000 (+0200)
Subject: Rebase: new config manager, search criteria, and private links
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4fe87e697425e28cd0be00cc397d62b82eb13b26;p=github%2Fshaarli%2FShaarli.git

Rebase: new config manager, search criteria, and private links
---

diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 4a0f44c6..ccdb5f21 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -20,22 +20,26 @@
     {/loop}
   </div>
 
-  <!-- TODO: Search results. -->
   {if="count($links)==0"}
     <div id="searchcriteria">Nothing found.</div>
-  {else}
-    {if="$search_type=='fulltext'"}
-      <div id="searchcriteria">{$result_count} results for <i>{$search_crits}</i></div>
-    {/if}
-    {if="$search_type=='tags'"}
-      <div id="searchcriteria">{$result_count} results for tags <i>
-      {loop="search_crits"}
-        <span class="linktag" title="Remove tag">
+  {elseif="!empty($search_term) or !empty($search_tags)"}
+    <div id="searchcriteria">
+      {$result_count} results
+      {if="!empty($search_term)"}
+        for <em>{$search_term}</em>
+      {/if}
+      {if="!empty($search_tags)"}
+        {$exploded_tags=explode(' ', $search_tags)}
+        tagged
+        {loop="$exploded_tags"}
+          <span class="linktag" title="Remove tag">
             <a href="?removetag={function="urlencode($value)"}">{$value} <span class="remove">x</span></a>
-        </span>
-      {/loop}</i></div>
-    {/if}
+          </span>
+        {/loop}
+      {/if}
+    </div>
   {/if}
+
   <div class="pure-g">
     <div class="pure-u-2-24"></div>
     <div class="pure-u-20-24">
@@ -96,7 +100,7 @@
             <div class="pure-g">
               <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1">
                 <a href="?{$value.shorturl}" title="Permalink">
-                  {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}
+                  {if="!$hide_timestamps || isLoggedIn()"}
                     <span class="linkdate">
                       <i class="fa fa-clock-o"></i>
                       {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} &middot;
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index e368d00d..ca080fda 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -1,11 +1,9 @@
 <div class="shaarli-menu pure-g" id="shaarli-menu">
   <div class="pure-u-lg-0 pure-u-1">
     <div class="pure-menu">
-      <!-- FIXME! default value in PHP -->
-      <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
-        class="pure-menu-link">
+      <a href="{$titleLink}" class="pure-menu-link">
         <i class="fa fa-home"></i>
-        {$GLOBALS['title']}
+        {$shaarlititle}
       </a>
       <a href="#" class="menu-toggle" id="menu-toggle"><s class="bar"></s><s class="bar"></s></a>
     </div>
@@ -14,8 +12,7 @@
     <div class="pure-menu menu-transform pure-menu-horizontal pure-g">
       <ul class="pure-menu-list pure-u-lg-11-12 pure-u-1">
         <li class="pure-menu-item pure-menu-selected pure-u-0 pure-u-lg-visible">
-          <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}"
-            class="pure-menu-link">
+          <a href="{$titleLink}" class="pure-menu-link">
             <i class="fa fa-home"></i>
           </a>
         </li>
@@ -27,7 +24,7 @@
             <a href="?do=tools" class="pure-menu-link">Tools</a>
           </li>
 
-        {elseif="$GLOBALS['config']['OPEN_SHAARLI']"}
+        {elseif="$openshaarli"}
           <li class="pure-menu-item">
             <a href="?do=addlink" class="pure-menu-link">Shaare</a>
           </li>
@@ -91,19 +88,24 @@
 
 <div id="header" class="pure-u-0 pure-u-lg-visible">
   <h1 id="header-title">
-    <a href="{if="!empty($GLOBALS['titleLink'])"}{$GLOBALS['titleLink']}{else}?{/if}">
-      {$GLOBALS['title']}
+    <a href="{if="{$titleLink}">
+      {$shaarlititle}
     </a>
   </h1>
   <div id="linkcount">
-    {if="!empty($linkcount)"}<span class="strong">{$linkcount}</span> shaares{/if}
+    {if="!empty($linkcount)"}
+      <span class="strong">{$linkcount}</span> shaares
+      {if="$privateLinkcount>0"}
+        - <span class="strong">{$privateLinkcount}</span> private links
+      {/if}
+    {/if}
   </div>
 
   <div id="search">
     <form method="GET" class="searchform" name="searchform">
       <input type="text" tabindex="1" id="searchform_value" name="searchterm" placeholder="Search text"
-        {if="!empty($search_crits) && $search_type=='fulltext'"}
-          value="{$search_crits}"
+        {if="!empty($search_term)"}
+             value="{$search_term}"
         {/if}
         tabindex="1"
       >
@@ -111,8 +113,8 @@
     </form>
     <form method="GET" class="tagfilter" name="tagfilter">
       <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="!empty($search_tags}"}
+          value="{$search_tags}"
         {/if}
         autocomplete="off" data-multiple data-minChars="1"
         data-list="{loop="$tags"}{$key}, {/loop}"