Merge pull request #792 from ArthurHoaro/feature/private-filter-visual

Display private only filter as search criteria

diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php
index 61a594d3c0e6f75b1bacd21689e6a0d335cbef6f..b3d9752bcb4a9ed276dd58026be69d256c1bdf1e 100644 (file)
--- a/application/config/ConfigPlugin.php
+++ b/application/config/ConfigPlugin.php
@@ -1,5 +1,6 @@
 <?php
-namespace Shaarli\Config;
+
+use Shaarli\Config\Exception\PluginConfigOrderException;
 
 /**
  * Plugin configuration helper functions.
@@ -110,17 +111,3 @@ function load_plugin_parameter_values($plugins, $conf)
 
     return $out;
 }
-
-/**
- * Exception used if an error occur while saving plugin configuration.
- */
-class PluginConfigOrderException extends \Exception
-{
-    /**
-     * Construct exception.
-     */
-    public function __construct()
-    {
-        $this->message = 'An error occurred while trying to save plugins loading order.';
-    }
-}

diff --git a/application/config/exception/PluginConfigOrderException.php b/application/config/exception/PluginConfigOrderException.php
new file mode 100644 (file)
index 0000000..f9d6875
--- /dev/null
+++ b/application/config/exception/PluginConfigOrderException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Shaarli\Config\Exception;
+
+/**
+ * Exception used if an error occur while saving plugin configuration.
+ */
+class PluginConfigOrderException extends \Exception
+{
+    /**
+     * Construct exception.
+     */
+    public function __construct()
+    {
+        $this->message = 'An error occurred while trying to save plugins loading order.';
+    }
+}

diff --git a/composer.json b/composer.json
index 70b87bb95b33cba9e4e8a1de71eb2dd9f9f5ed7b..57851e53e27fbab99fa5044de0d0bf0c389a30a6 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,8 @@
             "Shaarli\\Api\\": "application/api/",
             "Shaarli\\Api\\Controllers\\": "application/api/controllers",
             "Shaarli\\Api\\Exceptions\\": "application/api/exceptions",
-            "Shaarli\\Config\\": "application/config/"
+            "Shaarli\\Config\\": "application/config/",
+            "Shaarli\\Config\\Exception\\": "application/config/exception"
         }
     }
 }

diff --git a/index.php b/index.php
index 77857d27d942affb0d2849b82ecce86573a5b936..3c2bb1d2829dee3a6a9d4e4b9edea6bacc5bd1ae 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,6 +62,7 @@ require_once __DIR__ . '/vendor/autoload.php';
 require_once 'application/ApplicationUtils.php';
 require_once 'application/Cache.php';
 require_once 'application/CachedPage.php';
+require_once 'application/config/ConfigPlugin.php';
 require_once 'application/FeedBuilder.php';
 require_once 'application/FileUtils.php';
 require_once 'application/HttpUtils.php';
@@ -1681,6 +1682,7 @@ function buildLinkList($PAGE,$LINKSDB, $conf, $pluginManager)
         'result_count' => count($linksToDisplay),
         'search_term' => $searchterm,
         'search_tags' => $searchtags,
+        'visibility' => ! empty($_SESSION['privateonly']) ? 'private' : '',
         'redirector' => $conf->get('redirector.url'),  // Optional redirector URL.
         'links' => $linkDisp,
         'tags' => $LINKSDB->allTags(),

diff --git a/tests/config/ConfigPluginTest.php b/tests/config/ConfigPluginTest.php
index 22ab927b084e8d9b26d1a0fe64c48178fcd39fa7..deb02c9e487f901519b07b66f545599aaed75692 100644 (file)
--- a/tests/config/ConfigPluginTest.php
+++ b/tests/config/ConfigPluginTest.php
@@ -1,9 +1,7 @@
 <?php
 namespace Shaarli\Config;
 
-/**
- * Config' tests
- */
+use Shaarli\Config\Exception\PluginConfigOrderException;
 
 require_once 'application/config/ConfigPlugin.php';
 
@@ -41,7 +39,7 @@ class ConfigPluginTest extends \PHPUnit_Framework_TestCase
     /**
      * Test save_plugin_config with invalid data.
      *
-     * @expectedException Shaarli\Config\PluginConfigOrderException
+     * @expectedException Shaarli\Config\Exception\PluginConfigOrderException
      */
     public function testSavePluginConfigInvalid()
     {

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index b937c596c20ba25173a7994f96cb319919e379b8..d33e906683a956a57e9b97a2b59b8104eb551770 100644 (file)
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -985,6 +985,10 @@ div.awesomplete > ul {
     margin: 0 0 0 5px;
 }
 
+.search-result .label-private {
+    border: 1px solid white;
+}
+
 /**
  * TOOLS
  */

diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html
index 9bc3ba1a3c51e28d55d6ec74f8447f3fa40e8a70..94370203bf2b2b8cf0fe014129569db4907b2008 100644 (file)
--- a/tpl/default/linklist.html
+++ b/tpl/default/linklist.html
@@ -89,7 +89,7 @@
         <div id="searchcriteria">{'Nothing found.'|t}</div>
       </div>
     </div>
-  {elseif="!empty($search_term) or !empty($search_tags)"}
+  {elseif="!empty($search_term) or !empty($search_tags) or !empty($visibility)"}
     <div class="pure-g pure-alert pure-alert-success search-result">
       <div class="pure-u-2-24"></div>
       <div class="pure-u-20-24">
@@ -106,6 +106,12 @@
               </span>
           {/loop}
         {/if}
+        {if="!empty($visibility)"}
+          {'with status'|t}
+          <span class="label label-private">
+            {$visibility|t}
+          </span>
+        {/if}
       </div>
     </div>
   {/if}