Minor adjustments

diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html
index cf0e5a9f32880e1ca53db14516ed98a9bca0b6c2..0aae9090884691c5816e83c006c795c4f9790956 100644 (file)
--- a/tpl/default/changetag.html
+++ b/tpl/default/changetag.html
@@ -25,7 +25,7 @@
           {loop="$tags"}<option>{$key}</option>{/loop}
         </datalist>
       </div>
-      <div>{'Case sensitive'|t}</div>
+      <div><i class="fa fa-info-circle"></i> {'Case sensitive'|t}</div>
       <input type="hidden" name="token" value="{$token}">
       <div>
         <input type="submit" value="{'Rename'|t}" name="renametag">

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index debd25ea7f115408d67a67343d112a7570f3af5d..91d801a56e7f338087ef4078f25cff8aea72b476 100644 (file)
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -112,10 +112,6 @@ pre {
     transition: max-height 0.75s;
 }
 
-.pure-menu-selected {
-    background: #b0ddce;
-}
-
 .pure-menu-link,
 .pure-menu-link:visited,
 .pure-menu-selected .pure-menu-link,
@@ -174,7 +170,7 @@ pre {
 #header {
     width: 100%;
     height: 150px;
-    background: url(../img/noise.png), #1fa67a url(../img/logo2.png) no-repeat fixed 10px 2.5em;
+    background: url(../img/noise.png), #1fa67a url(../img/logo.png) no-repeat fixed 10px 2.5em;
 }
 
 #header h1 {
@@ -515,6 +511,7 @@ pre {
 }
 
 .linklist-item-thumbnail {
+    margin-top: 10px;
     padding: 10px;
     float: left;
 }
