Takin theme reviews into account

diff --git a/tpl/default/addlink.html b/tpl/default/addlink.html
index e42080082aebc5621cbc43ba7b09cc7ce48a000e..2d66c3818388dbdf2825277373af7f35387b9637 100644 (file)
--- a/tpl/default/addlink.html
+++ b/tpl/default/addlink.html
@@ -7,11 +7,11 @@
 {include="page.header"}
 <div class="pure-g">
   <div class="pure-u-lg-1-3 pure-u-1-8"></div>
-  <div id="addlink-form" class="page-form pure-u-lg-1-3 pure-u-3-4">
+  <div id="addlink-form" class="page-form  page-form-light pure-u-lg-1-3 pure-u-3-4">
     <h2 class="window-title">{"Shaare a new link"|t}</h2>
-    <form method="GET" action="#" name="addform" class="addform page-form page-form-light autofocus">
+    <form method="GET" action="#" name="addform" class="addform">
       <div>
-        <input type="text" name="post" placeholder="{'URL or leave empty to post a note'|t}">
+        <input type="text" name="post" placeholder="{'URL or leave empty to post a note'|t}" class="autofocus">
       </div>
       <div>
         <input type="submit" value="{'Add link'|t}">

diff --git a/tpl/default/changepassword.html b/tpl/default/changepassword.html
index bff33c0c6e6a50c897a1beb97ea3a1e0e292cf2b..7196cccdf979250c2cd31d7e3ee7a7467f7fd8a7 100644 (file)
--- a/tpl/default/changepassword.html
+++ b/tpl/default/changepassword.html
@@ -7,10 +7,9 @@
 {include="page.header"}
 <div class="pure-g">
   <div class="pure-u-lg-1-3 pure-u-1-8"></div>
-  <div id="addlink-form" class="page-form pure-u-lg-1-3 pure-u-3-4">
+  <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4">
     <h2 class="window-title">{"Change password"|t}</h2>
-    <form method="POST" action="#" name="changepasswordform" id="changepasswordform"
-          class="addform page-form page-form-light">
+    <form method="POST" action="#" name="changepasswordform" id="changepasswordform">
       <div>
         <input type="password" name="oldpassword" placeholder="{'Current password'|t}" class="autofocus">
       </div>

diff --git a/tpl/default/changetag.html b/tpl/default/changetag.html
index ea8dc1b441e3f8dcbf851e57aa414d023e7732ab..5d5d8c96a742c2426beb57b4c24485560835e0f0 100644 (file)
--- a/tpl/default/changetag.html
+++ b/tpl/default/changetag.html
@@ -7,10 +7,9 @@
 {include="page.header"}
 <div class="pure-g">
   <div class="pure-u-lg-1-3 pure-u-1-8"></div>
-  <div id="addlink-form" class="page-form pure-u-lg-1-3 pure-u-3-4">
+  <div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-3-4">
     <h2 class="window-title">{"Manage tags"|t}</h2>
-    <form method="POST" action="#" name="changetag" id="changetag"
-          class="addform page-form page-form-light">
+    <form method="POST" action="#" name="changetag" id="changetag">
       <div>
         <input type="text" name="fromtag" placeholder="{'Tag'|t}"
                list="tagsList" autocomplete="off" class="awesomplete autofocus" data-minChars="1">

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index f717b99adca4749778d003be005194c58c443d63..ae0d58073c3cbff1bf6c4ae060a10d14d3ce81f9 100644 (file)
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -2,7 +2,7 @@
  * General
  */
 body {
-    background: url(../img/noise.png) #979797;
+    background: url(../img/noise.png) #c5c5c5;
 }
 
 .strong {
@@ -116,14 +116,15 @@ pre {
 .pure-menu-link:visited,
 .pure-menu-selected .pure-menu-link,
 .pure-menu-selected .pure-menu-link:visited {
-    color: #b0ddce;
+    color: #f5f5f5;
 }
 
 .pure-menu-link:hover, .pure-menu-link:focus,
 .pure-menu-selected .pure-menu-link:hover,
 .pure-menu-selected .pure-menu-link:focus {
-    color: #d1fff0;
+    color: #fff;
     background: transparent;
+
 }
 
 .menu-toggle {
@@ -165,43 +166,6 @@ pre {
     }
 }
 
-/**
- * Header
- */
-#header {
-    width: 100%;
-    height: 150px;
-    background: url(../img/noise.png), #979797 url(../img/logo.png) no-repeat 10px 2.5em;
-}
-
-#header h1 {
-    float: left;
-    margin: 45px 0 0 125px;
-    width: 55%;
-    height: 100px;
-}
-
-#header h1 a, #header h1 a:visited {
-    /* https://css-tricks.com/centering-css-complete-guide/#vertical-inline-multiple */
-    display: -ms-flexbox;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-
-    overflow: hidden;
-    height: 100px;
-    color: #252525;
-    text-decoration: none;
-    z-index: 1;
-
-    font-family: Roboto Slab, Arial, sans-serif;
-    font-size: 1.2em;
-}
-
-#header h1 a:hover {
-    color: #fff;
-}
-
 .header-buttons {
     text-align: right;
 }
