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

1 files changed, 16 insertions, 14 deletions

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}"