Merge branch 'private_link' into myShaarli

index.php

@@ -54,7 +54,7 @@
     require $GLOBALS['config']['DATADIR'].'/options.php';
 }
 
-define('myShaarli_version', '1.1.3');
+define('myShaarli_version', '1.1.4');
 define('PHPPREFIX', '<?php /* '); // Prefix to encapsulate data in php code.
 define('PHPSUFFIX', ' */ ?>'); // Suffix to encapsulate data in php code.
 // http://server.com/x/shaarli --> /shaarli/

shaarli_version.txt

@@ -1 +1 @@
-1.1.3
+1.1.4

tpl/myShaarli/myShaarli.css

@@ -518,12 +518,15 @@ a, .linkdescription a {
 }
 
 #linklist li, #linklist li.private {
-  background: #fff;
+  background-color: #fff;
+  background-image: url('../../images/private_16x16.png');
+  background-repeat: no-repeat;
+  background-position: 10px center;
   border: 1px solid #cdcdcd;
   border-radius: .3em;
   clear: both;
   margin: 1em 0;
-  padding: .3em;
+  padding: .3em .3em .3em 32px;
 }
 
 #linklist li.publicLinkHightLight {

tpl/myShaarli_Columns/columns.css

@@ -528,7 +528,10 @@ a, .linkdescription a {
 
 #linklist li, #linklist li.private {
   box-sizing: border-box;
-  background: #fff;
+  background-color: #fff;
+  background-image: url('../../images/private_16x16.png');
+  background-repeat: no-repeat;
+  background-position: 10px 10px;
   border: 1px solid #cdcdcd;
   border-radius: .3em;
   flex: 0 0 auto;