@@ -212,23 +176,24 @@ pre {
 }
 
 #search {
-    margin-top: 5px;
+    position: fixed;
+    width: 100%;
 }
 
 #search input[type="text"] {
     width: 250px;
-    color: #b0ddce;
+    color: #252525;
 }
 
 /* because chrome */
 #search input[type="text"]::-webkit-input-placeholder {
-    color: #b0ddce;
+    color: #252525;
 }
 
 #search button {
     background: transparent;
     border: none;
-    color: #b0ddce;
+    color: #f5f5f5;
 }
 
 #search button:hover {
@@ -246,65 +211,37 @@ pre {
         text-align: left;
     }
 }
-
-
-
-#header-login-form {
-    height: 0;
-    transition: 0.3s;
-}
-
-#header-login-form.open {
-    display: block;
-    height: 30px;
-    padding: 5px 0;
+@media screen and (max-width: 64em) {
+    #search {
+        position: relative;
+        height: 60px;
+    }
 }
 
 #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 {
+    visibility: hidden;
+    position: fixed;
+    width: 100%;
     text-align: center;
     background: #1b926c;
     display: block;
-    //transition: 0.3s;
+    z-index: 9999;
+    height: 30px;
+    padding: 5px 0;
 }
 
 @media screen and (min-width: 64em) {
-
-    .subheader-form.closed {
-        height: 0;
-    }
-
-    .subheader-form.open {
-        height: 30px;
-        padding: 5px 0;
-    }
-
-    .subheader-form * {
-        --transition: visibility 1s, opacity 1s;
-    }
-
-    .subheader-form.open * {
+    .subheader-form.open, .subheader-form.open * {
         visibility: visible;
-        opacity: 1;
     }
-
-    .subheader-form.closed * {
-        visibility: hidden;
-        opacity: 0;
+}
+@media screen and (max-width: 64em) {
+    #search.subheader-form, .subheader-form.open * {
+        visibility: visible;
     }
 }
 
@@ -313,18 +250,18 @@ pre {
     padding: 5px 5px 3px 15px;
     height: 20px;
     width: 20%;
-    background: #1fa67a;
+    background: #f5f5f5;
     border: medium none currentColor;
-    border-radius: 25px;
+    border-radius: 5px;
     box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset;
-    color: #b0ddce;
+    color: #252525;
 }
 
 /* because chrome */
 .subheader-form input[type="text"]::-webkit-input-placeholder,
 .subheader-form input[type="password"]::-webkit-input-placeholder
 {
-    color: #b0ddce;
+    color: #252525;
 }
 
 .subheader-form .remember-me {
@@ -345,9 +282,8 @@ pre {
     width: 100px;
     background: #0C7653;
     border: medium none currentColor;
-    border-radius: 25px;
     box-shadow: 1px 1px 2px #005C3E, -1px -1px 2px #005C3E;
-    color: #b0ddce;
+    color: #f5f5f5;
 }
 
 .new-version-message {
@@ -365,7 +301,6 @@ pre {
 #content {
     position: relative;
     z-index: 2;
-    background: url(../img/noise.png) #979797;
 }
 
 @media screen and (max-width: 64em) {
@@ -397,7 +332,7 @@ pre {
 
 .linklist-filters .filter-off {
     color: #252525;
-    background: #c8c8c8;
+    background: #f5f5f5;
 }
 
 .linklist-filters .filter-on {
@@ -431,8 +366,7 @@ pre {
     padding: 2px 5px;
     text-decoration: none;
     color: #252525;
-    background: #c8c8c8;
-    border: solid 1px #979797;
+    background: #f5f5f5;
 }
 
 .linksperpage form {
@@ -442,13 +376,11 @@ pre {
 
 .linksperpage input[type="text"] {
     width: 28px;
-    height: 16px;
+    height: 12px;
     margin: 0;
     padding: 3px 5px 3px 8px;
-    background: #c8c8c8;
+    background: #f5f5f5;
     border: medium none currentColor;
-    --border-radius: 25px;
-    box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset;
     color: #252525;
     font-size: 0.8em;
 }
@@ -457,7 +389,7 @@ pre {
  * CONTENT - LINKLIST ITEMS
  */
 .linklist-item {
-    margin: 15px 0;
+    margin: 0 0 15px 0;
     background: #f5f5f5;
     box-shadow: 2px 2px 0.5em #797979;
 }
@@ -468,9 +400,7 @@ pre {
 }
 
 .linklist-item-title {
-    background: #20b988 url(../img/noise.png);
-    border-bottom: 1px solid #1b926c;
-    box-shadow: 1px 1px 0.2em #1b926c;
+    background: #f5f5f5;
 }
 
 .linklist-item-title h2 {
@@ -480,31 +410,45 @@ pre {
 
 .linklist-item-title a {
     font-size: 0.7em;
-    color: #d0fff0;
+    color: #252525;
     text-decoration: none;
     vertical-align: middle;
     font-family: Roboto Slab, Arial, sans-serif;
 }
 
+.linklist-item-title .linklist-link {
+    color: #1b926c;
+}
+
 .linklist-item-title .linklist-link:visited {
-    color: #ddd;
+    color: #1b926c;
 }
 
 .linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{
-    color: #fff;
+    color: #252525;
 }
 
 
 .linklist-item-title .label-private {
-    border: solid 1px #d0fff0;
+    border: solid 1px #F89406;
     font-family: Arial, sans-serif;
     font-size: 0.65em;
+    color: #F89406;
 }
 
 .linklist-item-title .fold-button {
     display: none;
 }
 
+.linklist-item-title:after {
+    display: block;
+    content:"";
+    background: linear-gradient(to right, #f5f5f5, #8e8e8e, #f5f5f5);
+    height: 1px;
+    width: 90%;
+    margin: 1px auto 0 auto;
+}
+
 .linklist-item-editbuttons {
     float: right;
     padding: 5px;
@@ -514,10 +458,22 @@ pre {
     font-size: 1em;
 }
 
+.edit-link {
+    font-size: 1.2em;
+    color: #0b5ea6;
+}
+
+.delete-link {
+    font-size: 1.1em;
+    color: #ac2925 !important;
+}
+
 .linklist-item-description {
     padding: 10px;
+    background: #f5f5f5;
     font-family: Roboto Slab, Arial, sans-serif;
     word-wrap: break-word;
+    color: #252525;
 }
 
 .linklist-item-description a {
@@ -526,11 +482,11 @@ pre {
 }
 
 .linklist-item-description a:hover {
-    text-shadow: 1px 1px #ddd;
+    color: #252525;
 }
 
 .linklist-item-description a:visited {
-    color: #20b988;
+    color: #14553f;
 }
 
 .linklist-item-thumbnail {
@@ -541,9 +497,7 @@ pre {
 
 .linklist-item-infos {
     padding: 5px 5px 0 5px;
-    background: #ddd url(../img/noise.png);
-    border-top: 1px solid #989898;
-    box-shadow: 1px -1px 0.2em #989898;
+    background: #ddd;
     color: #252525;
 }
 
@@ -561,7 +515,7 @@ pre {
     font-size: 0.8em;
 }
 
-.linklist-item-infos .linklist-item-infos .label-tag {
+.linklist-item-infos .label-tag {
     border: 1px solid #505050;
     font-size: 0.9em;
 }
@@ -622,21 +576,28 @@ pre {
  */
 .page-form {
     margin: 20px 0 0 0;
-    background: url(../img/noise.png) #1fa67a;
-    border-radius: 5px;
+    padding: 0 10px 0 10px;
+    background: #f5f5f5;
     box-shadow: 1px 1px 2px #797979;
-    color: #b0ddce;
+    color: #252525;
 }
 
 .page-form .window-title {
     margin: 0 0 10px 0;
     padding: 10px 0;
     width: 100%;
-    color: #b0ddce;
-    background: #1b926c;
+    color: #1b926c;
+    background: #f5f5f5;
     text-align: center;
-    border-radius: 5px 5px 0 0;
-    border-bottom: 1px solid #797979;
+}
+
+.page-form .window-title:after {
+    display: block;
+    content:"";
+    background: linear-gradient(to right, #f5f5f5, #1b926c, #f5f5f5);
+    height: 1px;
+    width: 80%;
+    margin: auto;
 }
 
 .page-form .window-subtitle {
@@ -644,7 +605,7 @@ pre {
 }
 
 .page-form a {
-    color: #b0ddce;
+    color: #1b926c;
     font-weight: bold;
 }
 
@@ -655,11 +616,11 @@ pre {
     padding: 5px 5px 3px 15px;
     height: 30px;
     width: 80%;
-    background: #1b926c;
+    background: #f5f5f5;
     border: medium none currentColor;
-    border-radius: 25px;
+    border-radius: 5px;
     box-shadow: 0 1px 0 rgba(255, 255, 255, 0.078), 0 1px 4px rgba(0, 0, 0, 0.298) inset;
-    color: #b0ddce;
+    color: #252525;
 }
 
 .page-form textarea {
@@ -673,7 +634,7 @@ pre {
 /* because chrome */
 .page-form input[type="text"]::-webkit-input-placeholder,
 .page-form input[type="password"]::-webkit-input-placeholder {
-    color: #b0ddce;
+    color: #252525;
 }
 
 .page-form input[type="submit"] {
@@ -681,16 +642,14 @@ pre {
     height: 35px;
     width: 150px;
     background: #1b926c;
-    border: medium none currentColor;
-    border-radius: 25px;
-    box-shadow: 1px 1px 4px #0C7653, -1px -1px 6px #0C7653, -1px 1px 6px #0C7653, 1px -1px 6px #0C7653;
+    border: none;
+    box-shadow: 1px 1px 1px #ddd, -1px -1px 6px #ddd, -1px 1px 2px #ddd, 1px -1px 2px #ddd;
     font-size: 1.2em;
-    font-weight: bold;
-    color: #b0ddce;
+    color: #f5f5f5;
 }
 
 .page-form select {
-    color: black;
+    color: #252525;
 }
 
 /**
@@ -704,11 +663,11 @@ pre {
  * PAGE FORM - COMPLETE
  */
 .page-form-complete {
-    #background: #ddd;
+    #background: #f5f5f5;
 }
 
 .page-form-complete div, .page-form-complete p {
-    color: #b0ddce;
+    color: #252525;
 }
 
 .page-form-complete .form-label, .page-form-complete .form-input {
@@ -827,8 +786,7 @@ pre {
  * Page visitor (page form extended)
  */
 .page-visitor {
-    background: url(../img/noise.png) #fff;
-    color: #000;
+    color: #252525;
 }
 
 #page404 {
@@ -840,128 +798,6 @@ pre {
  */
 #login-form .remember-me {
     margin: 5px 0;
-    color: #b0ddce;
-    font-weight: bold;
-}
-
-/**
- * CONTENT - LINKLIST ITEMS
- */
-.linklist-item {
-    margin: 15px 0;
-    background: #f5f5f5;
-    box-shadow: 2px 2px 0.5em #797979;
-}
-
-.linklist-item-title, .linklist-item-title h2  {
-    margin: 0;
-}
-
-.linklist-item-title {
-    background: #20b988 url(../img/noise.png);
-    border-bottom: 1px solid #1b926c;
-    box-shadow: 1px 1px 0.2em #1b926c;
-}
-
-.linklist-item-title h2 {
-    padding: 3px 10px 0 10px;
-    line-height: 25px;
-}
-
-.linklist-item-title a {
-    font-size: 0.7em;
-    color: #d0fff0;
-    text-decoration: none;
-    vertical-align: middle;
-    font-family: Roboto Slab, Arial, sans-serif;
-}
-
-.linklist-item-title .linklist-link:visited {
-    color: #ddd;
-}
-
-.linklist-item-title a:hover, .linklist-item-title .linklist-link:hover{
-    color: #fff;
-}
-
-.linklist-item-title .label-private {
-    border: solid 1px #d0fff0;
-    font-family: Arial, sans-serif;
-    font-size: 0.65em;
-}
-
-.linklist-item-title .fold-button {
-    display: none;
-}
-
-.linklist-item-editbuttons {
-    float: right;
-    padding: 5px;
-}
-
-.linklist-item-editbuttons a {
-    font-size: 1em;
-}
-
-.linklist-item-description {
-    padding: 10px;
-    font-family: Roboto Slab, Arial, sans-serif;
-}
-
-.linklist-item-description a {
-    text-decoration: none;
-    color: #1b926c;
-}
-
-.linklist-item-description a:hover {
-    text-shadow: 1px 1px #ddd;
-}
-
-.linklist-item-description a:visited {
-    color: #20b988;
-}
-
-.linklist-item-infos {
-    padding: 5px;
-    background: #ddd url(../img/noise.png);
-    border-top: 1px solid #989898;
-    box-shadow: 1px -1px 0.2em #989898;
-    color: #252525;
-    font-size: 0.8em;
-}
-
-.linklist-item-infos a {
-    color: #505050;
-    text-decoration: none;
-}
-
-.linklist-item-infos a:hover {
-    color: #000;
-}
-
-.linklist-item-tags {
-    margin: 0 0 5px 0;
-}
-
-.label-tag {
-    border: 1px solid #505050;
-    font-size: 1em;
-}
-
-.label-tag:hover {
-    border: 1px solid #000;
-}
-
-.linklist-plugin-icon {
-    width: 13px;
-    height: 13px;
-}
-
-.linklist-item-infos-url {
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
 /**
@@ -989,6 +825,12 @@ pre {
     margin: 10px 0;
 }
 
+.tools-item .pure-button:hover {
+    background-image: none;
+    background-color: #1b926c;
+    color: #f5f5f5;
+}
+
 /**
  * PLUGIN ADMIN
  */
@@ -1128,6 +970,10 @@ pre {
     margin: 10px auto;
 }
 
+.daily-entry {
+    padding: 0 10px;
+}
+
 .daily-entry .daily-entry-title:after {
     display: block;
     content:"";

diff --git a/tpl/default/daily.html b/tpl/default/daily.html
index 9de2bac3a3937734fff19717bc30efe8dd2e6a3b..d4c11f6f38b88a8b1acb75f5cecbf2fbecaa9d46 100644 (file)
--- a/tpl/default/daily.html
+++ b/tpl/default/daily.html
@@ -64,7 +64,7 @@
                 {$link=$value}
                 <div class="daily-entry">
                   <div class="daily-entry-title center">
-                    <a href="?{$link.linkdate|smallHash}" title="{'Permalink'|t}">
+                    <a href="?{$link.shorturl}" title="{'Permalink'|t}">
                       <i class="fa fa-link"></i>
                     </a>
                     <a href="{$link.real_url}">{$link.title}</a>

diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js
index 24d11cdb23465105a23570b6cb53a5fa42f098f0..01e22022edd4ccbad8c679066be888003973ebce 100644 (file)
--- a/tpl/default/js/shaarli.js
+++ b/tpl/default/js/shaarli.js
@@ -138,27 +138,6 @@ if (newVersionDismiss != null) {
     });
 }
 
-/**
- * Login button
- */
-var loginButton = document.getElementById('login-button');
-var loginBlock = document.getElementById('header-login-form');
-
-if (loginButton != null) {
-    loginButton.addEventListener('click', function(event) {
-        event.preventDefault();
-        loginBlock.classList.toggle('open');
-        document.getElementById('content').style.boxShadow = 'none';
-    });
-}
-
-// Focus on login field.
-if (loginBlock != null) {
-    loginBlock.addEventListener('transitionend', function () {
-        loginBlock.firstElementChild.focus();
-    });
-}
-
 var hiddenReturnurl = document.getElementsByName('returnurl');
 if (hiddenReturnurl != null) {
     hiddenReturnurl.value = window.location.href;
@@ -173,15 +152,39 @@ if (autofocusElements != null) {
 }
 
 /**
- * Hide search bar, and display it on search click.
+ * Hide search bar
  */
-var searchBar = document.getElementById('search');
-var searchButton = document.getElementById('search-button');
-if (searchBar != null && searchButton != null) {
-    searchBar.classList.toggle('closed');
-    searchButton.addEventListener('click', function(event) {
-        event.preventDefault();
-        searchBar.classList.toggle('closed');
-        searchBar.classList.toggle('open');
+var search = document.getElementById('search');
+if (search != null) {
+    removeClass(search, 'open');
+}
+
+/**
+ * Handle sub menus/forms
+ */
+var openers = document.getElementsByClassName('subheader-opener');
+if (openers != null) {
+    console.log(openers);
+    [].forEach.call(openers, function(opener) {
+         opener.addEventListener('click', function(event) {
+             event.preventDefault();
+
+             var id = opener.getAttribute('data-open-id');
+             var sub = document.getElementById(id);
+
+             if (sub != null) {
+                [].forEach.call(document.getElementsByClassName('subheader-form'), function (element) {
+                    if (element != sub) {
+                        removeClass(element, 'open')
+                    }
+                 });
+
+                 sub.classList.toggle('open');
+             }
+         });
     });
 }
+
+function removeClass(element, classname) {
+    element.className = element.className.replace(new RegExp('(?:^|\\s)'+ classname + '(?:\\s|$)'), ' ');
+}
\ No newline at end of file

diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 051575dc01eb8dca5edf09ecac5520e522369e7d..f1f67eea2aaca92e52bab2d040dc6d0df758deda 100644 (file)
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -54,36 +54,32 @@
   {/if}
 
   <div class="pure-g">
-    <div class="pure-u-2-24"></div>
-    <div class="pure-u-20-24">
+    <div class="pure-u-lg-2-24 pure-u-1-24"></div>
+    <div class="pure-u-lg-20-24 pure-u-22-24">
       {loop="links"}
         <div class="linklist-item{if="$value.class"} {$value.class}{/if}">
 
           <div class="linklist-item-title">
             {if="isLoggedIn()"}
               <div class="linklist-item-editbuttons">
+                {if="$value.private"}
+                  <span class="label label-private">{'Private'|t}</span>
+                {/if}
                 <!-- FIXME! JS translation -->
+                <a href="?edit_link={$value.id}" title="{'Edit'|t}"><i class="fa fa-pencil-square-o edit-link"></i></a>
                 <a href="#" title="{'Fold'|t}" class="fold-button"><i class="fa fa-chevron-up"></i></a>
-                <a href="?edit_link={$value.id}" title="{'Edit'|t}"><i class="fa fa-pencil-square-o"></i></a>
-                <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" title="{'Delete'|t}" class="delete-link">
-                  <i class="fa fa-trash"></i>
-                </a>
               </div>
             {/if}
 
             <h2>
-              <a href="{$value.real_url}" id="{$value.shorturl}" class="linklist-link">
+              <a href="{$value.real_url}" id="{$value.shorturl}" class="">
                 {if="strpos($value.url, $value.shorturl) === false"}
                   <i class="fa fa-external-link"></i>
                 {else}
                   <i class="fa fa-sticky-note"></i>
                 {/if}
 
-                {if="$value.private"}
-                  <span class="label label-private">{'Private'|t}</span>
-                {/if}
-
-                {$value.title}
+                <span class="linklist-link">{$value.title}</span>
               </a>
             </h2>
           </div>
@@ -139,6 +135,9 @@
                 <a href="{$value.real_url}" title="{$value.title}">
                   <i class="fa fa-link"></i> {$value.url}
                 </a>
+                <a href="?delete_link&amp;lf_linkdate={$value.id}&amp;token={$token}" title="{'Delete'|t}" class="delete-link">
+                  <i class="fa fa-trash"></i>
+                </a>
               </div>
             </div>
           </div>

diff --git a/tpl/default/page.header.html b/tpl/default/page.header.html
index 4a3710ffb04a8ca8bf34e2556e68077ca8b00a2d..fefa92581136711f3286d5033f7a5463b7fa2c3b 100644 (file)
--- a/tpl/default/page.header.html
+++ b/tpl/default/page.header.html
@@ -46,6 +46,9 @@
             </a>
           </li>
         {/loop}
+        <li class="pure-menu-item pure-u-lg-0">
+          <a href="?do=atom{$searchcrits}" class="pure-menu-link">{'RSS Feed'|t}</a>
+        </li>
         {if="isLoggedIn()"}
           <li class="pure-menu-item pure-u-lg-0">
             <a href="?do=logout" class="pure-menu-link">{'Logout'|t}</a>
@@ -55,35 +58,36 @@
             <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-6 pure-u-0 pure-u-lg-visible">
         <ul class="pure-menu-list">
           <li class="pure-menu-item">
-            <a href="#" class="pure-menu-link" id="search-button" title="{'Search'|t}">
+            <a href="#" class="pure-menu-link subheader-opener"
+               data-open-id="search"
+               id="search-button" title="{'Search'|t}">
               <i class="fa fa-search"></i>
             </a>
           </li>
-          {if="!isLoggedIn()"}
-            <li class="pure-menu-item">
-              <a href="?do=login" class="pure-menu-link" id="login-button" title="{'Login'|t}">
-                <i class="fa fa-user"></i>
-              </a>
-            </li>
-          {else}
-            <li class="pure-menu-item">
-              <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}">
-                <i class="fa fa-sign-out"></i>
-              </a>
-            </li>
-          {/if}
           <li class="pure-menu-item">
             <a href="?do=atom{$searchcrits}" class="pure-menu-link" title="{'RSS Feed'|t}">
               <i class="fa fa-rss"></i>
             </a>
           </li>
+          {if="!isLoggedIn()"}
+          <li class="pure-menu-item">
+            <a href="?do=login" class="pure-menu-link subheader-opener"
+               data-open-id="header-login-form"
+               id="login-button" title="{'Login'|t}">
+              <i class="fa fa-user"></i>
+            </a>
+          </li>
+          {else}
+          <li class="pure-menu-item">
+            <a href="?do=logout" class="pure-menu-link" title="{'Logout'|t}">
+              <i class="fa fa-sign-out"></i>
+            </a>
+          </li>
+          {/if}
         </ul>
       </div>
     </div>
@@ -91,7 +95,7 @@
 </div>
 
 <div id="content">
-  <div id="search" class="subheader-form">
+  <div id="search" class="subheader-form open">
     <div class="pure-g">
       <div class="pure-u-1 pure-u-lg-1-2">
         <form method="GET" class="searchform" name="searchform">
@@ -138,7 +142,7 @@
         <input type="text" name="login" placeholder="{'Username'|t}" tabindex="3">
         <input type="password" name="password" placeholder="{'Password'|t}" tabindex="5">
         <div class="remember-me">
-          <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6">
+          <input type="checkbox" name="longlastingsession" id="longlastingsession" tabindex="6" checked>
           <label for="longlastingsession">{'Remember me'|t}</label>
         </div>
         <input type="hidden" name="token" value="{$token}">

diff --git a/tpl/default/tools.html b/tpl/default/tools.html
index 3f2cf0f1af2f19548fa75339912b3590a37aa437..a9b8803bfc02dad170e4830de5526e44373b6014 100644 (file)
--- a/tpl/default/tools.html
+++ b/tpl/default/tools.html
@@ -126,6 +126,18 @@
         <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Chrome {'plugin'|t}</span>
       </a>
     </div>
+    <div class="tools-item">
+      <a href="https://play.google.com/store/apps/details?id=com.dimtion.shaarlier&hl=fr"
+         title="Android">
+        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">Android</span>
+      </a>
+    </div>
+    <div class="tools-item">
+      <a href="https://itunes.apple.com/app/ShaarliOS/id1027441388?mt=8"
+         title="iOS">
+        <span class="pure-button pure-u-lg-2-3 pure-u-3-4">iOS</span>
+      </a>
+    </div>
   </div>
 </div>