Use new header plugin placeholders

5 files changed, 81 insertions, 40 deletions

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index e2d64686..0367534b 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -257,8 +257,6 @@ pre {
 
 #header-login-form {
     height: 0;
-    text-align: center;
-    background: #1b926c;
     transition: 0.3s;
 }
 
@@ -266,14 +264,39 @@ pre {
     display: block;
     height: 30px;
     padding: 5px 0;
-    box-shadow: 0 1px 1px 1px #797979;
 }
 
-#header-login-form input[type="text"], #header-login-form input[type="password"], #header-login-form .remember-me {
+#header-login-form input[type="text"], #header-login-form input[type="password"] {
+    width: 200px;
+}
+
+#header-login-form input, #header-login-form .remember-me {
+    transition: visibility 1s, opacity 1s;
+    visibility: hidden;
+    opacity: 0;
+}
+
+#header-login-form.open input, #header-login-form.open .remember-me {
+    visibility: visible;
+    opacity: 1;
+}
+
+.subheader-form {
+    text-align: center;
+    background: #1b926c;
+    display: block;
+}
+
+.subheader-form.open {
+    height: 30px;
+    padding: 5px 0;
+}
+
+.subheader-form input[type="text"], .subheader-form input[type="password"], .subheader-form .remember-me {
     margin: 0 0 5px 0;
     padding: 5px 5px 3px 15px;
     height: 20px;
-    width: 200px;
+    width: 20%;
     background: #1fa67a;
     border: medium none currentColor;
     border-radius: 25px;
@@ -282,24 +305,24 @@ pre {
 }
 
 /* because chrome */
-#header-login-form input[type="text"]::-webkit-input-placeholder,
-#header-login-form input[type="password"]::-webkit-input-placeholder
+.subheader-form input[type="text"]::-webkit-input-placeholder,
+.subheader-form input[type="password"]::-webkit-input-placeholder
 {
     color: #b0ddce;
 }
 
-#header-login-form .remember-me {
+.subheader-form .remember-me {
     display: inline-block;
     width: auto;
     padding: 5px 20px 3px 20px;
     cursor: pointer;
 }
 
-#header-login-form .remember-me label, #header-login-form .remember-me input {
+.subheader-form .remember-me label, .subheader-form .remember-me input {
     cursor: pointer;
 }
 
-#header-login-form input[type="submit"] {
+.subheader-form input[type="submit"] {
     display: inline-block;
     margin: 0 0 5px 0;
     height: 25px;
@@ -311,17 +334,6 @@ pre {
     color: #b0ddce;
 }
 
-#header-login-form input, #header-login-form .remember-me {
-    transition: visibility 1s, opacity 1s;
-    visibility: hidden;
-    opacity: 0;
-}
-
-#header-login-form.open input, #header-login-form.open .remember-me {
-    visibility: visible;
-    opacity: 1;
-}
-
 .new-version-message {
     text-align: center;
 }
diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index e6b04188..5ca7923d 100644
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -110,9 +110,11 @@
               <div class="linklist-item-infos-dateblock pure-u-lg-3-8 pure-u-1">
                 <a href="?{$value.shorturl}" title="{'Permalink'|t}">
                   {if="!$hide_timestamps || isLoggedIn()"}
-                    <span class="linkdate">
+                    {$updated=$value.updated_timestamp ? 'Edited: '. strftime('%c', $value.updated_timestamp) : 'Permalink'}
+                    <span class="linkdate" title="{$updated}">
                       <i class="fa fa-clock-o"></i>
-                      {function="strftime('%d %B %Y %H:%M', $value.timestamp)"} &middot;
+                      {function="strftime('%d %B %Y %H:%M', $value.timestamp)"}{if="$value.updated_timestamp"}*{/if}
+                      &middot;
                     </span>
                   {/if}
                   {'permalink'|t}
diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index 4dbfb324..5e9c8486 100644
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -14,14 +14,16 @@
               ><i class="fa fa-key"></i></a>
             {/if}
             {loop="$action_plugin"}
-              <!-- FIXME! Plugin update to handle that. -->
-              <a href="?privateonly" title="{$value.title}" class=
-                {if="$value.on"}
-                  "filter-on"
-                {else}
-                  "filter-off"
-                {/if}
-              >{$value.url}</a>
+              {$value.class=isset($value.class) ? $value.class : ''}
+              {$value.class=!empty($value.on) ? $value.class .' filter-on' : $value.class .' filter-off'}
+              <a
+                {loop="$value"}
+                  {if="$key!='html'"}
+                    {$key}="{$value}"
+                  {/if}
+                {/loop}>
+                {$value.html}
+              </a>
             {/loop}
           {/if}
         </div>
diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 39edf518..67d0d0c4 100644
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -33,10 +33,17 @@
         <li class="pure-menu-item">
           <a href="?do=daily" class="pure-menu-link">{'Daily'|t}</a>
         </li>
-        <!-- FIXME! update plugin system to handle this -->
         {loop="$plugins_header.buttons_toolbar"}
           <li class="pure-menu-item">
-            <a href="{$value.url}" class="pure-menu-link">{$value.title}</a>
+            <a
+              {$value.class=isset($value.class) ? $value.class . ' pure-menu-link' : 'pure-menu-link'}
+              {loop="$value"}
+                {if="$key!='html'"}
+                  {$key}="{$value}"
+                {/if}
+              {/loop}>
+              {$value.html}
+            </a>
           </li>
         {/loop}
         {if="isLoggedIn()"}
@@ -80,7 +87,7 @@
 
 <div id="header" class="pure-u-0 pure-u-lg-visible">
   <h1 id="header-title">
-    <a href="$titleLink">
+    <a href="{$titleLink}">
       {$shaarlititle}
     </a>
   </h1>
@@ -116,9 +123,26 @@
 </div>
 
 <div id="content">
+  {loop="$plugins_header.fields_toolbar"}
+    <form
+      {loop="$value"}
+        {if="$key!='inputs'"}
+          {$key}="{$value}"
+        {/if}
+      {/loop}>
+      <div class="subheader-form open pure-u-0 pure-u-lg-visible pure-u-lg-1">
+        {loop="$value.inputs"}
+          <input
+            {loop="$value"}
+              {$key}="{$value}"
+            {/loop}>
+        {/loop}
+      </div>
+    </form>
+  {/loop}
   {if="!isLoggedIn()"}
     <form method="post" name="loginform">
-      <div id="header-login-form">
+      <div class="subheader-form" id="header-login-form">
         <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
         <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
         <div class="remember-me">
@@ -131,7 +155,6 @@
       </div>
     </form>
   {/if}
-
 {if="!empty($newVersion) || !empty($versionError)"}
   <div class="pure-g new-version-message pure-alert pure-alert-warning pure-alert-closable">
     <div class="pure-u-2-24"></div>
diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index 62ae278b..ae794ce9 100644
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -45,11 +45,13 @@
       </a>
     </div>
 
-
+    {loop="$tools_plugin"}
+      <div class="tools-item">
+        {$value}
+      </div>
+    {/loop}
   </div>
-  {loop="$tools_plugin"}
-    {$value}
-  {/loop}
+
 
   <div class="clear"></div>
 </div>