@@ -672,6 +669,7 @@ pre {
 .page-form select {
     color: black;
 }
+
 /**
  * PAGE FORM - LIGHT
  */
@@ -717,6 +715,12 @@ pre {
     font-size: 0.7em;
 }
 
+.page-form-complete input[type="text"],
+.page-form-complete input[type="password"],
+.page-form-complete textarea {
+    margin: 0;
+}
+
 .page-form section {
     margin-top: 20px;
 }
@@ -1133,4 +1137,17 @@ pre {
 .daily-entry-thumbnail {
     float: left;
     margin: 15px 5px 5px 5px;
-}
\ No newline at end of file
+}
+
+.daily-entry-description a {
+    text-decoration: none;
+    color: #1b926c;
+}
+
+.daily-entry-description a:hover {
+    text-shadow: 1px 1px #ddd;
+}
+
+.daily-entry-description a:visited {
+    color: #20b988;
+}

diff --git a/tpl/default/img/logo2.png b/tpl/default/img/logo2.png
deleted file mode 100644 (file)
index ef0e09a..0000000
Binary files a/tpl/default/img/logo2.png and /dev/null differ

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 53ec20c5b83ebfbf1506a7d47eabcdd429ebd1e4..3afec7f32babcad4d0eef6984636b7bf221dd461 100644 (file)
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -68,16 +68,18 @@ var searchInputs = document.querySelectorAll('#search input[type="text"]');
 });
 
 /**
- * Fold/Expand shaares description.
+ * Fold/Expand shaares description and thumbnail.
  */
 var foldButtons = document.querySelectorAll('.fold-button');
 [].forEach.call(foldButtons, function(foldButton) {
     // Retrieve description
     var description = null;
+    var thumbnail = null;
     var linklistItem = getParentByClass(foldButton, 'linklist-item');
     if (linklistItem != null) {
         description = linklistItem.querySelector('.linklist-item-description');
-        if (description != null) {
+        thumbnail = linklistItem.querySelector('.linklist-item-thumbnail');
+        if (description != null || thumbnail != null) {
             foldButton.style.display = 'inline';
         }
     }
@@ -88,11 +90,21 @@ var foldButtons = document.querySelectorAll('.fold-button');
         // Switch fold/expand - up = fold
         if (event.target.classList.contains('fa-chevron-up')) {
             event.target.title = 'Expand';
-            description.style.display = 'none';
+            if (description != null) {
+                description.style.display = 'none';
+            }
+            if (thumbnail != null) {
+                thumbnail.style.display = 'none';
+            }
         }
         else {
             event.target.title = 'Fold';
-            description.style.display = 'block';
+            if (description != null) {
+                description.style.display = 'block';
+            }
+            if (thumbnail != null) {
+                thumbnail.style.display = 'block';
+            }
         }
         event.target.classList.toggle('fa-chevron-down');
         event.target.classList.toggle('fa-chevron-up');

diff --git a/tpl/default/linklist.paging.html b/tpl/default/linklist.paging.html
index 3e5a58688ae0459eec016d579c1df316d46c00fe..4dbfb32413043278d350aa88ebd25a7187e889c8 100644 (file)
--- a/tpl/default/linklist.paging.html
+++ b/tpl/default/linklist.paging.html
@@ -47,7 +47,7 @@
           <a href="?linksperpage=20">20</a>
           <a href="?linksperpage=50">50</a>
           <a href="?linksperpage=100">100</a>
-          <form method="GET">
+          <form method="GET" class="pure-u-0 pure-u-lg-visible">
             <input type="text" name="linksperpage" placeholder="133">
           </form>
         </div>

diff --git a/tpl/default/page.footer.html b/tpl/default/page.footer.html
index b9d4389b94fa0b5bfbc78b28deb08d6e79be0bdf..527c0504c017558641554246ff1fc8ff8989bf4c 100644 (file)
--- a/tpl/default/page.footer.html
+++ b/tpl/default/page.footer.html
@@ -1,8 +1,8 @@
 <div class="pure-g">
   <div class="pure-u-2-24"></div>
   <div id="footer" class="pure-u-20-24">
-    <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> -
-    The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community -
+    <strong><a href="https://github.com/shaarli/Shaarli">Shaarli</a></strong> &middot;
+    The personal, minimalist, super-fast, database free, bookmarking service by the Shaarli community &middot;
     <a href="doc/Home.html" rel="nofollow">Documentation</a>
       {loop="$plugins_footer.text"}
           {$value}

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 5442ab425e7e3fca5621f759a1315ac064ccc595..39edf518328ed48ab677b382201571d12b2aee22 100644 (file)
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -11,7 +11,7 @@
   <div class="pure-u-1">
     <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">
+        <li class="pure-menu-item pure-u-0 pure-u-lg-visible">
           <a href="{$titleLink}" class="pure-menu-link">
             <i class="fa fa-home"></i>
           </a>
@@ -24,9 +24,6 @@
             <a href="?do=tools" class="pure-menu-link">{'Tools'|t}</a>
           </li>
         {/if}
-        <li class="pure-menu-item pure-u-lg-0">
-          <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
-        </li>
         <li class="pure-menu-item">
           <a href="?do=tagcloud" class="pure-menu-link">{'Tag cloud'|t}</a>
         </li>
@@ -43,14 +40,17 @@
           </li>
         {/loop}
         {if="isLoggedIn()"}
-          <li class="pure-menu-item">
+          <li class="pure-menu-item pure-u-lg-0">
             <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a>
           </li>
         {else}
-          <li class="pure-menu-item">
+          <li class="pure-menu-item pure-u-lg-0">
             <a href="?do=login" class="pure-menu-link">{'Login'|t}</a>
           </li>
         {/if}
+        <li class="pure-menu-item pure-u-lg-0">
+          <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
+        </li>
       </ul>
       <div class="header-buttons pure-u-lg-1-12 pure-u-0 pure-u-lg-visible">
         <ul class="pure-menu-list">
@@ -80,7 +80,7 @@
 
 <div id="header" class="pure-u-0 pure-u-lg-visible">
   <h1 id="header-title">
-    <a href="{if="{$titleLink}">
+    <a href="$titleLink">
       {$shaarlititle}
     </a>
   </h1>
@@ -99,7 +99,6 @@
         {if="!empty($search_term)"}
              value="{$search_term}"
         {/if}
-        tabindex="1"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>
@@ -110,7 +109,6 @@
         {/if}
         autocomplete="off" data-multiple data-minChars="1"
         data-list="{loop="$tags"}{$key}, {/loop}"
-        tabindex="2"
       >
       <button type="submit" class="search-button"><i class="fa fa-search"></i></button>
     </form>

diff --git a/tpl/default/pluginsadmin.html b/tpl/default/pluginsadmin.html
index 29f6e15e5c97a63124568aa84ee844e1398e44d4..ac38db97e4c4181dfaa787a2a0dafa9c3b71b5da 100644 (file)
--- a/tpl/default/pluginsadmin.html
+++ b/tpl/default/pluginsadmin.html
@@ -137,7 +137,7 @@
   <div class="pure-g">
     <div class="pure-u-lg-1-6 pure-u-1-8"></div>
     <div class="pure-u-lg-2-3 pure-u-3-4 page-form page-form-light">
-      <h2>{'Plugin configuration'|t}</h2>
+      <h2 class="window-title">{'Plugin configuration'|t}</h2>
       <section id="plugin_parameters">
         <div>
           {if="count($enabledPlugins)==0"}
@@ -153,12 +153,12 @@
                       <label for="{$key}">
                         <code>{$key}</code>
                         {if="isset($value.desc)"}
-                          {$value.desc}
+                          &middot; {$value.desc}
                         {/if}
                       </label>
                     </div>
                     <div class="float_input">
-                      <input name="{$key}" value="{$value}" id="{$key}" type="text" />
+                      <input name="{$key}" value="{$value.value}" id="{$key}" type="text" />
                     </div>
                   </div>
                   {/loop}

diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index 14a293205649f7923f666920d16d617e387aba8d..62ae278b942b91e9ff34fccc07f07f3d7cb624f7 100644 (file)
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -58,10 +58,10 @@
   <div class="pure-u-lg-1-3 pure-u-1-8"></div>
   <div class="pure-u-lg-1-3 pure-u-3-4 page-form page-form-light">
     <h2 class="window-title">Bookmarklets</h2>
-    <p>
+    <div>
       {'Drag one of these button to your bookmarks toolbar or right-click it and "Bookmark This Link"'|t},
       {'then click on the bookmarklet in any page you want to share.'|t}
-    </p>
+    </div>
     <div class="tools-item">
       <a title="{'Drag this link to your bookmarks toolbar or right-click it and Bookmark This Link'|t},
                 {'then click ✚Shaare link button in any page you want to share'|t}"