From cc7cfb8ab19a596f6ec159caa7188c645e0bf174 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:51:56 +0200
Subject: [PATCH 001/161] Update files, add config_form

---
 FacetsPlugin.php | 318 ++++++++++++++++++++++++++++-------------------
 config_form.php  | 153 +++++++++++++++++++++++
 plugin.ini       |   6 +-
 3 files changed, 349 insertions(+), 128 deletions(-)
 create mode 100644 config_form.php

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 9deef16..30161fe 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -1,125 +1,193 @@
-<?php
-/**
- * @copyright Jean-Baptiste HEREN, 2018
- * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * @package FacetsPlugin
- */
-
-if (!defined('FACETS_PLUGIN_DIR')) {
-    define('FACETS_PLUGIN_DIR', dirname(__FILE__));
-}
-
-require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
-
-class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
-{
-
-    protected $_hooks = array(
-        'install',
-        'uninstall',
-        'initialize',
-        'define_routes',
-        'public_head',
-        'items_browse_sql',
-        'public_items_browse'
-    );
-
-    /**
-     * Installs the plugin.
-     */
-    public function hookInstall()
-    {
-    }
-
-    /**
-     * Uninstalls the plugin.
-     */
-    public function hookUninstall()
-    {
-    }
-
-    /**
-     * Initialize this plugin.
-     */
-    public function hookInitialize()
-    {
-      get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
-    }
-
-    public function hookPublicHead($args)
-    {
-      queue_css_file('facets');
-    }
-
-    public function hookDefineRoutes($args)
-    {
-        if (is_admin_theme()) {
-            return;
-        }
-
-        //Itemtypes browse
-        $router = $args['router'];
-        $router->addRoute(
-        		'facets',
-        		new Zend_Controller_Router_Route(
-        				"facets",
-        				array(
-        						'module'    => 'facets',
-        						'controller' => 'facets',
-        						'action'     => 'browse'
-        				)
-        		)
-        );
-
-    }
-
-    /**
-     * Deal with search terms (advanced search).
-     *
-     * Allows to get refinements when a base Dublin Core is used.
-     *
-     * @internal This hook is used twice, first to prepare select for the
-     * current page, second to get the total count.
-     *
-     * @internal This should be used, because the filter is not enough for
-     * requests with a refinable element that should contains something.
-     *
-     * @internal MySql 5.5 has a limit: group by is done before order by, and it
-     * is complex to skirt.
-     *
-     * @see DublinCoreExtendedPlugin::filterItemsBrowseParams()
-     *
-     * @param Omeka_Db_Select $select
-     * @param array $params
-     */
-    public function hookItemsBrowseSql($args)
-    {
-        $db = $this->_db;
-        $select = $args['select'];
-        $params = $args['params'];
-
-    }
-
-    public function hookPublicItemsBrowse($args)
-    {
-      $view = $args['view'];
-      $items = $args['items'];
-
-      // $params = $args['params'];
-      $itemsArray = array();
-      $allItems = get_db()->getTable('Item')->findAll();
-      // $allItems = $this->_helper->db->findBy($params);
-      foreach($allItems as $item){
-        $itemsArray[] = $item->id;
-      }
-
-      // echo get_view()->partial('facets/browse.php',array(
-      //     'itemsArray' => $itemsArray,
-      //     'items' => $items
-      //   ));
-
-      echo get_view()->partial('facets/browse.php',array(
-          'itemsArray' => $itemsArray
-        ));
-    }
-}
+<?php
+/**
+ * @copyright Jean-Baptiste HEREN, 2018
+ * @copyright Daniele BINAGHI, 2021
+ * @license http://www.gnu.org/licenses/gpl-3.0.txt
+ * @package FacetsPlugin
+ */
+
+if (!defined('FACETS_PLUGIN_DIR')) {
+	define('FACETS_PLUGIN_DIR', dirname(__FILE__));
+}
+define('FACETS_MINIMUM_AMOUNT', 10);
+
+require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
+
+class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
+{
+	protected $_hooks = array(
+		'install',
+		'uninstall',
+		'initialize',
+        'config_form',
+        'config',
+		'define_routes',
+		'public_head',
+		'public_items_browse',
+		'public_items_facets'
+	);
+
+	/**
+	 * Installs the plugin.
+	 */
+	public function hookInstall()
+	{
+		set_option('facets_public_hook', 'public_items_browse');
+        set_option('facets_description', '');
+        set_option('facets_hide_single_entries', 0);
+        set_option('facets_sort_order', 'count_alpha');
+
+		$defaults = array(
+            'item_elements' => array()
+        );
+        set_option('facets_elements', json_encode($defaults));
+        set_option('facets_item_types', 1);
+        set_option('facets_collections', 1);
+        set_option('facets_tags', 0);
+	}
+
+	/**
+	 * Uninstalls the plugin.
+	 */
+	public function hookUninstall()
+	{
+		delete_option('facets_public_hook');
+        delete_option('facets_description');
+        delete_option('facets_hide_single_entries');
+        delete_option('facets_sort_order');
+        delete_option('facets_elements');
+        delete_option('facets_item_types');
+        delete_option('facets_collections');
+        delete_option('facets_tags');
+	}
+
+	/**
+	 * Initialize this plugin.
+	 */
+	public function hookInitialize()
+	{
+		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
+
+        $settings = json_decode(get_option('facets_elements'), true);
+        $this->_settings = $settings;
+	}
+
+    /**
+     * Shows plugin configuration page.
+     */
+    public function hookConfigForm($args)
+    {
+        $settings = $this->_settings;
+
+        $table = get_db()->getTable('Element');
+        $select = $table->getSelect()
+			->where('element_sets.name = \'Dublin Core\'')
+            ->order('elements.element_set_id')
+            ->order('ISNULL(elements.order)')
+            ->order('elements.order');
+        $elements = $table->fetchObjects($select);
+
+        include('config_form.php');
+    }
+
+    /**
+     * Handle the config form.
+     */
+    public function hookConfig($args)
+    {
+        $post = $args['post'];
+		
+        set_option('facets_public_hook', $post['facets_public_hook']);
+        set_option('facets_description', $post['facets_description']);
+        set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
+        set_option('facets_sort_order', $post['facets_sort_order']);
+
+		$settings = array(
+            'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array()
+        );
+        set_option('facets_elements', json_encode($settings));
+
+        set_option('facets_item_types', $post['facets_item_types']);
+        set_option('facets_collections', $post['facets_collections']);
+        set_option('facets_tags', $post['facets_tags']);
+   }
+
+	public function hookPublicHead($args)
+	{
+		queue_css_file('facets');
+	}
+
+	public function hookDefineRoutes($args)
+	{
+		if (is_admin_theme()) {
+			return;
+		}
+
+		//Itemtypes browse
+		$router = $args['router'];
+		$router->addRoute(
+			'facets',
+			new Zend_Controller_Router_Route (
+				"facets",
+				array(
+					'module'	 => 'facets',
+					'controller' => 'facets',
+					'action'	 => 'browse'
+				)
+			)
+		);
+	}
+
+	public function hookPublicItemsBrowse($args)
+	{
+		if (get_option('facets_public_hook') == 'public_items_browse') {
+			self::showFacets($args);
+		}
+	}
+	
+	public function hookPublicItemsFacets($args)
+	{
+		if (get_option('facets_public_hook') == 'public_items_facets') {
+			self::showFacets($args);
+		}
+	}
+
+	public function showFacets($args)
+	{
+		$request = Zend_Controller_Front::getInstance()->getRequest();
+		$controller = $request->getControllerName();
+		$action = $request->getActionName();
+		
+		// checks whether it's one of the facet cases
+		if (!($controller == 'search' && $action == 'index') && !($controller == 'items' && $action == 'browse')) return;
+		
+		$itemsArray = array();
+		$params = array('advanced' => $_GET['advanced'], 'collection' => $_GET['collection'], 'type' => $_GET['type'], 'tags' => $_GET['tags']);
+		$items = get_records('item', $params, null);
+
+		if (count($items) > 0) {
+			if ($controller == 'items') {
+				foreach ($items as $item) {
+					$itemsArray[] = $item->id;
+				}
+				echo get_view()->partial('facets/browse.php', array(
+					'itemsArray' => $itemsArray
+				));
+			} elseif ($controller == 'search') {
+				// this would be for the site-wide simple search;
+				// main problem is that, differently from advanced search,
+				// it uses its own "search_texts" table, so results from that
+				// would have to be crossjoined with the "advanced" ones used
+				// by the facets;
+				// besides, advanced search works only for Items, so one might
+				// want to check whether the site-wide search has been performed
+				// just on Items.
+				if ($recordTypes = $_GET['record_types']) {
+					if (count($recordTypes) == 1 && in_array('Item', $recordTypes)) {
+						// site-wide search was performend just on Items
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/config_form.php b/config_form.php
new file mode 100644
index 0000000..3e96e19
--- /dev/null
+++ b/config_form.php
@@ -0,0 +1,153 @@
+<?php 
+	$view = get_view();
+?>
+<style type = "text/css">
+	.boxes {
+		text-align: center;
+		vertical-align: middle;
+	}
+</style>
+
+<h2><?php echo __('Use'); ?></h2>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_public_hook', __('Public hook')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The hook you want to use: Omeka\'s default <code>public_items_browse</code>, already coded into every page (so no change is needed), normally showing up at the end of the page; or the plugin\'s own <code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right.'); ?>
+		</p>
+		<?php echo $view->formRadio('facets_public_hook',
+			get_option('facets_public_hook'),
+			null,
+			array(
+				'public_items_browse' => __('public_items_browse'),
+				'public_items_facets' => __('public_items_facets'),
+			)); 
+		?>
+    </div>
+</div>
+
+<h2><?php echo __('Aspect'); ?></h2>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_description', __('Description')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('Text to be used as additional description (tip: keep it short).'); ?>
+		</p>
+		<?php echo $view->formText('facets_description', get_option('facets_description')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_hide_single_entries', __('Hide single entries')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, values with just one entry will not be listed (unless there\'s less than %s entries in the list).', FACETS_MINIMUM_AMOUNT); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_hide_single_entries', get_option('facets_hide_single_entries'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_sort_order', __('Sort order')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The sorting order for values in select fields.'); ?>
+		</p>
+		<?php echo $view->formRadio('facets_sort_order',
+			get_option('facets_sort_order'),
+			null,
+			array(
+				'alpha' => __('Alphabetical'),
+				'count_alpha' => __('Count first, then alphabetical'),
+			)); 
+		?>
+    </div>
+</div>
+
+<h2><?php echo __('Elements'); ?></h2>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_elements-table', __('Dublin Core')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The Dublin Core elements that can be used for search refinement.'); ?>
+		</p>
+		<table id="facets_elements-table">
+			<thead>
+				<tr>
+					<th class="boxes"><?php echo __('Element'); ?></th>
+					<th class="boxes"><?php echo __('Active'); ?></th>
+				</tr>
+			</thead>
+			<tbody>
+			<?php
+				foreach ($elements as $element):
+			?>
+				<tr>
+					<td><?php echo __($element->name); ?></td>
+					<td class="boxes">
+						<?php echo $view->formCheckbox(
+							"item_elements[{$element->set_name}][{$element->name}]",
+							'1', 
+							array(
+								'disableHidden' => true,
+								'checked' => isset($settings['item_elements'][$element->set_name][$element->name])
+							)
+						); ?>
+					</td>
+				</tr>
+			<?php 
+				endforeach;
+			?>
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_item_types', __('Item Types')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, search refinement by Item Type will be available.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_item_types', get_option('facets_item_types'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_collections', __('Collections')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, search refinement by Collection will be available.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_collections', get_option('facets_collections'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_tags', __('Tags')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, search refinement by Tags will be available.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_tags', get_option('facets_tags'), null, array('1', '0')); ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/plugin.ini b/plugin.ini
index 8a6412b..56f30a7 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -1,10 +1,10 @@
 [info]
 name = "Facets"
-author = "Jean-Baptiste HEREN"
-description="Filter search using facets"
+author = "Jean-Baptiste HEREN, Daniele BINAGHI"
+description="Filter browse/advanced search using facets"
 license="GPLv3"
 link=""
 support_link=""
-version="1.0"
+version="2.0"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From ca3159525ca2f8b86b4b1439aaef2b3b9e5918e1 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:52:37 +0200
Subject: [PATCH 002/161] Update file

---
 helpers/FacetsFunctions.php | 721 ++++++++++++++++++++----------------
 1 file changed, 411 insertions(+), 310 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index dddc256..c4c8228 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -1,310 +1,411 @@
-<?php
-/**
- * Helper to display a Facets Block
- */
-// class Facets_View_Helper_Facets extends Zend_View_Helper_Abstract
-// {
-
-    /**
-     * Return Tags associated with Array of Items Ids.
-     *
-     * @param itemsArray
-     * @return array Tags.
-     */
-    function get_tags_for_items_array($itemsArray = array()) {
-
-        // Get the database.
-        $db = get_db();
-        // Get the Tag table.
-        $table = $db->getTable('Tag');
-        // Build the select query.
-        $select = $table->getSelectForFindBy();
-        /**
-         * If there is a Collection, we'll join to the Item table where the
-         * collection_id is equal to the ID of our Collection.
-         */
-        if (count($itemsArray) > 0) {
-            $table->filterByTagType($select, 'Item');
-            $select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-        }
-        // Fetch some tags with our select.
-        $tags = $table->fetchObjects($select);
-        return $tags;
-    }
-
-    /**
-     * Return Item Types associated with Array of Items Ids.
-     *
-     * @param itemsArray
-     * @return array ItemType.
-     */
-    function get_item_types_for_items_array($itemsArray = array()) {
-
-        // Get the database.
-        $db = get_db();
-        // Get the Tag table.
-        $table = $db->getTable('ItemType');
-        // Build the select query.
-        $select = $table->getSelect();
-        /**
-         * If there is a Collection, we'll join to the Item table where the
-         * collection_id is equal to the ID of our Collection.
-         */
-        if (count($itemsArray) > 0) {
-          $select->joinInner(array('items' => $db->Items),
-                      'item_types.id = items.item_type_id', array());
-          $select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-        }
-        // Fetch some tags with our select.
-        $item_types = $table->fetchObjects($select);
-        return $item_types;
-    }
-
-    /**
-     * Return Item Types associated with Array of Items Ids.
-     *
-     * @return array ItemType.
-     */
-    function get_item_types() {
-
-        // Get the database.
-        $db = get_db();
-        // Get the Tag table.
-        $table = $db->getTable('ItemType');
-        // Build the select query.
-        $select = $table->getSelect();
-
-        // Fetch some tags with our select.
-        $item_types = $table->fetchObjects($select);
-        return $item_types;
-    }
-
-    /**
-     * Return Collections associated with Array of Items Ids.
-     *
-     * @param itemsArray
-     * @return array Collections.
-     */
-    function get_collections_for_items_array($itemsArray = array()) {
-
-        // Get the database.
-        $db = get_db();
-        // Get the Tag table.
-        $table = $db->getTable('Collection');
-        // Build the select query.
-        $select = $table->getSelect();
-        /**
-         * If there is a Collection, we'll join to the Item table where the
-         * collection_id is equal to the ID of our Collection.
-         */
-        if (count($itemsArray) > 0) {
-            $select->joinInner(array('items' => $db->Items),
-                        'collections.id = items.collection_id', array());
-            // $table->filterByTagType($select, 'Item');
-            $select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-        }
-        // Fetch some tags with our select.
-        $collections = $table->fetchObjects($select);
-        return $collections;
-    }
-
-    /**
-     * Return Tags associated with Array of Items Ids.
-     *
-     * @param itemsArray
-     * @return array Tags.
-     */
-    function get_dc_for_items_array($itemsArray = array(), $dcElementName = null) {
-
-        // Get the database.
-        $db = get_db();
-        // Get the Tag table.
-        $table = $db->getTable('ElementText');
-        // Build the select query.
-        $select = $table->getSelect();
-        $select->joinInner(array('elements' => $db->Elements),
-                    'element_texts.element_id = elements.id', array());
-        $select->joinInner(array('element_sets' => $db->ElementSet),
-                    'element_sets.id = elements.element_set_id', array());
-        $select->joinInner(array('items' => $db->Item),
-                    'items.id = element_texts.record_id', array());
-        $select->where('element_sets.name = '. $db->quote('Dublin Core'));
-        $select->where('elements.name = '. $db->quote($dcElementName));
-        $select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-
-        //debug($select->query();
-
-        /**
-         * If there is a Collection, we'll join to the Item table where the
-         * collection_id is equal to the ID of our Collection.
-         */
-        // Fetch some tags with our select.
-        if(!empty($itemsArray)){
-          $elements = $table->fetchObjects($select);
-        }
-        return $elements;
-    }
-
-    /**
-     * Return HTML Select associated with Array of facets values.
-     *
-     * @param itemsArray
-     * @return array Tags.
-     */
-    function get_dc_facet_select($itemsArray = array(), $dcElementName = null) {
-
-      if(is_null($dcElementName)) {
-        $dcElementName = "Title";
-      }
-      if(empty($itemsArray)){
-        return "";
-      }
-      // Get the database.
-      $db = get_db();
-      // Get the Tag table.
-      $table = $db->getTable('ElementText');
-      // Build the select query.
-      $select = $table->getSelect();
-      $select->joinInner(array('elements' => $db->Elements),
-                  'element_texts.element_id = elements.id', array());
-      $select->joinInner(array('element_sets' => $db->ElementSet),
-                  'element_sets.id = elements.element_set_id', array());
-      $select->joinInner(array('items' => $db->Item),
-                  'items.id = element_texts.record_id', array());
-      $select->where('element_sets.name = '. $db->quote('Dublin Core'));
-      $select->where('elements.name = '. $db->quote($dcElementName));
-      $select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-
-      // Fetch values
-      if(!empty($itemsArray)){
-        $elements = $table->fetchObjects($select);
-        // print_r($elements);
-      }
-      // build table
-      if(!empty($elements)){
-        $facet = array();
-        foreach ($elements as $element) {
-          $facet[] = $element->text;
-        }
-        $element_id = $element->element_id;
-        // make it unique
-        // $facet = array_unique($facet);
-        $facet = array_count_values($facet);
-        arsort($facet);
-        // print_r($facet);
-
-        // get current parameters to check if one is selected
-        // Get the current facets.
-        if (!empty($_GET['advanced'])) {
-            $search = $_GET['advanced'];
-            foreach($search as $Searchindex => $SearchArray){
-              if(isset($SearchArray['element_id']) && $SearchArray['element_id'] == $element_id){
-                $term = $SearchArray['terms'];
-                break;
-              }
-            }
-        }
-
-        if(isset($term)){
-          $html =  "<div class=\"select-cross\"><select id=\"".$element_id."\" class=\"facet-selected\" name=\"".$dcElementName."\">";
-          $url = getElementFieldUrl($element_id);
-          $html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove')) . "...</option>";
-          $html .= "<option selected value=\"\">$term</option>";
-        } else {
-          $html =  "<div class=\"select-arrow\"><select id=\"".$element_id."\" class=\"facet\" name=\"".$dcElementName."\">";
-          $html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
-        }
-
-        foreach($facet as $name => $count){
-          $url = getElementFieldUrl($element_id, $name);
-          $html .= "<option value=\"".$name."\" data-url=\"" . $url . "\">".$name." (".$count.")</option>";
-        }
-        // foreach($facet as $name){
-        //   $html .= "<option value=\"".$name."\">".$name."</option>";
-        // }
-        $html .= "</select></div>";
-      } else {
-        $html = false;
-      }
-
-      return $html;
-    }
-
-    /**
-     * Add an Element Field to Search to the current URL.
-     *
-     * @param string $field The Element id.
-     * @param string $value The Element value.
-     * @return string The new URL.
-     */
-    function getElementFieldUrl($field_id, $value = null)
-    {
-        // Get the current facets.
-        if (!empty($_GET['advanced'])) {
-            $search = $_GET['advanced'];
-            // unset current element filter if already set
-            foreach($search as $Searchindex => $SearchArray){
-              if(isset($SearchArray['element_id']) && $SearchArray['element_id'] == $field_id){
-                unset($search[$Searchindex]);
-              }
-            }
-        } else {
-            $search = array();
-        }
-        if(!is_null($value)){
-          $search[] = array('element_id'=>$field_id,'type'=>'is exactly','terms'=>$value);
-        }
-        $params['advanced'] = $search;
-        if(isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
-        if(isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
-        if(isset($_GET['type'])) $params['type'] = $_GET['type'];
-        if(isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
-        if(isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
-        if(isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
-        if(isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
-        if(isset($_GET['search'])) $params['search'] = $_GET['search'];
-
-        // Rebuild the route.
-        // return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
-        return 'browse?' . http_build_query($params);
-    }
-
-    /**
-     * Add an Element Field to Search to the current URL.
-     *
-     * @param string $filter The filter field name (tags|tag_id|type|collection).
-     * @param string $value The Element value.
-     * @return string The new URL.
-     */
-    function getFieldUrl($filter, $value = null)
-    {
-        // Get the current facets.
-        if (!empty($_GET['advanced'])) {
-            $search = $_GET['advanced'];
-        } else {
-            $search = array();
-        }
-        // set previous parameters
-        $params['advanced'] = $search;
-        if(isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
-        if(isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
-        if(isset($_GET['type'])) $params['type'] = $_GET['type'];
-        if(isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
-        if(isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
-        if(isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
-        if(isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
-        if(isset($_GET['search'])) $params['search'] = $_GET['search'];
-
-        // set(unset) current
-        if(!is_null($value)){
-          $params[$filter] = $value;
-        } else {
-          unset($params[$filter]);
-        }
-
-        // Rebuild the route.
-        // return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
-        return 'browse?' . http_build_query($params);
-    }
-// }
-?>
+<?php
+	/**
+	 * Helper to display a Facets Block
+	 */
+	// class Facets_View_Helper_Facets extends Zend_View_Helper_Abstract
+	// {
+
+	/**
+	 * Return HTML Select associated with Array of facets tag values.
+	 *
+	 * @param itemsArray
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @return html.
+	 */
+	function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+		// Return, if no Item is available
+		if (empty($itemsArray)) return "";
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('Tag');
+		// Build the select query.
+		$select = $table->getSelectForFindBy();
+		$table->filterByTagType($select, 'Item');
+		$select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
+		$select->order('tags.name');
+
+		if ($tags = $table->fetchObjects($select)) {
+			// Build array
+			$facetTags = array();
+			foreach ($tags as $tag) {
+				$facetTags[$tag->id] = $tag->name;
+			}
+			
+			// Stores data for selected tag, if any
+			$selectedTagName = $_GET['tags'];
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count($facetTags) > FACETS_MINIMUM_AMOUNT) {
+				$facetTags = array_filter($facetTags, "isNotSingleEntry");
+			}			
+
+			$addOptions = false;
+			// get current parameters to check if one is selected
+			if ($selectedTagName != '') {
+				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('tags', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . $selectedTagName . "</option>";
+			} elseif (count($facetTags) > 0) {
+				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"tag\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			if ($addOptions) {
+				foreach ($facetTags as $tag_id => $tag_name) {
+					$html .= "<option value=\"" . $tag_id . "\" data-url=\"" . getFieldUrl('tags', $tag_name) . "\">" . $tag_name . "</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+	
+	/**
+	 * Return HTML Select associated with Array of facets collection values.
+	 *
+	 * @param itemsArray
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @return html.
+	 */
+	function get_collections_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+		// Return, if no Item is available
+		if (empty($itemsArray)) return "";
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('Collection');
+		// Build the select query.
+		$select = $table->getSelect()
+			->columns('COUNT(collections.id) AS count')
+			->joinInner(array('items' => $db->Items),
+				'collections.id = items.collection_id', array())
+			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->group('collections.id');
+
+		if ($collections = $table->fetchObjects($select)) {
+			// Build array
+			$facetCollections = array();
+			foreach ($collections as $collection) {
+				$facetCollections[$collection->id]['id'] = $collection->id;
+				$facetCollections[$collection->id]['name'] = $collection->getDisplayTitle();
+				$facetCollections[$collection->id]['count'] = $collection->count;
+			}
+			
+			// Stores data for selected collection, if any
+			if ($collection_id = $_GET['collection']) {
+				$selectedCollection = $facetCollections[$collection_id];
+			}
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count($facetCollections) > FACETS_MINIMUM_AMOUNT) {
+				$facetCollections = array_filter($facetCollections, "isNotSingleEntry");
+			}			
+
+			// Sort array
+			if ($sortOrder == 'count_alpha') {
+				array_multisort(array_column($facetCollections, 'count'), SORT_DESC, array_column($facetCollections, 'name'), SORT_ASC, $facetCollections);
+			} else {
+				array_multisort(array_column($facetCollections, 'name'), SORT_ASC, $facetCollections);
+			}
+
+			$addOptions = false;
+			// get current parameters to check if one is selected
+			if (isset($selectedCollection)) {
+				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"collection\">";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('collection', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . $selectedCollection['name'] . "</option>";
+			} elseif (count($facetCollections) > 0) {
+				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"collection\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			if ($addOptions) {
+				foreach ($facetCollections as $collection) {
+					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . " (" . $collection['count'] . ")</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Return HTML Select associated with Array of facets item type values.
+	 *
+	 * @param itemsArray
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @return html.
+	 */
+	function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+		// Return, if no Item is available
+		if (empty($itemsArray)) return "";
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('ItemType');
+		// Build the select query.
+		$select = $table->getSelect()
+			->columns('COUNT(item_types.id) AS count')
+			->joinInner(array('items' => $db->Items),
+				'item_types.id = items.item_type_id', array())
+			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->group('item_types.id');
+
+		if ($itemTypes = $table->fetchObjects($select)) {
+			// Build array
+			$facetItemTypes = array();
+			foreach ($itemTypes as $itemType) {
+				$facetItemTypes[$itemType->id]['id'] = $itemType->id;
+				$facetItemTypes[$itemType->id]['name'] = $itemType->name;
+				$facetItemTypes[$itemType->id]['count'] = $itemType->count;
+			}
+			
+			// Stores data for selected item type, if any
+			if ($itemType_id = $_GET['type']) {
+				$selectedItemType = $facetItemTypes[$itemType_id];
+			}
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count($facetItemTypes) > FACETS_MINIMUM_AMOUNT) {
+				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleEntry");
+			}			
+
+			// Sort array
+			if ($sortOrder == 'count_alpha') {
+				array_multisort(array_column($facetItemTypes, 'count'), SORT_DESC, array_column($facetItemTypes, 'name'), SORT_ASC, $facetItemTypes);
+			} else {
+				array_multisort(array_column($facetItemTypes, 'name'), SORT_ASC, $facetItemTypes);
+			}
+
+			$addOptions = false;
+			// get current parameters to check if one is selected
+			if (isset($selectedItemType)) {
+				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"type\">";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . $selectedItemType['name'] . "</option>";
+			} elseif (count($facetItemTypes) > 0) {
+				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"type\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			if ($addOptions) {
+				foreach ($facetItemTypes as $itemType) {
+					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . " (" . $itemType['count'] . ")</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+	
+	/**
+	 * Return HTML Select associated with Array of facets values.
+	 *
+	 * @param itemsArray
+	 * @param dcElementName
+	 * @param isDate
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @return html.
+	 */
+	function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+		if (empty($itemsArray)) return "";
+		
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('ElementText');
+		// Create the orderby rules
+		if ($isDate) {
+			$groupBy = 'year';
+			if ($sortOrder == 'count_alpha') {
+				$orderBy = array('count DESC', 'year DESC');
+			} else {
+				$orderBy = array('year DESC');
+			}
+		} else {
+			$groupBy = 'text';
+			if ($sortOrder == 'count_alpha') {
+				$orderBy = array('count DESC', 'text ASC');
+			} else {
+				$orderBy = array('text ASC');
+			}
+		}
+		// Build the select query.
+		$select = $table->getSelect()
+			->columns(array('SUBSTR(element_texts.text, 1, 4) AS year', 'COUNT(text) AS count'))
+			->joinInner(array('elements' => $db->Elements),
+				'element_texts.element_id = elements.id', array())
+			->joinInner(array('element_sets' => $db->ElementSet),
+				'element_sets.id = elements.element_set_id', array())
+			->joinInner(array('items' => $db->Item),
+				'items.id = element_texts.record_id', array())
+			->where('element_sets.name = '. $db->quote('Dublin Core'))
+			->where('elements.name = '. $db->quote($dcElementName))
+			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->group($groupBy)
+			->order($orderBy);
+		
+		// Build table
+		if ($elements = $table->fetchObjects($select)) {
+			$facet = array();
+			foreach ($elements as $element) {
+				if ($isDate) {
+					$facet[$element->year] = $facet[$element->year] + $element->count;
+				} else {
+					$facet[$element->text] = $element->count;
+				}
+			}
+			$element_id = $element->element_id;
+
+			// remove single entries if required
+			if ($hideSingleEntries && count($facet) > FACETS_MINIMUM_AMOUNT) {
+				$facet = array_filter($facet, "isNotSingleEntry");
+			}			
+
+			// get current parameters to check if one is selected
+			// Get the current facets.
+			if (!empty($_GET['advanced'])) {
+				$search = $_GET['advanced'];
+				foreach ($search as $Searchindex => $SearchArray){
+					if (isset($SearchArray['element_id']) && $SearchArray['element_id'] == $element_id) {
+						$term = $SearchArray['terms'];
+						break;
+					}
+				}
+			}
+
+			$addOptions = false;
+			if (isset($term)){
+				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $dcElementName . "\">";
+				$url = getElementFieldUrl($element_id, null, $isDate);
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">$term</option>";
+			} elseif (count($facet) > 0) {
+				$html =	"<div class=\"select-arrow\"><select id=\"" . $element_id . "\" class=\"facet\" name=\"" . $dcElementName . "\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			if ($addOptions) {
+				foreach ($facet as $name => $count) {
+					$url = getElementFieldUrl($element_id, $name, $isDate);
+					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . " (" . $count . ")</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Add an Element Field to Search to the current URL.
+	 *
+	 * @param string $field The Element id.
+	 * @param string $value The Element value.
+	 * @return string The new URL.
+	 */
+	function getElementFieldUrl($field_id, $value = null, $isDate = false)
+	{
+		// Get the current facets.
+		if (!empty($_GET['advanced'])) {
+			$search = $_GET['advanced'];
+			// unset current element filter if already set
+			foreach ($search as $Searchindex => $SearchArray){
+				if (isset($SearchArray['element_id']) && $SearchArray['element_id'] == $field_id){
+					unset ($search[$Searchindex]);
+				}
+			}
+		} else {
+			$search = array();
+		}
+		if (!is_null($value)) {
+			if ($isDate) {
+				$search[] = array('element_id'=>$field_id, 'type'=>'starts with', 'terms'=>$value);
+			} else {
+				$search[] = array('element_id'=>$field_id, 'type'=>'is exactly', 'terms'=>$value);
+			}
+		}
+		$params['advanced'] = $search;
+		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
+		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
+		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
+		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
+		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
+		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
+		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
+		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+
+		// Rebuild the route.
+		// return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
+		return 'browse?' . http_build_query($params);
+	}
+
+	/**
+	 * Add an Element Field to Search to the current URL.
+	 *
+	 * @param string $filter The filter field name (tags|tag_id|type|collection).
+	 * @param string $value The Element value.
+	 * @return string The new URL.
+	 */
+	function getFieldUrl($filter, $value = null)
+	{
+		// Get the current facets.
+		if (!empty($_GET['advanced'])) {
+			$search = $_GET['advanced'];
+		} else {
+			$search = array();
+		}
+		// set previous parameters
+		$params['advanced'] = $search;
+		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
+		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
+		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
+		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
+		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
+		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
+		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
+		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+
+		// set(unset) current
+		if(!is_null($value)){
+			$params[$filter] = $value;
+		} else {
+			unset($params[$filter]);
+		}
+
+		// Rebuild the route.
+		// return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
+		return 'browse?' . http_build_query($params);
+	}
+	
+	function isFacetActive($element_name, $settings) {
+		return ($settings['item_elements']['Dublin Core'][$element_name] == 1);
+	}
+	
+	function isNotSingleEntry($count) {
+		return ($count != 1);
+	}
+?>
\ No newline at end of file

From e2edf192f3fab299d079fdcc1d3eacb72fc4d0d1 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:54:20 +0200
Subject: [PATCH 003/161] Update file, commented out faulty rules

---
 views/public/css/facets.css | 225 ++++++++++++++++++------------------
 1 file changed, 115 insertions(+), 110 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index d836305..f61f28d 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -1,110 +1,115 @@
-.container-fluid {
-    display: flex;
-}
-
-.search-container h4 {
-  font-family: 'montserrat-light';
-  text-align: center;
-  width: 80%;
-  color: #56575a;
-  font-size: 16px;
-}
-
-.search-container {
-  width: 350px;
-}
-
-.search-container .container {
-  width: 100%;
-}
-
-.search-container form {
-  padding-bottom: 25px;
-  background-color: #F1F1F1;
-  width: 80%;
-}
-
-.search-container .container .container-fluid {
-  padding-top: 20px;
-}
-
-.search-container form label {
-  /* font-family: 'montserrat-regular'; */
-  margin-left: auto;
-  margin-right: auto;
-  /* font-size: 15px; */
-  margin-bottom: 8px;
-  color: #545759;
-}
-
-.search-container form select {
-  font-family: 'open-italic';
-  width: 100%;
-  border-radius: 0;
-  border: 0;
-  padding: 2px;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background-color: #FFF;
-  text-align: center;
-}
-
-.facet-selected {
-  color: #FFF;
-  background-color: #545759!important;
-}
-
-.search-container .select-arrow, .search-container .select-cross {
-  position: relative;
-  font-family: "open-italic";
-  width: 73%;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.search-container .select-arrow select::-ms-expand, .search-container .select-cross select::-ms-expand {
-  display: none;
-}
-
-.search-container .select-cross:after {
-    pointer-events: none;
-    position: absolute;
-    content: '';
-    top: 9px;
-    right: 10px;
-    height: 10px;
-    width: 10px;
-    background-size: cover!important;
-    background: url('../images/cross.svg');
-}
-
-.search-container .select-arrow:after {
-    width: 0;
-    pointer-events: none;
-    position: absolute;
-    content: '';
-    top: 8px;
-    right: 10px;
-    border-top: 8px solid #3D3D3D;
-    border-bottom: 8px solid transparent;
-    border-left: 8px solid transparent;
-    border-right: 8px solid transparent;
-}
-
-.search-container .select-arrow span, .container-fluid .search-container .select-cross span {
-  padding-right:5%;
-}
-
-.search-container button {
-  width: 73%;
-  font-family: 'open-bold';
-  margin-left: auto;
-  margin-right: auto;
-  padding-top: 7px;
-  padding-bottom: 7px;
-  border-radius: 0;
-  border: 0;
-  background-color: #FF5E4D;
-  color: white;
-}
+.container-fluid {
+	display: flex;
+}
+
+.search-container h4 {
+	text-align: center;
+	color: white;
+	background-color: black;
+	margin-bottom: 0;
+	padding: 10px;
+}
+
+.search-container h5 {
+	text-align: left;
+	color: #545759;
+	font-size: 90%;
+	margin: 10px 10px 0 10px;
+	border-bottom: 1px solid #545759;
+	font-style: italic;
+	padding-bottom: 10px;
+	line-height: 140%;
+}
+
+.search-container {
+	max-width: 350px;
+	margin-bottom: 20px;
+}
+
+.search-container .container {
+	width: 100%;
+	background-color: #F1F1F1;
+}
+
+.search-container form {
+	padding: 20px 10px;
+}
+
+.search-container .container .container-fluid:not(:first-child) {
+	padding-top: 20px;
+}
+
+.search-container form label {
+	/* margin-left: auto; */
+	/* margin-right: auto; */
+	margin-bottom: 8px;
+	color: #545759;
+}
+
+.search-container form select {
+	width: 100%;
+	border: 0;
+	appearance: none !important;
+	-webkit-appearance: none !important;
+	-moz-appearance: none !important;
+	background-color: #FFF;
+	text-align: left;
+	font-size: 80%;
+}
+
+.facet-selected {
+	color: #FFF;
+	background-color: #545759!important;
+}
+
+.search-container .select-arrow, .search-container .select-cross {
+	position: relative;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.search-container .select-arrow select::-ms-expand, .search-container .select-cross select::-ms-expand {
+	display: none;
+}
+
+.search-container .select-cross:after {
+	/* pointer-events: none; */
+	/* position: absolute; */
+	/* content: ''; */
+	/* top: 9px; */
+	/* right: 10px; */
+	/* height: 10px; */
+	/* width: 10px; */
+	/* background-size: cover!important; */
+	/* background: url('../images/cross.svg'); */
+}
+
+.search-container .select-arrow:after {
+	/* width: 0; */
+	/* pointer-events: none; */
+	/* position: absolute; */
+	/* content: ''; */
+	/* top: 8px; */
+	/* right: 10px; */
+	/* border-top: 8px solid #3D3D3D; */
+	/* border-bottom: 8px solid transparent; */
+	/* border-left: 8px solid transparent; */
+	/* border-right: 8px solid transparent; */
+}
+
+.search-container .select-arrow span, .container-fluid .search-container .select-cross span {
+	/* padding-right: 5%; */
+}
+
+.search-container button {
+	width: 73%;
+	font-family: 'open-bold';
+	margin-left: auto;
+	margin-right: auto;
+	padding-top: 7px;
+	padding-bottom: 7px;
+	border-radius: 0;
+	border: 0;
+	background-color: #FF5E4D;
+	color: white;
+}
\ No newline at end of file

From 73e0897be99d1e22202fd7126be1a1dde963e194 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 10:55:36 +0200
Subject: [PATCH 004/161] Update file with improved functions

---
 views/public/facets/browse.php | 224 +++++++++++++--------------------
 1 file changed, 85 insertions(+), 139 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 8ba531d..5a98198 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,139 +1,85 @@
-<?php
-  // $itemsArray = array();
-  $facetCollection = array();
-  $facetItemType = array();
-  $facetTag = array();
-
-?>
-<?php
-if (isset($items)):
-  foreach ($items as $item): ?>
-  <!-- item Ids -->
-
-  <!-- collection (Thématique) -->
-  <?php if($collection = $item->getCollection()): ?>
-    <?php $collection_name = metadata($collection, array('Dublin Core', 'Title')); ?>
-    <?php $collection_id = $collection->id; ?>
-    <?php $facetCollection[$collection_id] = $collection_name; ?>
-  <?php endif; ?>
-
-  <!-- itemType (Collection) -->
-  <?php if($itemType = $item->getItemType()): ?>
-    <?php $itemType_name = $itemType->name; ?>
-    <?php $itemType_id = $itemType->id; ?>
-    <?php $facetItemType[$itemType_id] = $itemType_name; ?>
-  <?php endif; ?>
-
-  <?php endforeach; ?>
-<?php else: ?>
-
-<?php endif; ?>
-<?php
-  // tags
-  $tags = get_tags_for_items_array($itemsArray);
-  foreach ($tags as $tag) {
-    $facetTag[$tag->name] = $tag->id;
-    $facetTag[$tag->name] = $tag->name;
-  }
-
-  $facetTag = array_unique($facetTag);
-
-  // collections
-  $collections = get_collections_for_items_array($itemsArray);
-  foreach ($collections as $collection) {
-   $facetCollection[$collection->id] = $collection->getDisplayTitle();
-  }
-
-  $facetCollection = array_unique($facetCollection);
-
-  // item types
-  $itemTypes = get_item_types_for_items_array($itemsArray);
-  foreach ($itemTypes as $itemType) {
-    $facetItemType[$itemType->id] = $itemType->name;
-  }
-
-  $facetItemType = array_unique($facetItemType);
-   ?>
-    <div class="search-container">
-      <div class="container">
-        <h4><?php echo html_escape(__('Facets')); ?></h4>
-        <form class="" action="index.html" method="post">
-          <?php if($html = get_dc_facet_select($itemsArray, 'Creator')): ?>
-          <div class="container-fluid">
-            <label for=""><?php echo html_escape(__('Creator')); ?></label>
-          </div>
-          <?php echo $html; ?>
-          <?php endif; ?>
-          <?php if($html = get_dc_facet_select($itemsArray, 'Contributor')): ?>
-            <div class="container-fluid">
-              <label for=""><?php echo html_escape(__('Contributor')); ?></label>
-            </div>
-            <?php echo $html; ?>
-          <?php endif; ?>
-          <?php if($html = get_dc_facet_select($itemsArray, 'Publisher')): ?>
-            <div class="container-fluid">
-              <label for=""><?php echo html_escape(__('Publisher')); ?></label>
-            </div>
-            <?php echo $html; ?>
-          <?php endif; ?>
-          <?php if($html = get_dc_facet_select($itemsArray, 'Date')): ?>
-            <div class="container-fluid">
-              <label for=""><?php echo html_escape(__('Date')); ?></label>
-            </div>
-            <?php echo $html; ?>
-          <?php endif; ?>
-          <div class="container-fluid">
-            <label for=""><?php echo html_escape(__('Tag')); ?></label>
-          </div>
-          <div class="select-arrow">
-            <select class="" name="">
-              <option value="" data-url="<?php echo getFieldUrl('tag_id'); ?>"><?php echo html_escape(__('Select')); ?>...</option>
-              <?php foreach($facetTag as $tagName => $tagId):?>
-                <!-- <option value="<?php echo $tagId; ?>" data-url="<?php echo getFieldUrl('tag_id',$tagId); ?>" <?php echo (isset($_GET['tag_id']) && $tagId == $_GET['tag_id'] ? "selected": ""); ?>><?php echo $tagName ?></option> -->
-                <option value="<?php echo $tagId; ?>" data-url="<?php echo getFieldUrl('tag',$tagId); ?>" <?php echo (isset($_GET['tag']) && $tagId == $_GET['tag'] ? "selected": ""); ?>><?php echo $tagName ?></option>
-              <?php endforeach;?>
-            </select>
-          </div>
-          <div class="container-fluid">
-            <label for=""><?php echo html_escape(__('Collection')); ?></label>
-          </div>
-          <div class="select-arrow">
-            <select class="" name="">
-              <option value="" data-url="<?php echo getFieldUrl('collection'); ?>"><?php echo html_escape(__('Select')); ?>...</option>
-              <?php foreach($facetCollection as $collectionId => $collectionName):?>
-                <option value="<?php echo $collectionId ?>" data-url="<?php echo getFieldUrl('collection',$collectionId); ?>" <?php echo (isset($_GET['collection']) && $collectionId == $_GET['collection'] ? "selected": ""); ?>><?php echo $collectionName ?></option>
-              <?php endforeach;?>
-            </select>
-          </div>
-          <div class="container-fluid">
-            <label for=""><?php echo html_escape(__('Type')); ?></label>
-          </div>
-          <div class="select-arrow">
-            <select class="" name="">
-              <option value="" data-url="<?php echo getFieldUrl('type'); ?>"><?php echo html_escape(__('Select')); ?>...</option>
-              <?php foreach($facetItemType as $itemTypeId => $itemTypeName):?>
-                <option value="<?php echo $itemTypeId ?>" data-url="<?php echo getFieldUrl('type',$itemTypeId); ?>" <?php echo (isset($_GET['type']) && $itemTypeId == $_GET['type'] ? "selected": ""); ?>><?php echo $itemTypeName ?></option>
-              <?php endforeach;?>
-            </select>
-            </select>
-          </div>
-          <?php if($html = get_dc_facet_select($itemsArray, 'Provenance')): ?>
-            <div class="container-fluid">
-              <label for=""><?php echo html_escape(__('Provenance')); ?></label>
-            </div>
-            <?php echo $html; ?>
-          <?php endif; ?>
-          <!-- <div class="container-fluid">
-            <button type="submit" name="button">Filtrer</button>
-          </div> -->
-        </form>
-      </div>
-    </div>
-    <script type="text/javascript">
-    window.jQuery( document ).ready(function() {
-      window.jQuery('select').change(function() {
-        var option = window.jQuery(this).find('option:selected');
-        window.location.href = option.data("url");
-      });
-    });
-    </script>
+<?php
+	// $itemsArray = array();
+	$facetCollections = array();
+	$facetItemTypes = array();
+	$facetTags = array();
+	$facetsElements = json_decode(get_option('facets_elements'), true);
+	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
+	$sortOrder = get_option('facets_sort_order');
+
+	$table = get_db()->getTable('Element');
+	$select = $table->getSelect()
+		->where('element_sets.name = \'Dublin Core\'')
+		->order('elements.element_set_id')
+		->order('ISNULL(elements.order)')
+		->order('elements.order');
+	$elements = $table->fetchObjects($select);
+?>
+
+<div class="search-container">
+	<div class="container">
+		<h4><?php echo html_escape(__('Refine search by...')) ?></h4>
+
+		<?php 
+			if ($description = get_option('facets_description')) {
+				echo "<h5>" . $description . "</h5>\n";
+			}
+		?>
+		<form class="" action="index.html" method="post">
+			<?php
+				foreach ($elements as $element) {
+					if (isFacetActive($element->name, $facetsElements)) {
+						$isDate = in_array($element->name, array('Date'));
+						if ($html = get_dc_facet_select($itemsArray, $element->name, $isDate, $hideSingleEntries, $sortOrder)) {
+							echo "<div class=\"container-fluid\">\n";
+							echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
+							echo "</div>";
+							echo $html;
+						}
+					}
+				}
+			?>
+
+			<?php
+				if (get_option('facets_item_types')) {
+					if ($html = get_item_types_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+						echo "<div class=\"container-fluid\">\n";
+						echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
+						echo "</div>";
+						echo $html;
+					}
+				}
+			?>
+			
+			<?php
+				if (get_option('facets_collections')) {
+					if ($html = get_collections_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+						echo "<div class=\"container-fluid\">\n";
+						echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
+						echo "</div>";
+						echo $html;
+					}
+				}
+			?>
+
+			<?php
+				if (get_option('facets_tags')) {
+					if ($html = get_tags_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+						echo "<div class=\"container-fluid\">\n";
+						echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
+						echo "</div>";
+						echo $html;
+					}
+				}
+			?>
+		</form>
+	</div>
+</div>
+<script type="text/javascript">
+	window.jQuery( document ).ready(function() {
+		window.jQuery('select').change(function() {
+			var option = window.jQuery(this).find('option:selected');
+			window.location.href = option.data("url");
+		});
+	});
+</script>
\ No newline at end of file

From 4e4e6b65a095766a7fe3825e8196c7cdf1e92b35 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 11:23:08 +0200
Subject: [PATCH 005/161] Update Readme.md

---
 Readme.md | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/Readme.md b/Readme.md
index 1657f7d..df9651b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,35 +1,49 @@
-# Omeka Facets Plugin
+# Facets
 
-This is a plugin, for the [Omeka Classic](https://omeka.org/classic/) Publishing platform.
+## Description
 
-Allows you to insert a Facets block made of Option blocks containing available metadata values extracted from browsing context.
+Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of Option blocks containing available metadata values extracted from browsing context
+
+Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values.
 
 ![Facets screenshot](./facets.jpg)
 
 ## Credits
 
-This Development is part of the [Armarium](https://www.armarium-hautsdefrance.fr/) Project, managed by the french association [AR2L Hauts de France](http://www.ar2l-hdf.fr/).
+Original development is part of the [Armarium](https://www.armarium-hautsdefrance.fr/) Project, managed by the french association [AR2L Hauts de France](http://www.ar2l-hdf.fr/).
 
-## How to Use
+Fixed and improved version by [DBinaghi].
 
-## Install the FacetsPlugin
+## Installation
+Uncompress files and rename plugin folder "Facets".
 
-Copy to your Omeka plugins Folder, should be :
-```
-/plugins/Facets
+Then install it like any other Omeka plugin.
+
+## (Eventually) Customize your Theme
+
+Facets will appear by default in the <b>Items browse</b> page, where you have set the `public_items_browse` hook. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. For <b>Thanks, Roy</b> theme, for example, best way is to change `common/header.php` code using the custom hook:
+```php
+<div id="search-container" role="search">
+    <?php if (get_theme_option('use_advanced_search') === null || get_theme_option('use_advanced_search')): ?>
+    <?php echo search_form(array('show_advanced' => true)); ?>
+    <?php else: ?>
+    <?php echo search_form(); ?>
+    <?php endif; ?>
+</div>
+<?php fire_plugin_hook('public_items_facets', array('view' => $this, 'item' => $item)); ?>
 ```
 
-Then Install the plugin from the Admin/extensions page.
+## Plugin configuration
 
-## (Eventually) Customize your Theme
+The elements used for search refinement can be selected in the configuration page; best practice suggestion is to activate only elements that are displayed in the browse page, and that are offering some kind of data aggregation (a unique id would not offer any really useful refinement).
 
-Facets will appear in the Items browse page, where you have set the public_items_browse Hook.
+Similarly, one can choose to also include <b>Item Types</b>, <b>Collections</b> and <b>Tags</b> to the facets block.
 
-You can Edit your Theme (should be in YOUR_THEME/items/browse) & place the plugin hook where you need to display the facets.
+Single values can be exluded as not really significant, although they will be listed anyway if less than 10 values are available.
 
-```php
-<?php fire_plugin_hook('public_items_browse', array('items' => $items, 'view' => $this)); ?>
-```
+Sorting order can be alphabetical, or first by popularity and then alphabetical.
+
+<b>Date</b> element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
 
 ## Licence
 MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/)

From d4c8475757cf170c57d82559978582fd04168894 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 11:36:20 +0200
Subject: [PATCH 006/161] Fixed indentation

---
 FacetsPlugin.php | 108 +++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 30161fe..3692228 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -19,8 +19,8 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 		'install',
 		'uninstall',
 		'initialize',
-        'config_form',
-        'config',
+		'config_form',
+		'config',
 		'define_routes',
 		'public_head',
 		'public_items_browse',
@@ -33,17 +33,17 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 	public function hookInstall()
 	{
 		set_option('facets_public_hook', 'public_items_browse');
-        set_option('facets_description', '');
-        set_option('facets_hide_single_entries', 0);
-        set_option('facets_sort_order', 'count_alpha');
+		set_option('facets_description', '');
+		set_option('facets_hide_single_entries', 0);
+		set_option('facets_sort_order', 'count_alpha');
 
 		$defaults = array(
-            'item_elements' => array()
-        );
-        set_option('facets_elements', json_encode($defaults));
-        set_option('facets_item_types', 1);
-        set_option('facets_collections', 1);
-        set_option('facets_tags', 0);
+			'item_elements' => array()
+		);
+		set_option('facets_elements', json_encode($defaults));
+		set_option('facets_item_types', 1);
+		set_option('facets_collections', 1);
+		set_option('facets_tags', 0);
 	}
 
 	/**
@@ -52,13 +52,13 @@ public function hookInstall()
 	public function hookUninstall()
 	{
 		delete_option('facets_public_hook');
-        delete_option('facets_description');
-        delete_option('facets_hide_single_entries');
-        delete_option('facets_sort_order');
-        delete_option('facets_elements');
-        delete_option('facets_item_types');
-        delete_option('facets_collections');
-        delete_option('facets_tags');
+		delete_option('facets_description');
+		delete_option('facets_hide_single_entries');
+		delete_option('facets_sort_order');
+		delete_option('facets_elements');
+		delete_option('facets_item_types');
+		delete_option('facets_collections');
+		delete_option('facets_tags');
 	}
 
 	/**
@@ -68,49 +68,49 @@ public function hookInitialize()
 	{
 		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
 
-        $settings = json_decode(get_option('facets_elements'), true);
-        $this->_settings = $settings;
+		$settings = json_decode(get_option('facets_elements'), true);
+		$this->_settings = $settings;
 	}
 
-    /**
-     * Shows plugin configuration page.
-     */
-    public function hookConfigForm($args)
-    {
-        $settings = $this->_settings;
+	/**
+	 * Shows plugin configuration page.
+	 */
+	public function hookConfigForm($args)
+	{
+		$settings = $this->_settings;
 
-        $table = get_db()->getTable('Element');
-        $select = $table->getSelect()
+		$table = get_db()->getTable('Element');
+		$select = $table->getSelect()
 			->where('element_sets.name = \'Dublin Core\'')
-            ->order('elements.element_set_id')
-            ->order('ISNULL(elements.order)')
-            ->order('elements.order');
-        $elements = $table->fetchObjects($select);
-
-        include('config_form.php');
-    }
-
-    /**
-     * Handle the config form.
-     */
-    public function hookConfig($args)
-    {
-        $post = $args['post'];
+			->order('elements.element_set_id')
+			->order('ISNULL(elements.order)')
+			->order('elements.order');
+		$elements = $table->fetchObjects($select);
+
+		include('config_form.php');
+	}
+
+	/**
+	 * Handle the config form.
+	 */
+	public function hookConfig($args)
+	{
+		$post = $args['post'];
 		
-        set_option('facets_public_hook', $post['facets_public_hook']);
-        set_option('facets_description', $post['facets_description']);
-        set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
-        set_option('facets_sort_order', $post['facets_sort_order']);
+		set_option('facets_public_hook', $post['facets_public_hook']);
+		set_option('facets_description', $post['facets_description']);
+		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
+		set_option('facets_sort_order', $post['facets_sort_order']);
 
 		$settings = array(
-            'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array()
-        );
-        set_option('facets_elements', json_encode($settings));
+			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array()
+		);
+		set_option('facets_elements', json_encode($settings));
 
-        set_option('facets_item_types', $post['facets_item_types']);
-        set_option('facets_collections', $post['facets_collections']);
-        set_option('facets_tags', $post['facets_tags']);
-   }
+		set_option('facets_item_types', $post['facets_item_types']);
+		set_option('facets_collections', $post['facets_collections']);
+		set_option('facets_tags', $post['facets_tags']);
+	}
 
 	public function hookPublicHead($args)
 	{
@@ -190,4 +190,4 @@ public function showFacets($args)
 			}
 		}
 	}
-}
\ No newline at end of file
+}

From c301c59e9427e057ed825300e01d2a1e73d801cd Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:49:11 +0200
Subject: [PATCH 007/161] Added config option to hide popularity count

---
 FacetsPlugin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 3692228..4bc58af 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -36,6 +36,7 @@ public function hookInstall()
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
 		set_option('facets_sort_order', 'count_alpha');
+		set_option('facets_hide_popularity', 0);
 
 		$defaults = array(
 			'item_elements' => array()
@@ -55,6 +56,7 @@ public function hookUninstall()
 		delete_option('facets_description');
 		delete_option('facets_hide_single_entries');
 		delete_option('facets_sort_order');
+		delete_option('facets_hide_popularity');
 		delete_option('facets_elements');
 		delete_option('facets_item_types');
 		delete_option('facets_collections');
@@ -101,6 +103,7 @@ public function hookConfig($args)
 		set_option('facets_description', $post['facets_description']);
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
 		set_option('facets_sort_order', $post['facets_sort_order']);
+		set_option('facets_hide_popularity', $post['facets_hide_popularity']);
 
 		$settings = array(
 			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array()

From 917f3e351a5fefc7f03ca6760e95071b84948803 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:49:53 +0200
Subject: [PATCH 008/161] Added config option to hide popularity count

---
 config_form.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/config_form.php b/config_form.php
index 3e96e19..9e32408 100644
--- a/config_form.php
+++ b/config_form.php
@@ -68,12 +68,24 @@
 			null,
 			array(
 				'alpha' => __('Alphabetical'),
-				'count_alpha' => __('Count first, then alphabetical'),
+				'count_alpha' => __('Popularity first, then alphabetical'),
 			)); 
 		?>
     </div>
 </div>
 
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_hide_popularity', __('Hide popularity')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, values\'s popularity will not be displayed (sorting order will still take it into consideration, if required).'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_hide_popularity', get_option('facets_hide_popularity'), null, array('1', '0')); ?>
+    </div>
+</div>
+
 <h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">
@@ -150,4 +162,4 @@
 		</p>
 		<?php echo $view->formCheckbox('facets_tags', get_option('facets_tags'), null, array('1', '0')); ?>
     </div>
-</div>
\ No newline at end of file
+</div>

From d52c1bc9ffabb51999f4afde423cccfd9353ada3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:50:41 +0200
Subject: [PATCH 009/161] Added config option to hide popularity count

---
 views/public/facets/browse.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 5a98198..fdb2fe7 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -6,6 +6,7 @@
 	$facetsElements = json_decode(get_option('facets_elements'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
 	$sortOrder = get_option('facets_sort_order');
+	$hidePopularity = (bool)get_option('facets_hide_popularity');
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
@@ -30,7 +31,7 @@
 				foreach ($elements as $element) {
 					if (isFacetActive($element->name, $facetsElements)) {
 						$isDate = in_array($element->name, array('Date'));
-						if ($html = get_dc_facet_select($itemsArray, $element->name, $isDate, $hideSingleEntries, $sortOrder)) {
+						if ($html = get_dc_facet_select($itemsArray, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 							echo "</div>";
@@ -42,7 +43,7 @@
 
 			<?php
 				if (get_option('facets_item_types')) {
-					if ($html = get_item_types_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+					if ($html = get_item_types_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 						echo "</div>";
@@ -53,7 +54,7 @@
 			
 			<?php
 				if (get_option('facets_collections')) {
-					if ($html = get_collections_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+					if ($html = get_collections_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
 						echo "</div>";
@@ -64,7 +65,7 @@
 
 			<?php
 				if (get_option('facets_tags')) {
-					if ($html = get_tags_facet_select($itemsArray, $hideSingleEntries, $sortOrder)) {
+					if ($html = get_tags_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
 						echo "</div>";
@@ -82,4 +83,4 @@
 			window.location.href = option.data("url");
 		});
 	});
-</script>
\ No newline at end of file
+</script>

From ed1c9176ab5ad3be03e0e71af719628a821fbd33 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 12:52:01 +0200
Subject: [PATCH 010/161] Added option to hide popularity count, added tags
 count and sorting by count

---
 helpers/FacetsFunctions.php | 54 +++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index c4c8228..7667618 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -11,12 +11,20 @@
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
+	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+	function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
 		// Return, if no Item is available
 		if (empty($itemsArray)) return "";
 
+		// Define Order by clause
+		if ($sortOrder == 'count_alpha') {
+			$orderBy = array('tagCount DESC', 'name ASC');
+		} else {
+			$orderBy = array('name ASC');
+		}
+
 		// Get the database.
 		$db = get_db();
 		// Get the table.
@@ -25,13 +33,15 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 		$select = $table->getSelectForFindBy();
 		$table->filterByTagType($select, 'Item');
 		$select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
-		$select->order('tags.name');
+		$select->order($orderBy);
 
 		if ($tags = $table->fetchObjects($select)) {
 			// Build array
 			$facetTags = array();
 			foreach ($tags as $tag) {
-				$facetTags[$tag->id] = $tag->name;
+				$facetTags[$tag->id]['id'] = $tag->id;
+				$facetTags[$tag->id]['name'] = $tag->name;
+				$facetTags[$tag->id]['count'] = $tag->tagCount;
 			}
 			
 			// Stores data for selected tag, if any
@@ -55,8 +65,8 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 			}
 
 			if ($addOptions) {
-				foreach ($facetTags as $tag_id => $tag_name) {
-					$html .= "<option value=\"" . $tag_id . "\" data-url=\"" . getFieldUrl('tags', $tag_name) . "\">" . $tag_name . "</option>";
+				foreach ($facetTags as $tag) {
+					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl('tags', $tag['name']) . "\">" . $tag['name'] . ($hidePopularity ? "" : " (" . $tag['count'] . ")") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -73,9 +83,10 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
+	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+	function get_collections_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
 		// Return, if no Item is available
 		if (empty($itemsArray)) return "";
 
@@ -131,7 +142,7 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 
 			if ($addOptions) {
 				foreach ($facetCollections as $collection) {
-					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . " (" . $collection['count'] . ")</option>";
+					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . ($hidePopularity ? "" : " (" . $collection['count'] . ")") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -148,12 +159,20 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
+	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+	function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
 		// Return, if no Item is available
 		if (empty($itemsArray)) return "";
 
+		// Define Order by clause
+		if ($sortOrder == 'count_alpha') {
+			$orderBy = array('count DESC', 'text ASC');
+		} else {
+			$orderBy = array('text ASC');
+		}
+
 		// Get the database.
 		$db = get_db();
 		// Get the table.
@@ -164,7 +183,8 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 			->joinInner(array('items' => $db->Items),
 				'item_types.id = items.item_type_id', array())
 			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
-			->group('item_types.id');
+			->group('item_types.id')
+			->order(orderBy);
 
 		if ($itemTypes = $table->fetchObjects($select)) {
 			// Build array
@@ -185,13 +205,6 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleEntry");
 			}			
 
-			// Sort array
-			if ($sortOrder == 'count_alpha') {
-				array_multisort(array_column($facetItemTypes, 'count'), SORT_DESC, array_column($facetItemTypes, 'name'), SORT_ASC, $facetItemTypes);
-			} else {
-				array_multisort(array_column($facetItemTypes, 'name'), SORT_ASC, $facetItemTypes);
-			}
-
 			$addOptions = false;
 			// get current parameters to check if one is selected
 			if (isset($selectedItemType)) {
@@ -206,7 +219,7 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 
 			if ($addOptions) {
 				foreach ($facetItemTypes as $itemType) {
-					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . " (" . $itemType['count'] . ")</option>";
+					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . ($hidePopularity ? "" : " (" . $itemType['count'] . ")") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -225,9 +238,10 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 	 * @param isDate
 	 * @param hideSingleEntries
 	 * @param sortOrder
+	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha') {
+	function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
 		if (empty($itemsArray)) return "";
 		
 		// Get the database.
@@ -309,7 +323,7 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 			if ($addOptions) {
 				foreach ($facet as $name => $count) {
 					$url = getElementFieldUrl($element_id, $name, $isDate);
-					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . " (" . $count . ")</option>";
+					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($hidePopularity ? "" : " (" . $count . ")") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -408,4 +422,4 @@ function isFacetActive($element_name, $settings) {
 	function isNotSingleEntry($count) {
 		return ($count != 1);
 	}
-?>
\ No newline at end of file
+?>

From 7e23883ccb997a14e45360d2c86fe7aa6d89e555 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 13:52:48 +0200
Subject: [PATCH 011/161] Added localization support

---
 FacetsPlugin.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 4bc58af..b542e53 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -68,6 +68,8 @@ public function hookUninstall()
 	 */
 	public function hookInitialize()
 	{
+		add_translation_source(dirname(__FILE__) . '/languages');
+
 		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
 
 		$settings = json_decode(get_option('facets_elements'), true);

From 87e44b027037d4781bb64a81c5fcea09d261c6d1 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:09:14 +0200
Subject: [PATCH 012/161] Fixed translatable string

---
 views/public/facets/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index fdb2fe7..c4b6d90 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -19,7 +19,7 @@
 
 <div class="search-container">
 	<div class="container">
-		<h4><?php echo html_escape(__('Refine search by...')) ?></h4>
+		<h4><?php echo html_escape(__('Refine search by')) ?>...</h4>
 
 		<?php 
 			if ($description = get_option('facets_description')) {

From a700819a88604cfd6e34f9379d7e0416ab8c0520 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:09:41 +0200
Subject: [PATCH 013/161] Removed useless array variable

---
 views/public/facets/browse.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index c4b6d90..8074396 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,5 +1,4 @@
 <?php
-	// $itemsArray = array();
 	$facetCollections = array();
 	$facetItemTypes = array();
 	$facetTags = array();

From 91a5f4cdb6af8fca47994c3708195995411afb6a Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:29:05 +0200
Subject: [PATCH 014/161] Initial commit

---
 languages/it.po | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 languages/it.po

diff --git a/languages/it.po b/languages/it.po
new file mode 100644
index 0000000..8026076
--- /dev/null
+++ b/languages/it.po
@@ -0,0 +1 @@
+initial commit

From a5fbe2b7bb2fe6f01e279c2d774282f8ae7b2cf3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:29:43 +0200
Subject: [PATCH 015/161] Add files via upload

---
 languages/it.mo             | Bin 0 -> 3349 bytes
 languages/it.po             | 139 +++++++++++++++++++++++++++++++++++-
 languages/template.base.pot |  17 +++++
 languages/template.pot      | 134 ++++++++++++++++++++++++++++++++++
 4 files changed, 289 insertions(+), 1 deletion(-)
 create mode 100644 languages/it.mo
 create mode 100644 languages/template.base.pot
 create mode 100644 languages/template.pot

diff --git a/languages/it.mo b/languages/it.mo
new file mode 100644
index 0000000000000000000000000000000000000000..4d223c2abdf220d7926d5ae76e68344b3d45a56f
GIT binary patch
literal 3349
zcmb_eO^h7H748rV$i{$`gd_(a9zuw<vb}3NN@9(T<F$9O7w>vk%NWVY!K&$g(^G6s
zRZ~?xoACu9<&s+zi8CA%i4zhxPV9jL2ZXpGh=dg76e)_t0U-{2uX=iCS3<Ue7<v75
z_0-SzzVFq0^Ut50cs;}C^z83z8Q}Bj59atV9zVnQB=BEA8UGLXW8jxFJn>MLJ%aHm
z;G@7_0-pdr1^g-S9Pl!59rzsZ&%oaS-vb)pSHLN-`eBwW06zyl4g3#K&N+1gf56kg
z$ACFdcw7X^{Hs9x%eL^}?}59(E5N@2FM{L8z-5e|z#?p!T?Tr*zY3In-T`^p=Ut%0
z@&0W5AyCf$1SoO+dxrl7{tV+UfxiGghA+2)&j9}jY=F0b9|0YZeuS8Te+7yjPvWqr
zfM<Xb&rRUZfp>t918X3rX0HOD1pZ|<egpUd#{U5JfnNY$LmV3*c?IJSU=ohZPRgdM
zMbs0{R!u!p1CF{-CR+_P7csl$i~(wAL$=1D@Vb^kwr+ULHg*`Y8@gnwUELVvb)2^2
zplxNCFwtuc*~XBH5f^)0E>U3RixGJqYMZvA!Ib8w(Y`i@225(Av{3`Y%MV_@5qV7g
zY0ckhbzfBvS~pRq;ec6jL@zfXlCy1e({`nGQ8*hNBA2w-Si>Pu9I@wT1I-4?(lepc
zgtV3K(~>jCLu?Pjy1A;yPAPS$jhf0q!TAWO$@!9fJ1ImFFseN!9dSx@RKP^I<drzM
zM0yDIUum@GQcmu)3)#-0i!{_e#3f;9NgYj(on~NkK_ln(vfboi=jdRH7h^YJEH;sS
z_99CLWiNtbOE81dA?x#>B7qh3Y65~#fmB&);ie3g^IW6FsOui>G1n4G7-1t2?nAXT
zVPTOr9yYWYDRQew1yt^K9y;HVo2Og5f$*oPYiM8D#0FG)v_0lM1>s8`s>VdRRJf8a
z*D2(?8bXD;1Ml_&Us_4uEI}L3s+>aN5}_oudBT25wW?VBAq)LS%3`DgS!T>TvxK*P
ztc;mTRQuv!Qxn)rMzAf(4b!7+auM3K1JhL6f}Pv9-^OgH3Xb8BSyE#Jaa*a65cE)N
zlENP00w$(`2F-Ep_9b@_3ADhZlDw`)vDNN)(uv5k>j6hX@*Ek!rVPv3?ZDZNcP}Fk
z@{KZoiG6_0JwoPSdt30rF4wR%-wKs3^Q%o2^1kcQD8{<CvQpu`HG}2CjaSx`#h&@i
zt(C*ID>?++%7vZnetr!$NCxF=D#FO~XV0I@&;B+)dx6gVy7wDA;Dd?zE>E;jn9aMh
zzPg)lZRcyNbYr`>wehPzY~Na6*i<3reXndVDmvez_Hd@F+Nx@#>5?kP+Flvx=pygA
zWgRbLk*yl|mG@bVd$hTF>-z20>+5uBbMuPP%g$HxIX&d_!q&#t`dpE7%V!s^IU7+j
zbE#xKinu2$xaitmlnnBL<8!zB&*vBB^MoRV%-1dKMHcnw0yr&Xs}XhGp{@_xvW`bo
z^%z}S*6%?8J*(>S%w08i-Gk0<serOkYAHf4mG*--=PzNn^O~g0JEL*alku{biV79R
zkXJ(#cqP5UA%~1nNTGs#p{PbyrGlT%rl9=6n<PaItOi;N{{O#UUxTHqw8BQT=8C30
z_<PxV9gT4W_0$8YI)pBl;fOZ4>6UPhU==C>Zig+9sI;gE45c)1no)?D3NO-I#DGpQ
z+sG#Iq_rqizhlziJm`AFAt-%FpgS1ij$MeT{)!ecy+q+}mB%q?9EUEUrJ-z#8Mttb
zeWhXP91({EkmLd_4K3bD37)CVRCZG1n(Of~E=wS$Q6LX<@P^b}6jNy+F57JrL;^UH
z7}>5KH*TU+5AiPbkd#*0+9B;DoU_gwMq3GzX$nn6p(`K+uuILP4OV(g+6li)7E?#8
zj7F&$qY|=ZZ=_H9DB)c<y6Y-PrX#IJ+^Ss&POJ<8B}`6(os!b`P5R|*^V!sMWQzcg
z8V4SUYLB3_!SS%8Ydm;Ny@(bc)Pm4UDxEAV^$<VcpaIITt1L(<^b2@ixNz_m3`DiW
zaEwYJ6Y1dZb5j+z3Ao8IU0CiC#=$=LBfr#UcevdXJ*lo6&r2Qk+PfO5A(N<1ed=48
zA8S!KQp70HWjZmXip_$MtY?IVA6uzK%_ty4k!6x-&B5E<GV#EXo3uF#B_S|=i?Xeh
o5QVFab#UN5xt|Q|Zk$}ALXB(qfoq97n=%O93_q>(y?ZYE1_awN5C8xG

literal 0
HcmV?d00001

diff --git a/languages/it.po b/languages/it.po
index 8026076..98a8c19 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -1 +1,138 @@
-initial commit
+# Translation for the Facets plugin for Omeka.
+# This file is distributed under the same license as the Omeka plugin.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Reference\n"
+"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: browse.php:22
+msgid "Refine search by"
+msgstr "Raffina la ricerca per"
+
+#: FacetsFunctions.php:59
+#: FacetsFunctions.php:135
+#: FacetsFunctions.php:212
+#: FacetsFunctions.php:315
+msgid "Remove filter"
+msgstr "Rimuovi filtro"
+
+#: FacetsFunctions.php:63
+#: FacetsFunctions.php:139
+#: FacetsFunctions.php:216
+#: FacetsFunctions.php:319
+msgid "Select"
+msgstr "Seleziona"
+
+#: config_form.php:11
+msgid "Use"
+msgstr "Utilizzo"
+
+#: config_form.php:15
+msgid "Public hook"
+msgstr "Hook pubblico"
+
+#: config_form.php:19
+msgid ""
+"The hook you want to use: Omeka's default <code>public_items_browse</code>, already coded into every page "
+"(so no change is needed), normally showing up at the end of the page; or the plugin's own "
+"<code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
+msgstr ""
+"L'hook che si vuole usare: quello di default di Omeka (<code>public_items_browse</code>), già codificato "
+"in ogni pagina (così nessuna modifica è necessaria), solitamente mostrato alla fine della pagina; oppure, "
+"quello proprio del plugin (<code>public_items_facets</code>), che deve essere codificato nelle giuste "
+"pagine del tema ma può essere usato ovunque lo si ritenga opportuno."
+
+#: config_form.php:32
+msgid "Aspect"
+msgstr "Aspetto"
+
+#: config_form.php:36
+msgid "Description"
+msgstr "Descrizione"
+
+#: config_form.php:40
+msgid "Text to be used as additional description (tip: keep it short)."
+msgstr "Testo da usare come descrizione addizionale (consiglio: mantenerlo corto)."
+
+#: config_form.php:48
+msgid "Hide single entries"
+msgstr "Nascondi valori singoli"
+
+#: config_form.php:52
+msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
+msgstr "Se selezionato, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
+
+#: config_form.php:60
+msgid "Sort order"
+msgstr "Direzione ordinamento"
+
+#: config_form.php:64
+msgid "The sorting order for values in select fields."
+msgstr "La direzione di ordinamento per i valori dei campi di selezione."
+
+#: config_form.php:70
+msgid "Alphabetical"
+msgstr "Alfabetico"
+
+#: config_form.php:71
+msgid "Popularity first, then alphabetical"
+msgstr "Prima popolarità, poi alfabetico"
+
+#: config_form.php:79
+msgid "Hide popularity"
+msgstr "Nascondi popolarità"
+
+#: config_form.php:83
+msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
+msgstr "Se selezionato, la popolarità dei valori non verrà mostrata (la direzione di ordinamento ne terrà comunque conto, se necessario)."
+
+#: config_form.php:89
+msgid "Elements"
+msgstr "Elementi"
+
+#: config_form.php:97
+msgid "The Dublin Core elements that can be used for search refinement."
+msgstr "Gli elementi Dublin Core che possono essere usati per il raffinamento della ricerca."
+
+#: config_form.php:102
+msgid "Element"
+msgstr "Elemento"
+
+#: config_form.php:103
+msgid "Active"
+msgstr "Attivo"
+
+#: config_form.php:133
+msgid "Item Types"
+msgstr "Tipologie documento"
+
+#: config_form.php:137
+msgid "If checked, search refinement by Item Type will be available."
+msgstr "Se selezionata, il raffinamento della ricerca per Tipologia di Documento sarà disponibile."
+
+#: config_form.php:145
+msgid "Collections"
+msgstr "Collezioni"
+
+#: config_form.php:149
+msgid "If checked, search refinement by Collection will be available."
+msgstr "Se selezionata, il raffinamento della ricerca per Collezione sarà disponibile."
+
+#: config_form.php:157
+msgid "Tags"
+msgstr "Etichette"
+
+#: config_form.php:161
+msgid "If checked, search refinement by Tag will be available."
+msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile."
\ No newline at end of file
diff --git a/languages/template.base.pot b/languages/template.base.pot
new file mode 100644
index 0000000..09f46d6
--- /dev/null
+++ b/languages/template.base.pot
@@ -0,0 +1,17 @@
+# Translation for the Facets plugin for Omeka.
+# This file is distributed under the same license as the Omeka plugin.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Reference\n"
+"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
new file mode 100644
index 0000000..16c96f5
--- /dev/null
+++ b/languages/template.pot
@@ -0,0 +1,134 @@
+# Translation for the Facets plugin for Omeka.
+# This file is distributed under the same license as the Omeka plugin.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Reference\n"
+"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: browse.php:22
+msgid "Refine search by"
+msgstr ""
+
+#: FacetsFunctions.php:59
+#: FacetsFunctions.php:135
+#: FacetsFunctions.php:212
+#: FacetsFunctions.php:315
+msgid "Remove filter"
+msgstr ""
+
+#: FacetsFunctions.php:63
+#: FacetsFunctions.php:139
+#: FacetsFunctions.php:216
+#: FacetsFunctions.php:319
+msgid "Select"
+msgstr ""
+
+#: config_form.php:11
+msgid "Use"
+msgstr ""
+
+#: config_form.php:15
+msgid "Public hook"
+msgstr ""
+
+#: config_form.php:19
+msgid ""
+"The hook you want to use: Omeka's default <code>public_items_browse</code>, already coded into every page "
+"(so no change is needed), normally showing up at the end of the page; or the plugin's own "
+"<code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
+msgstr ""
+
+#: config_form.php:32
+msgid "Aspect"
+msgstr ""
+
+#: config_form.php:36
+msgid "Description"
+msgstr ""
+
+#: config_form.php:40
+msgid "Text to be used as additional description (tip: keep it short)."
+msgstr ""
+
+#: config_form.php:48
+msgid "Hide single entries"
+msgstr ""
+
+#: config_form.php:52
+msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
+msgstr ""
+
+#: config_form.php:60
+msgid "Sort order"
+msgstr ""
+
+#: config_form.php:64
+msgid "The sorting order for values in select fields."
+msgstr ""
+
+#: config_form.php:70
+msgid "Alphabetical"
+msgstr ""
+
+#: config_form.php:71
+msgid "Popularity first, then alphabetical"
+msgstr ""
+
+#: config_form.php:79
+msgid "Hide popularity"
+msgstr ""
+
+#: config_form.php:83
+msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
+msgstr ""
+
+#: config_form.php:89
+msgid "Elements"
+msgstr ""
+
+#: config_form.php:97
+msgid "The Dublin Core elements that can be used for search refinement."
+msgstr ""
+
+#: config_form.php:102
+msgid "Element"
+msgstr ""
+
+#: config_form.php:103
+msgid "Active"
+msgstr ""
+
+#: config_form.php:133
+msgid "Item Types"
+msgstr ""
+
+#: config_form.php:137
+msgid "If checked, search refinement by Item Type will be available."
+msgstr ""
+
+#: config_form.php:145
+msgid "Collections"
+msgstr ""
+
+#: config_form.php:149
+msgid "If checked, search refinement by Collection will be available."
+msgstr ""
+
+#: config_form.php:157
+msgid "Tags"
+msgstr ""
+
+#: config_form.php:161
+msgid "If checked, search refinement by Tag will be available."
+msgstr ""
\ No newline at end of file

From 5dd1109397f51cbd237bd2cf0a16679a6a5442fe Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 15:05:06 +0200
Subject: [PATCH 016/161] Corrected typo

---
 config_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_form.php b/config_form.php
index 9e32408..283e8f1 100644
--- a/config_form.php
+++ b/config_form.php
@@ -158,7 +158,7 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, search refinement by Tags will be available.'); ?>
+			<?php echo __('If checked, search refinement by Tag will be available.'); ?>
 		</p>
 		<?php echo $view->formCheckbox('facets_tags', get_option('facets_tags'), null, array('1', '0')); ?>
     </div>

From 01e449e3b6c52ff899a3287d3afd3f72b15bd9d1 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:13:32 +0200
Subject: [PATCH 017/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index df9651b..0390960 100644
--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of Option blocks containing available metadata values extracted from browsing context
+Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context
 
 Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values.
 

From d23614bc42b6396b5e678f0b41a18c37a03250c3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 18:13:47 +0200
Subject: [PATCH 018/161] Create Readme.md


From ee733fa672da510bc704571d5dd820d0d886814a Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 21:46:32 +0200
Subject: [PATCH 019/161] Fixed issue with search page

---
 FacetsPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index b542e53..7ec1d56 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -168,10 +168,10 @@ public function showFacets($args)
 		
 		$itemsArray = array();
 		$params = array('advanced' => $_GET['advanced'], 'collection' => $_GET['collection'], 'type' => $_GET['type'], 'tags' => $_GET['tags']);
-		$items = get_records('item', $params, null);
 
 		if (count($items) > 0) {
 			if ($controller == 'items') {
+				$items = get_records('item', $params, null);
 				foreach ($items as $item) {
 					$itemsArray[] = $item->id;
 				}

From 7d28b8c0dcf7f4baf0d07e7d1deba49ba5882d5d Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 21:52:52 +0200
Subject: [PATCH 020/161] Update FacetsPlugin.php

---
 FacetsPlugin.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 7ec1d56..bc51e3b 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -167,30 +167,29 @@ public function showFacets($args)
 		if (!($controller == 'search' && $action == 'index') && !($controller == 'items' && $action == 'browse')) return;
 		
 		$itemsArray = array();
-		$params = array('advanced' => $_GET['advanced'], 'collection' => $_GET['collection'], 'type' => $_GET['type'], 'tags' => $_GET['tags']);
-
-		if (count($items) > 0) {
-			if ($controller == 'items') {
-				$items = get_records('item', $params, null);
+		if ($controller == 'items') {
+			$params = array('advanced' => $_GET['advanced'], 'collection' => $_GET['collection'], 'type' => $_GET['type'], 'tags' => $_GET['tags']);
+			$items = get_records('item', $params, null);
+			if (count($items) > 0) {
 				foreach ($items as $item) {
 					$itemsArray[] = $item->id;
 				}
 				echo get_view()->partial('facets/browse.php', array(
 					'itemsArray' => $itemsArray
 				));
-			} elseif ($controller == 'search') {
-				// this would be for the site-wide simple search;
-				// main problem is that, differently from advanced search,
-				// it uses its own "search_texts" table, so results from that
-				// would have to be crossjoined with the "advanced" ones used
-				// by the facets;
-				// besides, advanced search works only for Items, so one might
-				// want to check whether the site-wide search has been performed
-				// just on Items.
-				if ($recordTypes = $_GET['record_types']) {
-					if (count($recordTypes) == 1 && in_array('Item', $recordTypes)) {
-						// site-wide search was performend just on Items
-					}
+			}
+		} elseif ($controller == 'search') {
+			// this would be for the site-wide simple search;
+			// main problem is that, differently from advanced search,
+			// it uses its own "search_texts" table, so results from that
+			// would have to be crossjoined with the "advanced" ones used
+			// by the facets;
+			// besides, advanced search works only for Items, so one might
+			// want to check whether the site-wide search has been performed
+			// just on Items.
+			if ($recordTypes = $_GET['record_types']) {
+				if (count($recordTypes) == 1 && in_array('Item', $recordTypes)) {
+					// site-wide search was performend just on Items
 				}
 			}
 		}

From 31ff6953ee4aff1cc491486491d23c3c03a2a631 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 8 Jun 2021 21:56:45 +0200
Subject: [PATCH 021/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0390960..11a7892 100644
--- a/Readme.md
+++ b/Readme.md
@@ -41,7 +41,7 @@ Similarly, one can choose to also include <b>Item Types</b>, <b>Collections</b>
 
 Single values can be exluded as not really significant, although they will be listed anyway if less than 10 values are available.
 
-Sorting order can be alphabetical, or first by popularity and then alphabetical.
+Sorting order can be alphabetical, or first by popularity and then alphabetical. Popularity count can be hidden, if needed.
 
 <b>Date</b> element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
 

From 0e9554ddf6578257749023c7c15dfd94e9b5e7f7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 09:43:48 +0200
Subject: [PATCH 022/161] Corrected variable name

---
 helpers/FacetsFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 7667618..24ac46d 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -184,7 +184,7 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 				'item_types.id = items.item_type_id', array())
 			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
 			->group('item_types.id')
-			->order(orderBy);
+			->order($orderBy);
 
 		if ($itemTypes = $table->fetchObjects($select)) {
 			// Build array

From b54e5ffcdb25258e6c681b6cbf63ea1f776ec344 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:26:00 +0200
Subject: [PATCH 023/161] Changed parameter passed to builder functions

Instead of passing an array of already selected Items, we pass the Items subset SQL; this should fix possible issues with very large Items array
---
 helpers/FacetsFunctions.php | 70 ++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 24ac46d..8378c5c 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -14,11 +14,11 @@
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Return, if no Item is available
-		if (empty($itemsArray)) return "";
+	function get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Define Where clause
+		$where = createWhereClause($itemsSubsetSQL);
 
-		// Define Order by clause
+		// Define Order By clause
 		if ($sortOrder == 'count_alpha') {
 			$orderBy = array('tagCount DESC', 'name ASC');
 		} else {
@@ -32,7 +32,7 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 		// Build the select query.
 		$select = $table->getSelectForFindBy();
 		$table->filterByTagType($select, 'Item');
-		$select->where('items.id IN ('. implode(', ', $itemsArray) . ')');
+		$select->where($where);
 		$select->order($orderBy);
 
 		if ($tags = $table->fetchObjects($select)) {
@@ -53,7 +53,7 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 			}			
 
 			$addOptions = false;
-			// get current parameters to check if one is selected
+			// Build first part of the select tag
 			if ($selectedTagName != '') {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
 				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('tags', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
@@ -64,6 +64,7 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 				$addOptions = true;
 			}
 
+			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetTags as $tag) {
 					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl('tags', $tag['name']) . "\">" . $tag['name'] . ($hidePopularity ? "" : " (" . $tag['count'] . ")") . "</option>";
@@ -86,9 +87,9 @@ function get_tags_facet_select($itemsArray = array(), $hideSingleEntries = false
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Return, if no Item is available
-		if (empty($itemsArray)) return "";
+	function get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Define Where clause
+		$where = createWhereClause($itemsSubsetSQL);
 
 		// Get the database.
 		$db = get_db();
@@ -99,7 +100,7 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 			->columns('COUNT(collections.id) AS count')
 			->joinInner(array('items' => $db->Items),
 				'collections.id = items.collection_id', array())
-			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->where($where)
 			->group('collections.id');
 
 		if ($collections = $table->fetchObjects($select)) {
@@ -121,7 +122,7 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 				$facetCollections = array_filter($facetCollections, "isNotSingleEntry");
 			}			
 
-			// Sort array
+			// Sort array (have to do it now instead than in select because of the way we get the Collection name)
 			if ($sortOrder == 'count_alpha') {
 				array_multisort(array_column($facetCollections, 'count'), SORT_DESC, array_column($facetCollections, 'name'), SORT_ASC, $facetCollections);
 			} else {
@@ -129,7 +130,7 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 			}
 
 			$addOptions = false;
-			// get current parameters to check if one is selected
+			// Build first part of the select tag
 			if (isset($selectedCollection)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"collection\">";
 				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('collection', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
@@ -140,6 +141,7 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 				$addOptions = true;
 			}
 
+			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetCollections as $collection) {
 					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . ($hidePopularity ? "" : " (" . $collection['count'] . ")") . "</option>";
@@ -162,9 +164,9 @@ function get_collections_facet_select($itemsArray = array(), $hideSingleEntries
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Return, if no Item is available
-		if (empty($itemsArray)) return "";
+	function get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Define Where clause
+		$where = createWhereClause($itemsSubsetSQL);
 
 		// Define Order by clause
 		if ($sortOrder == 'count_alpha') {
@@ -182,7 +184,7 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 			->columns('COUNT(item_types.id) AS count')
 			->joinInner(array('items' => $db->Items),
 				'item_types.id = items.item_type_id', array())
-			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->where($where)
 			->group('item_types.id')
 			->order($orderBy);
 
@@ -206,7 +208,7 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 			}			
 
 			$addOptions = false;
-			// get current parameters to check if one is selected
+			// Build first part of the select tag
 			if (isset($selectedItemType)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"type\">";
 				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
@@ -217,6 +219,7 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 				$addOptions = true;
 			}
 
+			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetItemTypes as $itemType) {
 					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . ($hidePopularity ? "" : " (" . $itemType['count'] . ")") . "</option>";
@@ -241,13 +244,10 @@ function get_item_types_facet_select($itemsArray = array(), $hideSingleEntries =
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		if (empty($itemsArray)) return "";
-		
-		// Get the database.
-		$db = get_db();
-		// Get the table.
-		$table = $db->getTable('ElementText');
+	function get_dc_facet_select($itemsSubsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Define Where clause
+		$where = createWhereClause($itemsSubsetSQL);
+
 		// Create the orderby rules
 		if ($isDate) {
 			$groupBy = 'year';
@@ -264,6 +264,11 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 				$orderBy = array('text ASC');
 			}
 		}
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('ElementText');
 		// Build the select query.
 		$select = $table->getSelect()
 			->columns(array('SUBSTR(element_texts.text, 1, 4) AS year', 'COUNT(text) AS count'))
@@ -275,7 +280,7 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 				'items.id = element_texts.record_id', array())
 			->where('element_sets.name = '. $db->quote('Dublin Core'))
 			->where('elements.name = '. $db->quote($dcElementName))
-			->where('items.id IN ('. implode(', ', $itemsArray) . ')')
+			->where($where)
 			->group($groupBy)
 			->order($orderBy);
 		
@@ -291,13 +296,12 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 			}
 			$element_id = $element->element_id;
 
-			// remove single entries if required
+			// Remove single entries if required
 			if ($hideSingleEntries && count($facet) > FACETS_MINIMUM_AMOUNT) {
 				$facet = array_filter($facet, "isNotSingleEntry");
 			}			
 
-			// get current parameters to check if one is selected
-			// Get the current facets.
+			// Get current parameters to check if one is selected
 			if (!empty($_GET['advanced'])) {
 				$search = $_GET['advanced'];
 				foreach ($search as $Searchindex => $SearchArray){
@@ -309,6 +313,7 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 			}
 
 			$addOptions = false;
+			// Build first part of the select tag
 			if (isset($term)){
 				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $dcElementName . "\">";
 				$url = getElementFieldUrl($element_id, null, $isDate);
@@ -320,6 +325,7 @@ function get_dc_facet_select($itemsArray = array(), $dcElementName = 'Title', $i
 				$addOptions = true;
 			}
 
+			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facet as $name => $count) {
 					$url = getElementFieldUrl($element_id, $name, $isDate);
@@ -422,4 +428,12 @@ function isFacetActive($element_name, $settings) {
 	function isNotSingleEntry($count) {
 		return ($count != 1);
 	}
+	
+	function createWhereClause($sql) {
+		if ($sql != '') {
+			return 'items.id IN (' . $sql . ')';
+		} else {
+			return '1=1';
+		}
+	}
 ?>

From bb8bfa6dd11d0f540c187f9ed75316d44ae41050 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:26:53 +0200
Subject: [PATCH 024/161] Changed parameter passed to builder functions

---
 views/public/facets/browse.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 8074396..359e6ef 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -4,7 +4,7 @@
 	$facetTags = array();
 	$facetsElements = json_decode(get_option('facets_elements'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
-	$sortOrder = get_option('facets_sort_order');
+	$sortOrder = (string)get_option('facets_sort_order');
 	$hidePopularity = (bool)get_option('facets_hide_popularity');
 
 	$table = get_db()->getTable('Element');
@@ -14,6 +14,8 @@
 		->order('ISNULL(elements.order)')
 		->order('elements.order');
 	$elements = $table->fetchObjects($select);
+	
+	$itemsSubsetSQL = str_replace('`items`.*', '`items`.`id`', (string)get_db()->getTable('Item')->getSelectForFindBy($params));
 ?>
 
 <div class="search-container">
@@ -30,7 +32,7 @@
 				foreach ($elements as $element) {
 					if (isFacetActive($element->name, $facetsElements)) {
 						$isDate = in_array($element->name, array('Date'));
-						if ($html = get_dc_facet_select($itemsArray, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+						if ($html = get_dc_facet_select($itemsSubsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 							echo "</div>";
@@ -42,7 +44,7 @@
 
 			<?php
 				if (get_option('facets_item_types')) {
-					if ($html = get_item_types_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if ($html = get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 						echo "</div>";
@@ -53,7 +55,7 @@
 			
 			<?php
 				if (get_option('facets_collections')) {
-					if ($html = get_collections_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if ($html = get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
 						echo "</div>";
@@ -64,7 +66,7 @@
 
 			<?php
 				if (get_option('facets_tags')) {
-					if ($html = get_tags_facet_select($itemsArray, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if ($html = get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 						echo "<div class=\"container-fluid\">\n";
 						echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
 						echo "</div>";

From b36fc2d4f0269d74db04a4bafff340c8a7352017 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 10:27:55 +0200
Subject: [PATCH 025/161] Modified showFacets function

---
 FacetsPlugin.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index bc51e3b..e5b5e84 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -163,22 +163,20 @@ public function showFacets($args)
 		$controller = $request->getControllerName();
 		$action = $request->getActionName();
 		
-		// checks whether it's one of the facet cases
-		if (!($controller == 'search' && $action == 'index') && !($controller == 'items' && $action == 'browse')) return;
-		
-		$itemsArray = array();
-		if ($controller == 'items') {
-			$params = array('advanced' => $_GET['advanced'], 'collection' => $_GET['collection'], 'type' => $_GET['type'], 'tags' => $_GET['tags']);
-			$items = get_records('item', $params, null);
-			if (count($items) > 0) {
-				foreach ($items as $item) {
-					$itemsArray[] = $item->id;
-				}
+		if ($controller == 'items' && $action == 'browse') {
+			$params = array(
+				'advanced' => $_GET['advanced'], 
+				'collection' => $_GET['collection'], 
+				'type' => $_GET['type'], 
+				'tags' => $_GET['tags']
+			);
+			if (count(get_records('item', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
-					'itemsArray' => $itemsArray
+					'itemsArray' => $itemsArray,
+					'params' => $params
 				));
 			}
-		} elseif ($controller == 'search') {
+		} elseif ($controller == 'search' && $action == 'index') {
 			// this would be for the site-wide simple search;
 			// main problem is that, differently from advanced search,
 			// it uses its own "search_texts" table, so results from that
@@ -189,7 +187,7 @@ public function showFacets($args)
 			// just on Items.
 			if ($recordTypes = $_GET['record_types']) {
 				if (count($recordTypes) == 1 && in_array('Item', $recordTypes)) {
-					// site-wide search was performend just on Items
+					// site-wide search was performed just on Items
 				}
 			}
 		}

From 0ec47159de0c587b4d5a002409aac487b7ba5054 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:52:03 +0200
Subject: [PATCH 026/161] Added feature for Collections

---
 config_form.php | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/config_form.php b/config_form.php
index 283e8f1..05f721f 100644
--- a/config_form.php
+++ b/config_form.php
@@ -16,14 +16,14 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('The hook you want to use: Omeka\'s default <code>public_items_browse</code>, already coded into every page (so no change is needed), normally showing up at the end of the page; or the plugin\'s own <code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right.'); ?>
+			<?php echo __('The hooks you want to use: Omeka\'s default <code>public_items_browse</code> and <code>public_collections_browse</code>, already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin\'s own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right.'); ?>
 		</p>
 		<?php echo $view->formRadio('facets_public_hook',
 			get_option('facets_public_hook'),
 			null,
 			array(
-				'public_items_browse' => __('public_items_browse'),
-				'public_items_facets' => __('public_items_facets'),
+				'default' => 'public_items_browse + public_collections_browse',
+				'custom' => 'public_facets',
 			)); 
 		?>
     </div>
@@ -99,8 +99,9 @@
 		<table id="facets_elements-table">
 			<thead>
 				<tr>
-					<th class="boxes"><?php echo __('Element'); ?></th>
-					<th class="boxes"><?php echo __('Active'); ?></th>
+					<th class="boxes"><?php echo __('Element name'); ?></th>
+					<th class="boxes"><?php echo __('Item'); ?></th>
+					<th class="boxes"><?php echo __('Collection'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -119,6 +120,16 @@
 							)
 						); ?>
 					</td>
+					<td class="boxes">
+						<?php echo $view->formCheckbox(
+							"collection_elements[{$element->set_name}][{$element->name}]",
+							'1', 
+							array(
+								'disableHidden' => true,
+								'checked' => isset($settings['collection_elements'][$element->set_name][$element->name])
+							)
+						); ?>
+					</td>
 				</tr>
 			<?php 
 				endforeach;
@@ -134,7 +145,7 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, search refinement by Item Type will be available.'); ?>
+			<?php echo __('If checked, search refinement by Item Type will be available (Items only).'); ?>
 		</p>
 		<?php echo $view->formCheckbox('facets_item_types', get_option('facets_item_types'), null, array('1', '0')); ?>
     </div>
@@ -146,7 +157,7 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, search refinement by Collection will be available.'); ?>
+			<?php echo __('If checked, search refinement by Collection will be available (Items only).'); ?>
 		</p>
 		<?php echo $view->formCheckbox('facets_collections', get_option('facets_collections'), null, array('1', '0')); ?>
     </div>
@@ -158,7 +169,7 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, search refinement by Tag will be available.'); ?>
+			<?php echo __('If checked, search refinement by Tag will be available (Items only).'); ?>
 		</p>
 		<?php echo $view->formCheckbox('facets_tags', get_option('facets_tags'), null, array('1', '0')); ?>
     </div>

From 1a7269a049a67aa3c4f076313a560f1e185439cf Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:52:48 +0200
Subject: [PATCH 027/161] Extended feature to Collections

---
 views/public/facets/browse.php | 85 ++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 36 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 359e6ef..8fc63c7 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -15,7 +15,11 @@
 		->order('elements.order');
 	$elements = $table->fetchObjects($select);
 	
-	$itemsSubsetSQL = str_replace('`items`.*', '`items`.`id`', (string)get_db()->getTable('Item')->getSelectForFindBy($params));
+	if ($recordType == 'item') {
+		$subsetSQL = str_replace('`items`.*', '`items`.`id`', (string)get_db()->getTable('Item')->getSelectForFindBy($params));
+	} else {
+		$subsetSQL = str_replace('`collections`.*', '`collections`.`id`', (string)get_db()->getTable('Collection')->getSelectForFindBy($params));
+	}
 ?>
 
 <div class="search-container">
@@ -27,50 +31,59 @@
 				echo "<h5>" . $description . "</h5>\n";
 			}
 		?>
+		
 		<form class="" action="index.html" method="post">
 			<?php
-				foreach ($elements as $element) {
-					if (isFacetActive($element->name, $facetsElements)) {
-						$isDate = in_array($element->name, array('Date'));
-						if ($html = get_dc_facet_select($itemsSubsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+				if ($recordType == 'collection') {
+					foreach ($elements as $element) {
+						if (isFacetActive($recordType, $element->name, $facetsElements)) {
+							$isDate = in_array($element->name, array('Date'));
+							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+								echo "<div class=\"container-fluid\">\n";
+								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
+								echo "</div>";
+								echo $html;
+							}
+						}
+					}
+				} else {	
+					foreach ($elements as $element) {
+						if (isFacetActive($recordType, $element->name, $facetsElements)) {
+							$isDate = in_array($element->name, array('Date'));
+							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+								echo "<div class=\"container-fluid\">\n";
+								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
+								echo "</div>";
+								echo $html;
+							}
+						}
+					}
+
+					if (get_option('facets_item_types')) {
+						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
 							echo "<div class=\"container-fluid\">\n";
-							echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
+							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 							echo "</div>";
 							echo $html;
 						}
 					}
-				}
-			?>
 
-			<?php
-				if (get_option('facets_item_types')) {
-					if ($html = get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
-						echo "<div class=\"container-fluid\">\n";
-						echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
-						echo "</div>";
-						echo $html;
-					}
-				}
-			?>
-			
-			<?php
-				if (get_option('facets_collections')) {
-					if ($html = get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
-						echo "<div class=\"container-fluid\">\n";
-						echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
-						echo "</div>";
-						echo $html;
+					if (get_option('facets_collections')) {
+						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+							echo "<div class=\"container-fluid\">\n";
+							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
+							echo "</div>";
+							echo $html;
+						}
 					}
-				}
-			?>
 
-			<?php
-				if (get_option('facets_tags')) {
-					if ($html = get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
-						echo "<div class=\"container-fluid\">\n";
-						echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
-						echo "</div>";
-						echo $html;
+					if (get_option('facets_tags')) {
+						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+							echo "<div class=\"container-fluid\">\n";
+							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
+							echo "</div>";
+							echo $html;
+						}
 					}
 				}
 			?>
@@ -81,7 +94,7 @@
 	window.jQuery( document ).ready(function() {
 		window.jQuery('select').change(function() {
 			var option = window.jQuery(this).find('option:selected');
-			window.location.href = option.data("url");
+			if (typeof(option.data("url")) !== 'undefined') window.location.href = option.data("url");
 		});
 	});
 </script>

From 607f34400955b67c324ca7f92eabc8d0ba7fea4e Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:54:05 +0200
Subject: [PATCH 028/161] Extended feature to Collections, improved Single
 Entries exclusion

---
 helpers/FacetsFunctions.php | 95 ++++++++++++++++++++++---------------
 1 file changed, 56 insertions(+), 39 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 8378c5c..bd8af4f 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -14,9 +14,9 @@
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Define Where clause
-		$where = createWhereClause($itemsSubsetSQL);
+	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Create Where clause
+		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
 		// Define Order By clause
 		if ($sortOrder == 'count_alpha') {
@@ -32,7 +32,7 @@ function get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sor
 		// Build the select query.
 		$select = $table->getSelectForFindBy();
 		$table->filterByTagType($select, 'Item');
-		$select->where($where);
+		$select->where($whereSubset);
 		$select->order($orderBy);
 
 		if ($tags = $table->fetchObjects($select)) {
@@ -48,7 +48,7 @@ function get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sor
 			$selectedTagName = $_GET['tags'];
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count($facetTags) > FACETS_MINIMUM_AMOUNT) {
+			if ($hideSingleEntries && count(array_filter($facetTags, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
 				$facetTags = array_filter($facetTags, "isNotSingleEntry");
 			}			
 
@@ -87,9 +87,9 @@ function get_tags_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sor
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Define Where clause
-		$where = createWhereClause($itemsSubsetSQL);
+	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Create Where clause
+		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
 		// Get the database.
 		$db = get_db();
@@ -100,7 +100,7 @@ function get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries = fals
 			->columns('COUNT(collections.id) AS count')
 			->joinInner(array('items' => $db->Items),
 				'collections.id = items.collection_id', array())
-			->where($where)
+			->where($whereSubset)
 			->group('collections.id');
 
 		if ($collections = $table->fetchObjects($select)) {
@@ -118,7 +118,7 @@ function get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries = fals
 			}
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count($facetCollections) > FACETS_MINIMUM_AMOUNT) {
+			if ($hideSingleEntries && count(array_filter($facetCollections, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
 				$facetCollections = array_filter($facetCollections, "isNotSingleEntry");
 			}			
 
@@ -164,9 +164,9 @@ function get_collections_facet_select($itemsSubsetSQL, $hideSingleEntries = fals
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Define Where clause
-		$where = createWhereClause($itemsSubsetSQL);
+	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Create Where Subset clause
+		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
 		// Define Order by clause
 		if ($sortOrder == 'count_alpha') {
@@ -184,7 +184,7 @@ function get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries = false
 			->columns('COUNT(item_types.id) AS count')
 			->joinInner(array('items' => $db->Items),
 				'item_types.id = items.item_type_id', array())
-			->where($where)
+			->where($whereSubset)
 			->group('item_types.id')
 			->order($orderBy);
 
@@ -203,7 +203,7 @@ function get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries = false
 			}
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count($facetItemTypes) > FACETS_MINIMUM_AMOUNT) {
+			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
 				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleEntry");
 			}			
 
@@ -244,12 +244,14 @@ function get_item_types_facet_select($itemsSubsetSQL, $hideSingleEntries = false
 	 * @param hidePopularity
 	 * @return html.
 	 */
-	function get_dc_facet_select($itemsSubsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
-		// Define Where clause
-		$where = createWhereClause($itemsSubsetSQL);
+	function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+		// Create Where clauses
+		$whereRecordType = createWhereRecordTypeClause($recordType);
+		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
 
-		// Create the orderby rules
+		// Create the columns, groupBy and orderBy clauses
 		if ($isDate) {
+			$columns = array('SUBSTR(element_texts.text, 1, 4) AS year', 'COUNT(text) AS count');
 			$groupBy = 'year';
 			if ($sortOrder == 'count_alpha') {
 				$orderBy = array('count DESC', 'year DESC');
@@ -257,6 +259,7 @@ function get_dc_facet_select($itemsSubsetSQL, $dcElementName = 'Title', $isDate
 				$orderBy = array('year DESC');
 			}
 		} else {
+			$columns = array('COUNT(text) AS count');
 			$groupBy = 'text';
 			if ($sortOrder == 'count_alpha') {
 				$orderBy = array('count DESC', 'text ASC');
@@ -270,21 +273,27 @@ function get_dc_facet_select($itemsSubsetSQL, $dcElementName = 'Title', $isDate
 		// Get the table.
 		$table = $db->getTable('ElementText');
 		// Build the select query.
-		$select = $table->getSelect()
-			->columns(array('SUBSTR(element_texts.text, 1, 4) AS year', 'COUNT(text) AS count'))
-			->joinInner(array('elements' => $db->Elements),
-				'element_texts.element_id = elements.id', array())
-			->joinInner(array('element_sets' => $db->ElementSet),
-				'element_sets.id = elements.element_set_id', array())
-			->joinInner(array('items' => $db->Item),
-				'items.id = element_texts.record_id', array())
-			->where('element_sets.name = '. $db->quote('Dublin Core'))
-			->where('elements.name = '. $db->quote($dcElementName))
-			->where($where)
-			->group($groupBy)
-			->order($orderBy);
-		
-		// Build table
+		$select = $table->getSelect();
+		$select->columns($columns);
+		$select->joinInner(array('elements' => $db->Elements),
+				'element_texts.element_id = elements.id', array());
+		$select->joinInner(array('element_sets' => $db->ElementSet),
+				'element_sets.id = elements.element_set_id', array());
+		if ($recordType == 'item') {
+			$select->joinInner(array('items' => $db->Item),
+					'items.id = element_texts.record_id', array());
+		} else {
+			$select->joinInner(array('collections' => $db->Collection),
+					'collections.id = element_texts.record_id', array());
+		}
+		$select->where('element_sets.name = '. $db->quote('Dublin Core'));
+		$select->where('elements.name = '. $db->quote($dcElementName));
+		$select->where($whereRecordType);
+		$select->where($whereSubset);
+		$select->group($groupBy);
+		$select->order($orderBy);
+
+		// Build array
 		if ($elements = $table->fetchObjects($select)) {
 			$facet = array();
 			foreach ($elements as $element) {
@@ -297,7 +306,7 @@ function get_dc_facet_select($itemsSubsetSQL, $dcElementName = 'Title', $isDate
 			$element_id = $element->element_id;
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count($facet) > FACETS_MINIMUM_AMOUNT) {
+			if ($hideSingleEntries && count(array_filter($facet, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
 				$facet = array_filter($facet, "isNotSingleEntry");
 			}			
 
@@ -421,19 +430,27 @@ function getFieldUrl($filter, $value = null)
 		return 'browse?' . http_build_query($params);
 	}
 	
-	function isFacetActive($element_name, $settings) {
-		return ($settings['item_elements']['Dublin Core'][$element_name] == 1);
+	function isFacetActive($recordType, $element_name, $settings) {
+		return ($settings[$recordType . '_elements']['Dublin Core'][$element_name] == 1);
 	}
 	
 	function isNotSingleEntry($count) {
 		return ($count != 1);
 	}
 	
-	function createWhereClause($sql) {
+	function createWhereRecordTypeClause($recordType) {
+		return 'element_texts.record_type = \'' . ucfirst($recordType) . '\'';
+	}
+	
+	function createWhereSubsetClause($recordType, $sql) {
 		if ($sql != '') {
-			return 'items.id IN (' . $sql . ')';
+			return $recordType . 's.id IN (' . $sql . ')';
 		} else {
 			return '1=1';
 		}
 	}
+	
+	function excludeSingleValues($element) {
+		if ($element > 1) return $element;
+	}
 ?>

From e49aed0d15f5b9af2c509e49eeade3fb73af2af5 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:54:37 +0200
Subject: [PATCH 029/161] Extended feature to Collections

---
 FacetsPlugin.php | 169 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 151 insertions(+), 18 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index e5b5e84..d0958ad 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -9,7 +9,7 @@
 if (!defined('FACETS_PLUGIN_DIR')) {
 	define('FACETS_PLUGIN_DIR', dirname(__FILE__));
 }
-define('FACETS_MINIMUM_AMOUNT', 10);
+define('FACETS_MINIMUM_AMOUNT', 5);
 
 require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
 
@@ -22,9 +22,11 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 		'config_form',
 		'config',
 		'define_routes',
+        'collections_browse_sql',
 		'public_head',
 		'public_items_browse',
-		'public_items_facets'
+		'public_collections_browse',
+		'public_facets'
 	);
 
 	/**
@@ -32,14 +34,15 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 	 */
 	public function hookInstall()
 	{
-		set_option('facets_public_hook', 'public_items_browse');
+		set_option('facets_public_hook', 'default');
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
 		set_option('facets_sort_order', 'count_alpha');
 		set_option('facets_hide_popularity', 0);
 
 		$defaults = array(
-			'item_elements' => array()
+			'item_elements' => array(),
+			'collection_elements' => array()
 		);
 		set_option('facets_elements', json_encode($defaults));
 		set_option('facets_item_types', 1);
@@ -68,7 +71,7 @@ public function hookUninstall()
 	 */
 	public function hookInitialize()
 	{
-		add_translation_source(dirname(__FILE__) . '/languages');
+        add_translation_source(dirname(__FILE__) . '/languages');
 
 		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
 
@@ -108,7 +111,8 @@ public function hookConfig($args)
 		set_option('facets_hide_popularity', $post['facets_hide_popularity']);
 
 		$settings = array(
-			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array()
+			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array(),
+			'collection_elements' => isset($post['collection_elements']) ? $post['collection_elements'] : array()
 		);
 		set_option('facets_elements', json_encode($settings));
 
@@ -117,11 +121,6 @@ public function hookConfig($args)
 		set_option('facets_tags', $post['facets_tags']);
 	}
 
-	public function hookPublicHead($args)
-	{
-		queue_css_file('facets');
-	}
-
 	public function hookDefineRoutes($args)
 	{
 		if (is_admin_theme()) {
@@ -143,26 +142,150 @@ public function hookDefineRoutes($args)
 		);
 	}
 
+    /**
+     * Hook into collections_browse_sql
+     *
+     * @select array $args
+     * @params array $args
+     */
+    public function hookCollectionsBrowseSql($args)
+    {
+        $db = $this->_db;
+        $select = $args['select'];
+        $params = $args['params'];
+		
+		if (strpos($select, '_advanced') !== false) return;
+        
+        if ($advancedTerms = @$params['advanced']) {
+            $where = '';
+            $advancedIndex = 0;
+            foreach ($advancedTerms as $v) {
+                // Do not search on blank rows.
+                if (empty($v['element_id']) || empty($v['type'])) {
+                    continue;
+                }
+
+                $value = isset($v['terms']) ? $v['terms'] : null;
+                $type = $v['type'];
+                $elementId = (int) $v['element_id'];
+                $alias = "_advanced_{$advancedIndex}";
+
+                $joiner = isset($v['joiner']) && $advancedIndex > 0 ? $v['joiner'] : null;
+
+                $negate = false;
+                // Determine what the WHERE clause should look like.
+                switch ($type) {
+                    case 'does not contain':
+                        $negate = true;
+                    case 'contains':
+                        $predicate = "LIKE " . $db->quote('%'.$value .'%');
+                        break;
+
+                    case 'is not exactly':
+                        $negate = true;
+                    case 'is exactly':
+                        $predicate = ' = ' . $db->quote($value);
+                        break;
+
+                    case 'is empty':
+                        $negate = true;
+                    case 'is not empty':
+                        $predicate = 'IS NOT NULL';
+                        break;
+
+                    case 'starts with':
+                        $predicate = "LIKE " . $db->quote($value.'%');
+                        break;
+
+                    case 'ends with':
+                        $predicate = "LIKE " . $db->quote('%'.$value);
+                        break;
+
+                    case 'does not match':
+                        $negate = true;
+                    case 'matches':
+                        if (!strlen($value)) {
+                            continue 2;
+                        }
+                        $predicate = 'REGEXP ' . $db->quote($value);
+                        break;
+
+                    default:
+                        throw new Omeka_Record_Exception(__('Invalid search type given!'));
+                }
+
+                $predicateClause = "{$alias}.text {$predicate}";
+
+                // Note that $elementId was earlier forced to int, so manual quoting
+                // is unnecessary here
+                $joinCondition = "{$alias}.record_id = collections.id AND {$alias}.record_type = 'Collection' AND {$alias}.element_id = $elementId";
+
+                if ($negate) {
+                    $joinCondition .= " AND {$predicateClause}";
+                    $whereClause = "{$alias}.text IS NULL";
+                } else {
+                    $whereClause = $predicateClause;
+                }
+
+                $select->joinLeft(array($alias => $db->ElementText), $joinCondition, array());
+                if ($where == '') {
+                    $where = $whereClause;
+                } elseif ($joiner == 'or') {
+                    $where .= " OR $whereClause";
+                } else {
+                    $where .= " AND $whereClause";
+                }
+
+                $advancedIndex++;
+            }
+
+            if ($where) {
+                $select->where($where);
+            }
+        }            
+    }
+
+	public function hookPublicHead($args)
+	{
+		$request = Zend_Controller_Front::getInstance()->getRequest();
+		$controller = $request->getControllerName();
+		$action = $request->getActionName();
+ 		
+		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
+			queue_css_file('facets');
+		}
+	}
+
 	public function hookPublicItemsBrowse($args)
 	{
-		if (get_option('facets_public_hook') == 'public_items_browse') {
+		$settings = $this->_settings;
+		if (get_option('facets_public_hook') == 'default') {
 			self::showFacets($args);
 		}
 	}
 	
-	public function hookPublicItemsFacets($args)
+	public function hookPublicCollectionsBrowse($args)
 	{
-		if (get_option('facets_public_hook') == 'public_items_facets') {
+		$settings = $this->_settings;
+		if (get_option('facets_public_hook') == 'default') {
+			self::showFacets($args);
+		}
+	}
+	
+	public function hookPublicFacets($args)
+	{
+		if (get_option('facets_public_hook') == 'custom') {
 			self::showFacets($args);
 		}
 	}
 
 	public function showFacets($args)
 	{
+		$settings = $this->_settings;
 		$request = Zend_Controller_Front::getInstance()->getRequest();
 		$controller = $request->getControllerName();
 		$action = $request->getActionName();
-		
+ 		
 		if ($controller == 'items' && $action == 'browse') {
 			$params = array(
 				'advanced' => $_GET['advanced'], 
@@ -170,10 +293,20 @@ public function showFacets($args)
 				'type' => $_GET['type'], 
 				'tags' => $_GET['tags']
 			);
-			if (count(get_records('item', $params, null)) > 0) {
+			if (count($settings['item_elements']) > 0 && count(get_records('item', $params, null)) > 0) {
+				echo get_view()->partial('facets/browse.php', array(
+					'params' => $params,
+					'recordType' => 'item'
+				));
+			}
+		} elseif ($controller == 'collections' && $action == 'browse') {
+			$params = array(
+				'advanced' => $_GET['advanced']
+			);
+			if (count($settings['collection_elements']) > 0 && count(get_records('collection', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
-					'itemsArray' => $itemsArray,
-					'params' => $params
+					'params' => $params,
+					'recordType' => 'collection'
 				));
 			}
 		} elseif ($controller == 'search' && $action == 'index') {

From 2154e1335afb2b47ab66329eec353110b7bbcf95 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:56:16 +0200
Subject: [PATCH 030/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 11a7892..d26483a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -12,7 +12,7 @@ Settings allow to choose the hook to be used, which elements use for search refi
 
 Original development is part of the [Armarium](https://www.armarium-hautsdefrance.fr/) Project, managed by the french association [AR2L Hauts de France](http://www.ar2l-hdf.fr/).
 
-Fixed and improved version by [DBinaghi].
+Fixed and improved version by [DBinaghi](https://github.com/DBinaghi).
 
 ## Installation
 Uncompress files and rename plugin folder "Facets".

From 4f7ed84f115559c2162ad5df7182018ee4df8144 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:56:49 +0200
Subject: [PATCH 031/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 56f30a7..8d1b305 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -1,6 +1,6 @@
 [info]
 name = "Facets"
-author = "Jean-Baptiste HEREN, Daniele BINAGHI"
+author = "Jean-Baptiste HEREN and Daniele BINAGHI"
 description="Filter browse/advanced search using facets"
 license="GPLv3"
 link=""

From b8e5366fb1aa8d4e097252a31275725fb086ad19 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 9 Jun 2021 15:14:26 +0200
Subject: [PATCH 032/161] Files updated, addes esperanto language

---
 languages/eo.mo        | Bin 0 -> 543 bytes
 languages/eo.po        | 138 +++++++++++++++++++++++++++++++++++++++++
 languages/it.mo        | Bin 3349 -> 3896 bytes
 languages/it.po        |  54 +++++++++-------
 languages/template.pot |  34 +++++-----
 5 files changed, 188 insertions(+), 38 deletions(-)
 create mode 100644 languages/eo.mo
 create mode 100644 languages/eo.po

diff --git a/languages/eo.mo b/languages/eo.mo
new file mode 100644
index 0000000000000000000000000000000000000000..85390589f090f8bbb1aace50e4d6355c027100ee
GIT binary patch
literal 543
zcmYLG!EO^V5H+YmVkJ=369*2yBWIIVpvVN&wAq%3Y*Q^;BoG{&&D1+|W3TMlib~u#
z@d5l1-@#{a?xd;6NKbEUzwwOy{_gGk792Z_=Zw*M!SQ87cf8B_SH=^DV?1K~V1x%k
z{AAu^{Nwy7^W%q`^JmPWfJ<~BBbZRta&f~OD}N305*vabK0pH%iSyvUF{|lPeS{Fv
zJ1w~q0=Np20$LwP<<a6&9d$OU(rZ~0wK`2LQr#_jm0zV3;}9D4K2QJGrWj)fF*%=?
z>NtQQzFJKTftLII{ekMgQvIPE9O##vaIjDnaE<E`?scECaiQ|LnvCVUxz49AKF`mx
zWM(3%G8h*dLq2G^X%6xTov}5_ky)<L9WIbO!IkeJz2zcjJ7YnWU{+er#%HG&<I_xz
zX0yWvdp_8$MoaKXKFzc3j|_VK<k&j`$E|N#egnaGO54Vudo8Qlgb4KJqC8Q<t!_Oc
sf27J><(KHJmP4K?5rtu6kc|m{et9QbHsizxw0LJt@J?h6Tu~=(0jMFI&Hw-a

literal 0
HcmV?d00001

diff --git a/languages/eo.po b/languages/eo.po
new file mode 100644
index 0000000..f70c673
--- /dev/null
+++ b/languages/eo.po
@@ -0,0 +1,138 @@
+# Translation for the Facets plugin for Omeka.
+# This file is distributed under the same license as the Omeka plugin.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Reference\n"
+"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: browse.php:22
+msgid "Refine search by"
+msgstr "Rafini serĉon per"
+
+#: FacetsFunctions.php:59
+#: FacetsFunctions.php:135
+#: FacetsFunctions.php:212
+#: FacetsFunctions.php:315
+msgid "Remove filter"
+msgstr "Forigi filtron"
+
+#: FacetsFunctions.php:63
+#: FacetsFunctions.php:139
+#: FacetsFunctions.php:216
+#: FacetsFunctions.php:319
+msgid "Select"
+msgstr "Elektu"
+
+#: config_form.php:11
+msgid "Use"
+msgstr ""
+
+#: config_form.php:15
+msgid "Public hooks"
+msgstr ""
+
+#: config_form.php:19
+msgid ""
+"The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
+"already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
+"own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
+msgstr ""
+
+#: config_form.php:32
+msgid "Aspect"
+msgstr ""
+
+#: config_form.php:36
+msgid "Description"
+msgstr ""
+
+#: config_form.php:40
+msgid "Text to be used as additional description (tip: keep it short)."
+msgstr ""
+
+#: config_form.php:48
+msgid "Hide single entries"
+msgstr ""
+
+#: config_form.php:52
+msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
+msgstr ""
+
+#: config_form.php:60
+msgid "Sort order"
+msgstr ""
+
+#: config_form.php:64
+msgid "The sorting order for values in select fields."
+msgstr ""
+
+#: config_form.php:70
+msgid "Alphabetical"
+msgstr ""
+
+#: config_form.php:71
+msgid "Popularity first, then alphabetical"
+msgstr ""
+
+#: config_form.php:79
+msgid "Hide popularity"
+msgstr ""
+
+#: config_form.php:83
+msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
+msgstr ""
+
+#: config_form.php:89
+msgid "Elements"
+msgstr ""
+
+#: config_form.php:97
+msgid "The Dublin Core elements that can be used for search refinement."
+msgstr ""
+
+#: config_form.php:102
+msgid "Element name"
+msgstr ""
+
+#: config_form.php:103
+msgid "Item"
+msgstr ""
+
+#: config_form.php:104
+msgid "Collection"
+msgstr ""
+
+#: config_form.php:144
+msgid "Item Types"
+msgstr ""
+
+#: config_form.php:148
+msgid "If checked, search refinement by Item Type will be available (Items only)."
+msgstr ""
+
+#: config_form.php:156
+msgid "Collections"
+msgstr ""
+
+#: config_form.php:160
+msgid "If checked, search refinement by Collection will be available (Items only)."
+msgstr ""
+
+#: config_form.php:168
+msgid "Tags"
+msgstr ""
+
+#: config_form.php:172
+msgid "If checked, search refinement by Tag will be available (Items only)."
+msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index 4d223c2abdf220d7926d5ae76e68344b3d45a56f..e80aafa0d6500a1d6f5bdc3ca9853211f734335b 100644
GIT binary patch
delta 911
zcmZ|MPe>F|9Ki9n|6SLAm8Pl56Gil3?Mg|Sl%^Ca*2Soku{-<7$=Q9Yvl|$J2tpmY
z#6yS<K~P9Sm%4a~gf5-x(4ioRZXU`aB8(2v_kmFq4m0obesA9Ve)F4IZd_|wc(*&e
zEI9UaHFJdnHWK3FUse!r5=Zd|mSZ3&L;@?eZ9u!P9m_C<)!2`Fa16(B3de92M}$}q
z-<WuIV@Qa3T){B5GT1^L*oG;z1<qm(X0Q@{v@f=ZcK>zc6o%nA-oinAgLkO4FCxSN
z;<cC%A?k|_CUbQ40d0b*xDZT*i#DF!_A1(ruc0k$&~|zkYjG9p@hN8UH5PDyBo01A
zjk`#)go_xbzKGJ6{X{j`itT6%oW#92iB&j*<P=x14wts$+c-vi4=3?6KA@oyk_-}m
z;$i!u2krkD@(R=Gj4HZL+7m;5bwN2rF|0igU7a^u0U43`bWWN2;7q0L94)GxFLmCV
z?=tJbHgiAN^xx`{e^$N+H_iLd(SUE7!t0E0!zY?$I-ivTj?SuMg;K_IoeR#NqE(TB
zh%eJ~%1lJgnbk=4@vCqmSl5&6Np&ZCyOVt~b+|v-*PY}rU!%{=lUP$gnHRB!=xLo(
zQkjj|jXK%sYfsC9nv)~iDdkkY=ysWxWrxg4S?7*-&+KrgCB7B^okpA5^5KAM&X<4b
zIOVx=TI(6<Oe^WT^0L0@@!_;A`83ckXG_ZSTyrVW+bGqJ9p6ky@;yq7GyY7Bnu&_%
FzW_y6xl{lE

delta 684
zcmYMxPiWI{6u|Lc((F&WrmfCYnNw3m<{vr~WR8u^b*y0By1?`@WrtCsiz|z^>p(%u
zU>CuI_}F1E@GKr>Am~B#AhLsqH~)bko+dI79OA+64+4fHpZA(y-tWEi>A}^m=9k^p
zs^aL5uD?3r_+<RImGCop62GC&x3L3vA}v#?Hu4O%<33Dd4m<HQ4r39Aa0SmQ)l@GD
zs{HT=Z{f9=QVINuM{o=EMj49>yV1rx>P7}puOCHDRpxdMr*H%x;2=%D$6oR@FHuqr
zW6fytB7rWnLHoMUbJUZ(j`Fvt8~A{FvhR^UaS!<p?nRr29v;Oj*uY7AhatLgrpEiI
zzlg(TxvK=n3G_tcn8j&K;SFT1YNCU8qx>OWAb*6H@E0yKVTmqB$T#_)*i$8S(L!Z0
zSn_4dI3!uqkyGZp(JM3NVc9hIM^QHBNPp~yoUr<2)_U<|r8Q<c)5XG6zU<}43hsGt
zpj<k6*_$lNdi$%EMGA&86F-m+)R<qd)PmbVxZtazti|ui<HQ+RNE|~?(jC7glN>cd
zxtQF}P4vu#;k;X!^WA#jE;Yic?>6eQHGjap+3>5?P_Em3^2Xl9`j7TF_nuTq%59x;
HC-v+fF9&SP

diff --git a/languages/it.po b/languages/it.po
index 98a8c19..5afb21d 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Reference\n"
 "Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
 "POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2021-06-09 15:09-0000\n"
 "Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
@@ -39,19 +39,23 @@ msgid "Use"
 msgstr "Utilizzo"
 
 #: config_form.php:15
-msgid "Public hook"
-msgstr "Hook pubblico"
+msgid "Public hooks"
+msgstr "Hook pubblici"
 
 #: config_form.php:19
 msgid ""
+"The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
+"already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
+"own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
+
 "The hook you want to use: Omeka's default <code>public_items_browse</code>, already coded into every page "
 "(so no change is needed), normally showing up at the end of the page; or the plugin's own "
 "<code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
-"L'hook che si vuole usare: quello di default di Omeka (<code>public_items_browse</code>), già codificato "
-"in ogni pagina (così nessuna modifica è necessaria), solitamente mostrato alla fine della pagina; oppure, "
-"quello proprio del plugin (<code>public_items_facets</code>), che deve essere codificato nelle giuste "
-"pagine del tema ma può essere usato ovunque lo si ritenga opportuno."
+"Gli hook che si vogliono usare: quelli di default di Omeka (<code>public_items_browse</code> e <code>public_collections_browse</code>), "
+"già codificati in ogni pagina (così nessuna modifica è necessaria), solitamente mostrati alla fine della pagina; oppure, "
+"quello proprio del plugin (<code>public_facets</code>), che deve essere codificato nelle giuste pagine del tema "
+"ma può essere usato ovunque lo si ritenga opportuno."
 
 #: config_form.php:32
 msgid "Aspect"
@@ -106,33 +110,37 @@ msgid "The Dublin Core elements that can be used for search refinement."
 msgstr "Gli elementi Dublin Core che possono essere usati per il raffinamento della ricerca."
 
 #: config_form.php:102
-msgid "Element"
-msgstr "Elemento"
+msgid "Element name"
+msgstr "Nome elemento"
 
 #: config_form.php:103
-msgid "Active"
-msgstr "Attivo"
+msgid "Item"
+msgstr "Documento"
+
+#: config_form.php:104
+msgid "Collection"
+msgstr "Collezione"
 
-#: config_form.php:133
+#: config_form.php:144
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:137
-msgid "If checked, search refinement by Item Type will be available."
-msgstr "Se selezionata, il raffinamento della ricerca per Tipologia di Documento sarà disponibile."
+#: config_form.php:148
+msgid "If checked, search refinement by Item Type will be available (Items only)."
+msgstr "Se selezionata, il raffinamento della ricerca per Tipologia di Documento sarà disponibile (solo per Documenti)."
 
-#: config_form.php:145
+#: config_form.php:156
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:149
-msgid "If checked, search refinement by Collection will be available."
-msgstr "Se selezionata, il raffinamento della ricerca per Collezione sarà disponibile."
+#: config_form.php:160
+msgid "If checked, search refinement by Collection will be available (Items only)."
+msgstr "Se selezionata, il raffinamento della ricerca per Collezione sarà disponibile (solo per Documenti)."
 
-#: config_form.php:157
+#: config_form.php:168
 msgid "Tags"
 msgstr "Etichette"
 
-#: config_form.php:161
-msgid "If checked, search refinement by Tag will be available."
-msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile."
\ No newline at end of file
+#: config_form.php:172
+msgid "If checked, search refinement by Tag will be available (Items only)."
+msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile (solo per Documenti)."
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
index 16c96f5..fd7adf2 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -39,14 +39,14 @@ msgid "Use"
 msgstr ""
 
 #: config_form.php:15
-msgid "Public hook"
+msgid "Public hooks"
 msgstr ""
 
 #: config_form.php:19
 msgid ""
-"The hook you want to use: Omeka's default <code>public_items_browse</code>, already coded into every page "
-"(so no change is needed), normally showing up at the end of the page; or the plugin's own "
-"<code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
+"The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
+"already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
+"own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 
 #: config_form.php:32
@@ -102,33 +102,37 @@ msgid "The Dublin Core elements that can be used for search refinement."
 msgstr ""
 
 #: config_form.php:102
-msgid "Element"
+msgid "Element name"
 msgstr ""
 
 #: config_form.php:103
-msgid "Active"
+msgid "Item"
 msgstr ""
 
-#: config_form.php:133
+#: config_form.php:104
+msgid "Collection"
+msgstr ""
+
+#: config_form.php:144
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:137
-msgid "If checked, search refinement by Item Type will be available."
+#: config_form.php:148
+msgid "If checked, search refinement by Item Type will be available (Items only)."
 msgstr ""
 
-#: config_form.php:145
+#: config_form.php:156
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:149
-msgid "If checked, search refinement by Collection will be available."
+#: config_form.php:160
+msgid "If checked, search refinement by Collection will be available (Items only)."
 msgstr ""
 
-#: config_form.php:157
+#: config_form.php:168
 msgid "Tags"
 msgstr ""
 
-#: config_form.php:161
-msgid "If checked, search refinement by Tag will be available."
+#: config_form.php:172
+msgid "If checked, search refinement by Tag will be available (Items only)."
 msgstr ""
\ No newline at end of file

From 8490d257add7d76ed60c66b5f7856b50601e4cfe Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 12 Jun 2021 17:06:01 +0200
Subject: [PATCH 033/161] Added more control on individual elements

---
 FacetsPlugin.php | 75 ++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index d0958ad..8ec11a7 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -37,17 +37,18 @@ public function hookInstall()
 		set_option('facets_public_hook', 'default');
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
-		set_option('facets_sort_order', 'count_alpha');
-		set_option('facets_hide_popularity', 0);
 
 		$defaults = array(
-			'item_elements' => array(),
-			'collection_elements' => array()
+			'item_elements' => array('active', 'showPopularity'),
+			'collection_elements' => array('active', 'showPopularity')
 		);
 		set_option('facets_elements', json_encode($defaults));
-		set_option('facets_item_types', 1);
-		set_option('facets_collections', 1);
-		set_option('facets_tags', 0);
+		set_option('facets_item_types_active', 'count_alpha');
+		set_option('facets_item_types_show_popularity', 1);
+		set_option('facets_collections_active', 'count_alpha');
+		set_option('facets_collections_show_popularity', 1);
+		set_option('facets_tags_active', '');
+		set_option('facets_tags_show_popularity', 1);
 	}
 
 	/**
@@ -58,12 +59,13 @@ public function hookUninstall()
 		delete_option('facets_public_hook');
 		delete_option('facets_description');
 		delete_option('facets_hide_single_entries');
-		delete_option('facets_sort_order');
-		delete_option('facets_hide_popularity');
 		delete_option('facets_elements');
-		delete_option('facets_item_types');
-		delete_option('facets_collections');
-		delete_option('facets_tags');
+		delete_option('facets_item_types_active');
+		delete_option('facets_item_types_show_popularity');
+		delete_option('facets_collections_active');
+		delete_option('facets_collections_show_popularity');
+		delete_option('facets_tags_active');
+		delete_option('facets_tags_show_popularity');
 	}
 
 	/**
@@ -107,8 +109,6 @@ public function hookConfig($args)
 		set_option('facets_public_hook', $post['facets_public_hook']);
 		set_option('facets_description', $post['facets_description']);
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
-		set_option('facets_sort_order', $post['facets_sort_order']);
-		set_option('facets_hide_popularity', $post['facets_hide_popularity']);
 
 		$settings = array(
 			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array(),
@@ -116,30 +116,33 @@ public function hookConfig($args)
 		);
 		set_option('facets_elements', json_encode($settings));
 
-		set_option('facets_item_types', $post['facets_item_types']);
-		set_option('facets_collections', $post['facets_collections']);
-		set_option('facets_tags', $post['facets_tags']);
+		set_option('facets_item_types_active', $post['facets_item_types_active']);
+		set_option('facets_item_types_show_popularity', $post['facets_item_types_show_popularity']);
+		set_option('facets_collections_active', $post['facets_collections_active']);
+		set_option('facets_collections_show_popularity', $post['facets_collections_show_popularity']);
+		set_option('facets_tags_active', $post['facets_tags_active']);
+		set_option('facets_tags_show_popularity', $post['facets_tags_show_popularity']);
 	}
 
 	public function hookDefineRoutes($args)
 	{
-		if (is_admin_theme()) {
-			return;
-		}
-
-		//Itemtypes browse
-		$router = $args['router'];
-		$router->addRoute(
-			'facets',
-			new Zend_Controller_Router_Route (
-				"facets",
-				array(
-					'module'	 => 'facets',
-					'controller' => 'facets',
-					'action'	 => 'browse'
-				)
-			)
-		);
+		// if (is_admin_theme()) {
+			// return;
+		// }
+
+		// ItemTypes browse
+		// $router = $args['router'];
+		// $router->addRoute(
+			// 'facets',
+			// new Zend_Controller_Router_Route (
+				// "facets",
+				// array(
+					// 'module'	 => 'facets',
+					// 'controller' => 'facets',
+					// 'action'	 => 'browse'
+				// )
+			// )
+		// );
 	}
 
     /**
@@ -153,8 +156,10 @@ public function hookCollectionsBrowseSql($args)
         $db = $this->_db;
         $select = $args['select'];
         $params = $args['params'];
+
+		// if (array_key_exists('_advanced_0', $select->getPart('from')) return;
 		
-		if (strpos($select, '_advanced') !== false) return;
+		if (strpos($select, '_advanced_') !== false) return;
         
         if ($advancedTerms = @$params['advanced']) {
             $where = '';

From 1930545f81abeb9d04c56728dbda526e1569ebe8 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 12 Jun 2021 17:06:32 +0200
Subject: [PATCH 034/161] Added more control on individual elements

---
 config_form.php | 169 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 118 insertions(+), 51 deletions(-)

diff --git a/config_form.php b/config_form.php
index 05f721f..e1bd80b 100644
--- a/config_form.php
+++ b/config_form.php
@@ -12,7 +12,7 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_public_hook', __('Public hook')); ?>
+		<?php echo $view->formLabel('facets_public_hook', __('Public hooks')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
@@ -22,7 +22,7 @@
 			get_option('facets_public_hook'),
 			null,
 			array(
-				'default' => 'public_items_browse + public_collections_browse',
+				'default' => 'public_items_browse & public_collections_browse',
 				'custom' => 'public_facets',
 			)); 
 		?>
@@ -55,53 +55,27 @@
     </div>
 </div>
 
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_sort_order', __('Sort order')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('The sorting order for values in select fields.'); ?>
-		</p>
-		<?php echo $view->formRadio('facets_sort_order',
-			get_option('facets_sort_order'),
-			null,
-			array(
-				'alpha' => __('Alphabetical'),
-				'count_alpha' => __('Popularity first, then alphabetical'),
-			)); 
-		?>
-    </div>
-</div>
+<h2><?php echo __('Dublin Core Elements'); ?></h2>
 
 <div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_hide_popularity', __('Hide popularity')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, values\'s popularity will not be displayed (sorting order will still take it into consideration, if required).'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_hide_popularity', get_option('facets_hide_popularity'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<h2><?php echo __('Elements'); ?></h2>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_elements-table', __('Dublin Core')); ?>
-	</div>
-	<div class="inputs five columns omega">
+	<div class="seven columns alpha">
 		<p class="explanation">
 			<?php echo __('The Dublin Core elements that can be used for search refinement.'); ?>
 		</p>
+	</div>
+	<div class="seven columns alpha">
 		<table id="facets_elements-table">
 			<thead>
 				<tr>
-					<th class="boxes"><?php echo __('Element name'); ?></th>
-					<th class="boxes"><?php echo __('Item'); ?></th>
-					<th class="boxes"><?php echo __('Collection'); ?></th>
+					<th class="boxes" rowspan="2"><?php echo __('Element name'); ?></th>
+					<th class="boxes" colspan="2"><?php echo __('Items'); ?></th>
+					<th class="boxes" colspan="2"><?php echo __('Collections'); ?></th>
+				</tr>
+				<tr>
+					<th class="boxes"><?php echo __('Active'); ?></th>
+					<th class="boxes"><?php echo __('Show popularity'); ?></th>
+					<th class="boxes"><?php echo __('Active'); ?></th>
+					<th class="boxes"><?php echo __('Show popularity'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -110,23 +84,47 @@
 			?>
 				<tr>
 					<td><?php echo __($element->name); ?></td>
+					<td class="boxes">
+						<?php echo $view->formSelect(
+							"item_elements[{$element->set_name}][{$element->name}][active]",
+							$settings['item_elements'][$element->set_name][$element->name]['active'],
+							array(),
+							array(
+								'' => __('Not active'),
+								'alpha' => __('Alphabetical sort'),
+								'count_alpha' => __('Popularity + alphabetical sort')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php echo $view->formCheckbox(
-							"item_elements[{$element->set_name}][{$element->name}]",
+							"item_elements[{$element->set_name}][{$element->name}][showPopularity]",
 							'1', 
 							array(
 								'disableHidden' => true,
-								'checked' => isset($settings['item_elements'][$element->set_name][$element->name])
+								'checked' => isset($settings['item_elements'][$element->set_name][$element->name]['showPopularity'])
 							)
 						); ?>
 					</td>
+					<td class="boxes">
+						<?php echo $view->formSelect(
+							"collection_elements[{$element->set_name}][{$element->name}][active]",
+							$settings['collection_elements'][$element->set_name][$element->name]['active'],
+							array(),
+							array(
+								'' => __('Not active'),
+								'alpha' => __('Alphabetical sort'),
+								'count_alpha' => __('Popularity + alphabetical sort')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php echo $view->formCheckbox(
-							"collection_elements[{$element->set_name}][{$element->name}]",
+							"collection_elements[{$element->set_name}][{$element->name}][showPopularity]",
 							'1', 
 							array(
 								'disableHidden' => true,
-								'checked' => isset($settings['collection_elements'][$element->set_name][$element->name])
+								'checked' => isset($settings['collection_elements'][$element->set_name][$element->name]['showPopularity'])
 							)
 						); ?>
 					</td>
@@ -139,38 +137,107 @@
 	</div>
 </div>
 
+<h2><?php echo __('Item Types'); ?></h2>
+
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_item_types', __('Item Types')); ?>
+		<?php echo $view->formLabel('facets_item_types_active', __('Active')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Item Type will be available (Items only).'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_item_types', get_option('facets_item_types'), null, array('1', '0')); ?>
+		<?php echo $view->formSelect(
+			'facets_item_types_active',
+			get_option('facets_item_types_active'),
+			array(),
+			array(
+				'' => __('Not active'),
+				'alpha' => __('Alphabetical sort'),
+				'count_alpha' => __('Popularity + alphabetical sort')
+			)); 
+		?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_item_types_show_popularity', __('Show popularity')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_item_types_show_popularity', get_option('facets_item_types_show_popularity'), null, array('1', '0')); ?>
     </div>
 </div>
 
+<h2><?php echo __('Collections'); ?></h2>
+
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collections', __('Collections')); ?>
+		<?php echo $view->formLabel('facets_collections_active', __('Active')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Collection will be available (Items only).'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_collections', get_option('facets_collections'), null, array('1', '0')); ?>
+		<?php echo $view->formSelect(
+			'facets_collections_active',
+			get_option('facets_collections_active'),
+			array(),
+			array(
+				'' => __('Not active'),
+				'alpha' => __('Alphabetical sort'),
+				'count_alpha' => __('Popularity + alphabetical sort')
+			)); 
+		?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_collections_show_popularity', __('Show popularity')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_collections_show_popularity', get_option('facets_collections_show_popularity'), null, array('1', '0')); ?>
     </div>
 </div>
 
+<h2><?php echo __('Tags'); ?></h2>
+
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_tags', __('Tags')); ?>
+		<?php echo $view->formLabel('facets_tags_active', __('Active')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Tag will be available (Items only).'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_tags', get_option('facets_tags'), null, array('1', '0')); ?>
+		<?php echo $view->formSelect(
+			'facets_tags_active',
+			get_option('facets_tags_active'),
+			array(),
+			array(
+				'' => __('Not active'),
+				'alpha' => __('Alphabetical sort'),
+				'count_alpha' => __('Popularity + alphabetical sort')
+			)); 
+		?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_tags_show_popularity', __('Show popularity')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_tags_show_popularity', get_option('facets_tags_show_popularity'), null, array('1', '0')); ?>
     </div>
 </div>

From 089723bfb0edf0e45e2c49fb56528f1e21d2e3fe Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 12 Jun 2021 17:07:15 +0200
Subject: [PATCH 035/161] Added more control on individual elements

---
 views/public/facets/browse.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 8fc63c7..2ac6381 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -4,8 +4,6 @@
 	$facetTags = array();
 	$facetsElements = json_decode(get_option('facets_elements'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
-	$sortOrder = (string)get_option('facets_sort_order');
-	$hidePopularity = (bool)get_option('facets_hide_popularity');
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
@@ -38,7 +36,8 @@
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
-							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+							$facetElement = $facetsElements['collection_elements']['Dublin Core'][$element->name];
+							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['active'], $facetElement['showPopularity'])) {
 								echo "<div class=\"container-fluid\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo "</div>";
@@ -50,7 +49,8 @@
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
-							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+							$facetElement = $facetsElements['item_elements']['Dublin Core'][$element->name];
+							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['active'], $facetElement['showPopularity'])) {
 								echo "<div class=\"container-fluid\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo "</div>";
@@ -59,8 +59,8 @@
 						}
 					}
 
-					if (get_option('facets_item_types')) {
-						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if (get_option('facets_item_types_active') != '') {
+						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_active'), get_option('facets_item_types_show_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 							echo "</div>";
@@ -68,8 +68,8 @@
 						}
 					}
 
-					if (get_option('facets_collections')) {
-						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if (get_option('facets_collections_active')) {
+						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_active'), get_option('facets_collections_show_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
 							echo "</div>";
@@ -77,8 +77,8 @@
 						}
 					}
 
-					if (get_option('facets_tags')) {
-						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, $sortOrder, $hidePopularity)) {
+					if (get_option('facets_tags_active')) {
+						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_active'), get_option('facets_tags_show_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
 							echo "</div>";

From f77718a309fbc1f2db6663d6d944af6f030b64a4 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 12 Jun 2021 17:07:48 +0200
Subject: [PATCH 036/161] Added more control on individual elements

---
 helpers/FacetsFunctions.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index bd8af4f..e1672a2 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -11,10 +11,10 @@
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
-	 * @param hidePopularity
+	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -67,7 +67,7 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetTags as $tag) {
-					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl('tags', $tag['name']) . "\">" . $tag['name'] . ($hidePopularity ? "" : " (" . $tag['count'] . ")") . "</option>";
+					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl('tags', $tag['name']) . "\">" . $tag['name'] . ($showPopularity ? " (" . $tag['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -84,10 +84,10 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
-	 * @param hidePopularity
+	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -144,7 +144,7 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetCollections as $collection) {
-					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . ($hidePopularity ? "" : " (" . $collection['count'] . ")") . "</option>";
+					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . ($showPopularity ? " (" . $collection['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -161,18 +161,18 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 	 * @param itemsArray
 	 * @param hideSingleEntries
 	 * @param sortOrder
-	 * @param hidePopularity
+	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Create Where Subset clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
 		// Define Order by clause
 		if ($sortOrder == 'count_alpha') {
-			$orderBy = array('count DESC', 'text ASC');
+			$orderBy = array('count DESC', 'name ASC');
 		} else {
-			$orderBy = array('text ASC');
+			$orderBy = array('name ASC');
 		}
 
 		// Get the database.
@@ -222,7 +222,7 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetItemTypes as $itemType) {
-					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . ($hidePopularity ? "" : " (" . $itemType['count'] . ")") . "</option>";
+					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . ($showPopularity ? " (" . $itemType['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -241,10 +241,10 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 	 * @param isDate
 	 * @param hideSingleEntries
 	 * @param sortOrder
-	 * @param hidePopularity
+	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $hidePopularity = false) {
+	function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Create Where clauses
 		$whereRecordType = createWhereRecordTypeClause($recordType);
 		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
@@ -338,7 +338,7 @@ function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title',
 			if ($addOptions) {
 				foreach ($facet as $name => $count) {
 					$url = getElementFieldUrl($element_id, $name, $isDate);
-					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($hidePopularity ? "" : " (" . $count . ")") . "</option>";
+					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -431,7 +431,7 @@ function getFieldUrl($filter, $value = null)
 	}
 	
 	function isFacetActive($recordType, $element_name, $settings) {
-		return ($settings[$recordType . '_elements']['Dublin Core'][$element_name] == 1);
+		return ($settings[$recordType . '_elements']['Dublin Core'][$element_name]['active'] != '');
 	}
 	
 	function isNotSingleEntry($count) {

From 77253454dc65f2c0569cb53d7239f510ce0d4731 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:22:11 +0200
Subject: [PATCH 037/161] Simplified code

---
 views/public/facets/browse.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 2ac6381..41a6525 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -36,8 +36,8 @@
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
-							$facetElement = $facetsElements['collection_elements']['Dublin Core'][$element->name];
-							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['active'], $facetElement['showPopularity'])) {
+							$facetElement = $facetsElements['elements'][$element->name];
+							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
 								echo "<div class=\"container-fluid\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo "</div>";
@@ -49,8 +49,8 @@
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
-							$facetElement = $facetsElements['item_elements']['Dublin Core'][$element->name];
-							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['active'], $facetElement['showPopularity'])) {
+							$facetElement = $facetsElements['elements'][$element->name];
+							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
 								echo "<div class=\"container-fluid\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo "</div>";
@@ -59,8 +59,8 @@
 						}
 					}
 
-					if (get_option('facets_item_types_active') != '') {
-						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_active'), get_option('facets_item_types_show_popularity'))) {
+					if ((bool)get_option('facets_item_types_active')) {
+						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 							echo "</div>";
@@ -68,8 +68,8 @@
 						}
 					}
 
-					if (get_option('facets_collections_active')) {
-						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_active'), get_option('facets_collections_show_popularity'))) {
+					if ((bool)get_option('facets_collections_active')) {
+						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
 							echo "</div>";
@@ -77,8 +77,8 @@
 						}
 					}
 
-					if (get_option('facets_tags_active')) {
-						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_active'), get_option('facets_tags_show_popularity'))) {
+					if ((bool)get_option('facets_tags_active')) {
+						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'))) {
 							echo "<div class=\"container-fluid\">\n";
 							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
 							echo "</div>";

From fbe7bded929b7680697050fbef5911014c9487f6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:23:08 +0200
Subject: [PATCH 038/161] Added config options

---
 FacetsPlugin.php | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 8ec11a7..e955b8f 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -39,16 +39,18 @@ public function hookInstall()
 		set_option('facets_hide_single_entries', 0);
 
 		$defaults = array(
-			'item_elements' => array('active', 'showPopularity'),
-			'collection_elements' => array('active', 'showPopularity')
+			'elements' => array('item', 'collection', 'sort', 'popularity')
 		);
 		set_option('facets_elements', json_encode($defaults));
-		set_option('facets_item_types_active', 'count_alpha');
-		set_option('facets_item_types_show_popularity', 1);
-		set_option('facets_collections_active', 'count_alpha');
-		set_option('facets_collections_show_popularity', 1);
-		set_option('facets_tags_active', '');
-		set_option('facets_tags_show_popularity', 1);
+		set_option('facets_item_types_active', 0);
+		set_option('facets_item_types_sort', '');
+		set_option('facets_item_types_popularity', 0);
+		set_option('facets_collections_active', 1);
+		set_option('facets_collections_sort', 'count_alpha');
+		set_option('facets_collections_popularity', 1);
+		set_option('facets_tags_active', 0);
+		set_option('facets_tags_sort', '');
+		set_option('facets_tags_popularity', 0);
 	}
 
 	/**
@@ -61,11 +63,14 @@ public function hookUninstall()
 		delete_option('facets_hide_single_entries');
 		delete_option('facets_elements');
 		delete_option('facets_item_types_active');
-		delete_option('facets_item_types_show_popularity');
+		delete_option('facets_item_types_sort');
+		delete_option('facets_item_types_popularity');
 		delete_option('facets_collections_active');
-		delete_option('facets_collections_show_popularity');
+		delete_option('facets_collections_sort');
+		delete_option('facets_collections_popularity');
 		delete_option('facets_tags_active');
-		delete_option('facets_tags_show_popularity');
+		delete_option('facets_tags_sort');
+		delete_option('facets_tags_popularity');
 	}
 
 	/**
@@ -111,17 +116,19 @@ public function hookConfig($args)
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
 
 		$settings = array(
-			'item_elements' => isset($post['item_elements']) ? $post['item_elements'] : array(),
-			'collection_elements' => isset($post['collection_elements']) ? $post['collection_elements'] : array()
+			'elements' => isset($post['elements']) ? $post['elements'] : array()
 		);
 		set_option('facets_elements', json_encode($settings));
 
 		set_option('facets_item_types_active', $post['facets_item_types_active']);
-		set_option('facets_item_types_show_popularity', $post['facets_item_types_show_popularity']);
+		set_option('facets_item_types_sort', $post['facets_item_types_sort']);
+		set_option('facets_item_types_popularity', $post['facets_item_types_popularity']);
 		set_option('facets_collections_active', $post['facets_collections_active']);
-		set_option('facets_collections_show_popularity', $post['facets_collections_show_popularity']);
+		set_option('facets_collections_sort', $post['facets_collections_sort']);
+		set_option('facets_collections_popularity', $post['facets_collections_popularity']);
 		set_option('facets_tags_active', $post['facets_tags_active']);
-		set_option('facets_tags_show_popularity', $post['facets_tags_show_popularity']);
+		set_option('facets_tags_sort', $post['facets_tags_sort']);
+		set_option('facets_tags_popularity', $post['facets_tags_popularity']);
 	}
 
 	public function hookDefineRoutes($args)
@@ -298,7 +305,8 @@ public function showFacets($args)
 				'type' => $_GET['type'], 
 				'tags' => $_GET['tags']
 			);
-			if (count($settings['item_elements']) > 0 && count(get_records('item', $params, null)) > 0) {
+
+			if (recordTypeActive('item', $settings['elements']) && count(get_records('item', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
 					'params' => $params,
 					'recordType' => 'item'
@@ -308,7 +316,7 @@ public function showFacets($args)
 			$params = array(
 				'advanced' => $_GET['advanced']
 			);
-			if (count($settings['collection_elements']) > 0 && count(get_records('collection', $params, null)) > 0) {
+			if (recordTypeActive('collection', $settings['elements']) && count(get_records('collection', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
 					'params' => $params,
 					'recordType' => 'collection'

From da3a7e0664d82cd215e8d73fbfedb49eabc30017 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:23:39 +0200
Subject: [PATCH 039/161] Added config options

---
 config_form.php | 134 +++++++++++++++++++++++++++++-------------------
 1 file changed, 82 insertions(+), 52 deletions(-)

diff --git a/config_form.php b/config_form.php
index e1bd80b..84c645b 100644
--- a/config_form.php
+++ b/config_form.php
@@ -6,6 +6,9 @@
 		text-align: center;
 		vertical-align: middle;
 	}
+	.field select {
+		margin-bottom: 0;
+	}
 </style>
 
 <h2><?php echo __('Use'); ?></h2>
@@ -55,27 +58,24 @@
     </div>
 </div>
 
-<h2><?php echo __('Dublin Core Elements'); ?></h2>
+<h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">
-	<div class="seven columns alpha">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_elements-table', __('Dublin Core')); ?>
+	</div>
+	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('The Dublin Core elements that can be used for search refinement.'); ?>
 		</p>
-	</div>
-	<div class="seven columns alpha">
 		<table id="facets_elements-table">
 			<thead>
 				<tr>
-					<th class="boxes" rowspan="2"><?php echo __('Element name'); ?></th>
-					<th class="boxes" colspan="2"><?php echo __('Items'); ?></th>
-					<th class="boxes" colspan="2"><?php echo __('Collections'); ?></th>
-				</tr>
-				<tr>
-					<th class="boxes"><?php echo __('Active'); ?></th>
-					<th class="boxes"><?php echo __('Show popularity'); ?></th>
-					<th class="boxes"><?php echo __('Active'); ?></th>
-					<th class="boxes"><?php echo __('Show popularity'); ?></th>
+					<th class="boxes"><?php echo __('Element name'); ?></th>
+					<th class="boxes"><?php echo __('Item'); ?></th>
+					<th class="boxes"><?php echo __('Collection'); ?></th>
+					<th class="boxes"><?php echo __('Sort order'); ?></th>
+					<th class="boxes"><?php echo __('Popularity'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -85,46 +85,43 @@
 				<tr>
 					<td><?php echo __($element->name); ?></td>
 					<td class="boxes">
-						<?php echo $view->formSelect(
-							"item_elements[{$element->set_name}][{$element->name}][active]",
-							$settings['item_elements'][$element->set_name][$element->name]['active'],
-							array(),
+						<?php echo $view->formCheckbox(
+							"elements[{$element->name}][item]",
+							'1', 
 							array(
-								'' => __('Not active'),
-								'alpha' => __('Alphabetical sort'),
-								'count_alpha' => __('Popularity + alphabetical sort')
-							)); 
-						?>
+								'disableHidden' => true,
+								'checked' => isset($settings['elements'][$element->name]['item'])
+							)
+						); ?>
 					</td>
 					<td class="boxes">
 						<?php echo $view->formCheckbox(
-							"item_elements[{$element->set_name}][{$element->name}][showPopularity]",
+							"elements[{$element->name}][collection]",
 							'1', 
 							array(
 								'disableHidden' => true,
-								'checked' => isset($settings['item_elements'][$element->set_name][$element->name]['showPopularity'])
+								'checked' => isset($settings['elements'][$element->name]['collection'])
 							)
 						); ?>
 					</td>
 					<td class="boxes">
 						<?php echo $view->formSelect(
-							"collection_elements[{$element->set_name}][{$element->name}][active]",
-							$settings['collection_elements'][$element->set_name][$element->name]['active'],
+							"elements[{$element->name}][sort]",
+							$settings['elements'][$element->name]['sort'],
 							array(),
 							array(
-								'' => __('Not active'),
-								'alpha' => __('Alphabetical sort'),
-								'count_alpha' => __('Popularity + alphabetical sort')
+								'alpha' => __('Alphabetical'),
+								'count_alpha' => __('Popularity first, then alphabetical')
 							)); 
 						?>
 					</td>
 					<td class="boxes">
 						<?php echo $view->formCheckbox(
-							"collection_elements[{$element->set_name}][{$element->name}][showPopularity]",
+							"elements[{$element->name}][popularity]",
 							'1', 
 							array(
 								'disableHidden' => true,
-								'checked' => isset($settings['collection_elements'][$element->set_name][$element->name]['showPopularity'])
+								'checked' => isset($settings['elements'][$element->name]['popularity'])
 							)
 						); ?>
 					</td>
@@ -147,14 +144,25 @@
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Item Type will be available (Items only).'); ?>
 		</p>
+		<?php echo $view->formCheckbox('facets_item_types_active', get_option('facets_item_types_active'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_item_types_sort', __('Sort order')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The sort order used for values.'); ?>
+		</p>
 		<?php echo $view->formSelect(
-			'facets_item_types_active',
-			get_option('facets_item_types_active'),
+			'facets_item_types_sort',
+			get_option('facets_item_types_sort'),
 			array(),
 			array(
-				'' => __('Not active'),
-				'alpha' => __('Alphabetical sort'),
-				'count_alpha' => __('Popularity + alphabetical sort')
+				'alpha' => __('Alphabetical'),
+				'count_alpha' => __('Popularity first, then alphabetical')
 			)); 
 		?>
     </div>
@@ -162,13 +170,13 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_item_types_show_popularity', __('Show popularity')); ?>
+		<?php echo $view->formLabel('facets_item_types_popularity', __('Show popularity')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_item_types_show_popularity', get_option('facets_item_types_show_popularity'), null, array('1', '0')); ?>
+		<?php echo $view->formCheckbox('facets_item_types_popularity', get_option('facets_item_types_popularity'), null, array('1', '0')); ?>
     </div>
 </div>
 
@@ -182,14 +190,25 @@
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Collection will be available (Items only).'); ?>
 		</p>
+		<?php echo $view->formCheckbox('facets_collections_active', get_option('facets_collections_active'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_collections_sort', __('Sort order')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The sort order used for values.'); ?>
+		</p>
 		<?php echo $view->formSelect(
-			'facets_collections_active',
-			get_option('facets_collections_active'),
+			'facets_collections_sort',
+			get_option('facets_collections_sort'),
 			array(),
 			array(
-				'' => __('Not active'),
-				'alpha' => __('Alphabetical sort'),
-				'count_alpha' => __('Popularity + alphabetical sort')
+				'alpha' => __('Alphabetical'),
+				'count_alpha' => __('Popularity first, then alphabetical')
 			)); 
 		?>
     </div>
@@ -197,13 +216,13 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collections_show_popularity', __('Show popularity')); ?>
+		<?php echo $view->formLabel('facets_collections_popularity', __('Show popularity')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_collections_show_popularity', get_option('facets_collections_show_popularity'), null, array('1', '0')); ?>
+		<?php echo $view->formCheckbox('facets_collections_popularity', get_option('facets_collections_popularity'), null, array('1', '0')); ?>
     </div>
 </div>
 
@@ -217,14 +236,25 @@
 		<p class="explanation">
 			<?php echo __('If checked, search refinement by Tag will be available (Items only).'); ?>
 		</p>
+		<?php echo $view->formCheckbox('facets_tags_active', get_option('facets_tags_active'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_tags_sort', __('Sort order')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The sort order used for values.'); ?>
+		</p>
 		<?php echo $view->formSelect(
-			'facets_tags_active',
-			get_option('facets_tags_active'),
+			'facets_tags_sort',
+			get_option('facets_tags_sort'),
 			array(),
 			array(
-				'' => __('Not active'),
-				'alpha' => __('Alphabetical sort'),
-				'count_alpha' => __('Popularity + alphabetical sort')
+				'alpha' => __('Alphabetical'),
+				'count_alpha' => __('Popularity first, then alphabetical')
 			)); 
 		?>
     </div>
@@ -232,12 +262,12 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_tags_show_popularity', __('Show popularity')); ?>
+		<?php echo $view->formLabel('facets_tags_popularity', __('Show popularity')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
 			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_tags_show_popularity', get_option('facets_tags_show_popularity'), null, array('1', '0')); ?>
+		<?php echo $view->formCheckbox('facets_tags_popularity', get_option('facets_tags_popularity'), null, array('1', '0')); ?>
     </div>
 </div>

From 35cf008e99b2d972be266c79b498d64c4cdfcf78 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:24:51 +0200
Subject: [PATCH 040/161] Added function, simplified code

---
 helpers/FacetsFunctions.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index e1672a2..16d822b 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -431,7 +431,7 @@ function getFieldUrl($filter, $value = null)
 	}
 	
 	function isFacetActive($recordType, $element_name, $settings) {
-		return ($settings[$recordType . '_elements']['Dublin Core'][$element_name]['active'] != '');
+		return ((bool)$settings['elements'][$element_name][$recordType]);
 	}
 	
 	function isNotSingleEntry($count) {
@@ -453,4 +453,11 @@ function createWhereSubsetClause($recordType, $sql) {
 	function excludeSingleValues($element) {
 		if ($element > 1) return $element;
 	}
+	
+	function recordTypeActive($recordType, $elements) {
+		foreach ($elements as $element) {
+			if (array_key_exists($recordType, $element)) return true;
+		}
+		return false;
+	}	
 ?>

From 7e893dfdc6e06e5a57e9e6c49813d9f609ec47b9 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:25:16 +0200
Subject: [PATCH 041/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 8d1b305..40b8f5e 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Filter browse/advanced search using facets"
 license="GPLv3"
 link=""
 support_link=""
-version="2.0"
+version="2.1"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From d2c264849f1326b9c0bcfc035da1c1175c9de525 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 01:26:16 +0200
Subject: [PATCH 042/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index d26483a..3465594 100644
--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,7 @@
 
 ## Description
 
-Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context
+Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context. Works for both Items and Collections.
 
 Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values.
 

From 508b84dfccc1cab06e732fd0f21ca51e376440e9 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:51:04 +0200
Subject: [PATCH 043/161] Update Readme.md

---
 Readme.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 3465594..e62742c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -6,8 +6,6 @@ Plugin for Omeka Classic. Once installed and active, allows to insert a Facets b
 
 Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values.
 
-![Facets screenshot](./facets.jpg)
-
 ## Credits
 
 Original development is part of the [Armarium](https://www.armarium-hautsdefrance.fr/) Project, managed by the french association [AR2L Hauts de France](http://www.ar2l-hdf.fr/).
@@ -21,7 +19,9 @@ Then install it like any other Omeka plugin.
 
 ## (Eventually) Customize your Theme
 
-Facets will appear by default in the <b>Items browse</b> page, where you have set the `public_items_browse` hook. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. For <b>Thanks, Roy</b> theme, for example, best way is to change `common/header.php` code using the custom hook:
+Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. 
+
+For **Thanks, Roy** theme, for example, best way is to change `common/header.php` code using the custom hook, while unchecking **Block collapsable** option and setting **Vertical** as **Block layout**:
 ```php
 <div id="search-container" role="search">
     <?php if (get_theme_option('use_advanced_search') === null || get_theme_option('use_advanced_search')): ?>
@@ -32,6 +32,12 @@ Facets will appear by default in the <b>Items browse</b> page, where you have se
 </div>
 <?php fire_plugin_hook('public_items_facets', array('view' => $this, 'item' => $item)); ?>
 ```
+For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php`:
+```php
+<?php echo item_search_filters(); ?>
+<?php fire_plugin_hook('public_facets', array('view' => $this, 'item' => $item)); ?>
+<?php echo pagination_links(); ?>
+```
 
 ## Plugin configuration
 
@@ -39,7 +45,9 @@ The elements used for search refinement can be selected in the configuration pag
 
 Similarly, one can choose to also include <b>Item Types</b>, <b>Collections</b> and <b>Tags</b> to the facets block.
 
-Single values can be exluded as not really significant, although they will be listed anyway if less than 10 values are available.
+Single values can be exluded as not really significant, although they will be listed anyway if less than 5 values are available.
+
+Facets block can be set up for vertical or horizontal layout, according to the theme layout; and it can be made collapsable, to use less vertical space (recommended for horizontal layout).
 
 Sorting order can be alphabetical, or first by popularity and then alphabetical. Popularity count can be hidden, if needed.
 

From 11ed71b353f60086523b82ab603ff398bcdd508e Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:52:35 +0200
Subject: [PATCH 044/161] Update Readme.md

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index e62742c..58f96f8 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,7 +4,7 @@
 
 Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context. Works for both Items and Collections.
 
-Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values.
+Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values, whether to show values popolarity, whether to use an horizontal or vertical layout, etc.
 
 ## Credits
 
@@ -17,7 +17,7 @@ Uncompress files and rename plugin folder "Facets".
 
 Then install it like any other Omeka plugin.
 
-## (Eventually) Customize your Theme
+## (optional) Theme customization
 
 Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. 
 

From 4e471e90686937957cf5e1e802087c63d91fafd4 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:56:17 +0200
Subject: [PATCH 045/161] Update Readme.md

---
 Readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 58f96f8..b795771 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,12 +30,12 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
     <?php echo search_form(); ?>
     <?php endif; ?>
 </div>
-<?php fire_plugin_hook('public_items_facets', array('view' => $this, 'item' => $item)); ?>
+<?php fire_plugin_hook('public_items_facets', array('view' => $this)); ?>
 ```
-For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php`:
+For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
-<?php fire_plugin_hook('public_facets', array('view' => $this, 'item' => $item)); ?>
+<?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
 <?php echo pagination_links(); ?>
 ```
 

From 041654a8073eeb15a4dd4278679f0692fc5509c6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:56:51 +0200
Subject: [PATCH 046/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index b795771..f092760 100644
--- a/Readme.md
+++ b/Readme.md
@@ -32,7 +32,7 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
 </div>
 <?php fire_plugin_hook('public_items_facets', array('view' => $this)); ?>
 ```
-For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
+For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `YOUR_THEME/items/browse.php` and `YOUR_THEME/collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
 <?php fire_plugin_hook('public_facets', array('view' => $this)); ?>

From 74283a5176f7a0d7578fc5017c98dc8ac0ad4d9c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:57:10 +0200
Subject: [PATCH 047/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index f092760..86dcee6 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,7 +30,7 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
     <?php echo search_form(); ?>
     <?php endif; ?>
 </div>
-<?php fire_plugin_hook('public_items_facets', array('view' => $this)); ?>
+<?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
 ```
 For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `YOUR_THEME/items/browse.php` and `YOUR_THEME/collections/browse.php`:
 ```php

From 3121cbae9be2d70c2a9e5236cfdc877a27a60065 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:57:44 +0200
Subject: [PATCH 048/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 86dcee6..b3d06fe 100644
--- a/Readme.md
+++ b/Readme.md
@@ -32,7 +32,7 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
 </div>
 <?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
 ```
-For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `YOUR_THEME/items/browse.php` and `YOUR_THEME/collections/browse.php`:
+For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
 <?php fire_plugin_hook('public_facets', array('view' => $this)); ?>

From 0a341c920595c38c102585e9fd814298e0f849bc Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:59:26 +0200
Subject: [PATCH 049/161] Update Readme.md

---
 Readme.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Readme.md b/Readme.md
index b3d06fe..f523dae 100644
--- a/Readme.md
+++ b/Readme.md
@@ -43,15 +43,15 @@ For **Berlin** theme, instead, check **Block collapsable** option, set **Horizon
 
 The elements used for search refinement can be selected in the configuration page; best practice suggestion is to activate only elements that are displayed in the browse page, and that are offering some kind of data aggregation (a unique id would not offer any really useful refinement).
 
-Similarly, one can choose to also include <b>Item Types</b>, <b>Collections</b> and <b>Tags</b> to the facets block.
+Similarly, one can choose to also include **Item Types**, **Collections** and **Tags** to the facets block.
 
-Single values can be exluded as not really significant, although they will be listed anyway if less than 5 values are available.
+**Single values** can be exluded as not really significant, although they will be listed anyway if less than 5 values are available.
 
-Facets block can be set up for vertical or horizontal layout, according to the theme layout; and it can be made collapsable, to use less vertical space (recommended for horizontal layout).
+Facets block can be set up for **vertical** or **horizontal** layout, according to the theme layout; and it can be made **collapsable**, to use less vertical space (recommended for horizontal layout).
 
-Sorting order can be alphabetical, or first by popularity and then alphabetical. Popularity count can be hidden, if needed.
+Sorting order can be **alphabetical**, or **first by popularity and then alphabetical**. Popularity count can be shown, if needed.
 
-<b>Date</b> element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
+**Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
 
 ## Licence
 MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/)

From fdb52056df10b6a96b558a3df9b93e1319593447 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:59:55 +0200
Subject: [PATCH 050/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index f523dae..fc4570c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -54,4 +54,4 @@ Sorting order can be **alphabetical**, or **first by popularity and then alphabe
 **Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
 
 ## Licence
-MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/)
+MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/) and Daniele Binaghi.

From 4fde0b10a5c58c7294eb45cbe32e5cc377fd5ba9 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:01:46 +0200
Subject: [PATCH 051/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 40b8f5e..3298253 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Filter browse/advanced search using facets"
 license="GPLv3"
 link=""
 support_link=""
-version="2.1"
+version="2.2"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 27fa2159b5abe9667b743d07095b80fc51d76d7c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:02:15 +0200
Subject: [PATCH 052/161] Added layout options

---
 config_form.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/config_form.php b/config_form.php
index 84c645b..91ad045 100644
--- a/config_form.php
+++ b/config_form.php
@@ -58,6 +58,38 @@
     </div>
 </div>
 
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_collapsable', __('Block collapsable')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, facets block will be collapsable (tip: as it saves space, it\'s particularly useful with horizontal layout).'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_collapsable', get_option('facets_collapsable'), null, array('1', '0')); ?>
+    </div>
+</div>
+
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_direction', __('Block layout')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('The layout direction of the facets block.'); ?>
+		</p>
+		<?php echo $view->formSelect(
+			'facets_direction',
+			get_option('facets_direction'),
+			array(),
+			array(
+				'horizontal' => __('Horizontal (useful for themes with top main navigation menu)'),
+				'vertical' => __('Vertical (useful for themes with side main navigation menu)')
+			)); 
+		?>
+   </div>
+</div>
+
 <h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">

From 83bde60e0c8da9a53ff6a5d83630190b20221bce Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:02:46 +0200
Subject: [PATCH 053/161] Added layout options

---
 FacetsPlugin.php | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index e955b8f..873ac3f 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -21,7 +21,6 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 		'initialize',
 		'config_form',
 		'config',
-		'define_routes',
         'collections_browse_sql',
 		'public_head',
 		'public_items_browse',
@@ -37,6 +36,8 @@ public function hookInstall()
 		set_option('facets_public_hook', 'default');
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
+		set_option('facets_collapsable', 0);
+		set_option('facets_direction', 'vertical');
 
 		$defaults = array(
 			'elements' => array('item', 'collection', 'sort', 'popularity')
@@ -61,6 +62,8 @@ public function hookUninstall()
 		delete_option('facets_public_hook');
 		delete_option('facets_description');
 		delete_option('facets_hide_single_entries');
+		delete_option('facets_collapsable');
+		delete_option('facets_direction');
 		delete_option('facets_elements');
 		delete_option('facets_item_types_active');
 		delete_option('facets_item_types_sort');
@@ -114,6 +117,8 @@ public function hookConfig($args)
 		set_option('facets_public_hook', $post['facets_public_hook']);
 		set_option('facets_description', $post['facets_description']);
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
+		set_option('facets_collapsable', $post['facets_collapsable']);
+		set_option('facets_direction', $post['facets_direction']);
 
 		$settings = array(
 			'elements' => isset($post['elements']) ? $post['elements'] : array()
@@ -131,27 +136,6 @@ public function hookConfig($args)
 		set_option('facets_tags_popularity', $post['facets_tags_popularity']);
 	}
 
-	public function hookDefineRoutes($args)
-	{
-		// if (is_admin_theme()) {
-			// return;
-		// }
-
-		// ItemTypes browse
-		// $router = $args['router'];
-		// $router->addRoute(
-			// 'facets',
-			// new Zend_Controller_Router_Route (
-				// "facets",
-				// array(
-					// 'module'	 => 'facets',
-					// 'controller' => 'facets',
-					// 'action'	 => 'browse'
-				// )
-			// )
-		// );
-	}
-
     /**
      * Hook into collections_browse_sql
      *

From f759c5ac9a0fdcb9fa909ceeec74722014a9f75b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:03:35 +0200
Subject: [PATCH 054/161] Added layout features

---
 views/public/css/facets.css | 139 +++++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 65 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index f61f28d..6b08d09 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -1,52 +1,103 @@
-.container-fluid {
-	display: flex;
+.facets-container {
+	margin-bottom: 20px;
+}
+
+.facets-layout-vertical {
+	max-width: 350px;	
+}
+
+.facets-layout-horizontal {
+	margin-top: 20px;
+	width: 100%;
 }
 
-.search-container h4 {
+.facets-container button {
+	width: 100%;
 	text-align: center;
+	font-weight: bold;
 	color: white;
-	background-color: black;
 	margin-bottom: 0;
 	padding: 10px;
 }
 
-.search-container h5 {
+.facets-collapsed:after {
+	font-size: larger;
+	content: '\002B';
+	float: right;
+	margin-left: 5px;
+}
+
+.facets-collapsible:after {
+	font-size: larger;
+	content: "\2212";
+	float: right;
+	margin-left: 5px;
+}
+
+.container-vertical {
+	max-width: 350px;
+}
+
+.container-vertical:not(:last-child) {
+	padding-bottom: 20px;
+}
+
+.flex {
+	/* We first create a flex layout context */
+	display: flex;
+	/* Then we define the flow direction 
+	 and if we allow the items to wrap 
+	* Remember this is the same as:
+	* flex-direction: row;
+	* flex-wrap: wrap;
+	*/
+	flex-flow: row wrap;
+
+	/* Then we define how is distributed the remaining space */
+	justify-content: space-between;
+}
+
+.container-horizontal {
+	max-width: 350px;
+	display: inline-block;
+	/* float: left; */
+	/* display: flex; */
+}
+
+.container-horizontal:not(:last-child) {
+	padding-bottom: 20px;
+}
+
+.facets-container p.description {
 	text-align: left;
 	color: #545759;
 	font-size: 90%;
-	margin: 10px 10px 0 10px;
+	margin: 0;
 	border-bottom: 1px solid #545759;
 	font-style: italic;
-	padding-bottom: 10px;
 	line-height: 140%;
+	padding: 10px;
 }
 
-.search-container {
-	max-width: 350px;
-	margin-bottom: 20px;
-}
-
-.search-container .container {
+.facets-container .container {
 	width: 100%;
 	background-color: #F1F1F1;
 }
 
-.search-container form {
-	padding: 20px 10px;
+.facets-container .hidden {
+	display: none;
 }
 
-.search-container .container .container-fluid:not(:first-child) {
-	padding-top: 20px;
+.facets-container form {
+	padding: 20px 10px;
 }
 
-.search-container form label {
-	/* margin-left: auto; */
-	/* margin-right: auto; */
+.facets-container form label {
 	margin-bottom: 8px;
 	color: #545759;
 }
 
-.search-container form select {
+.facets-container form select {
 	width: 100%;
 	border: 0;
 	appearance: none !important;
@@ -62,54 +113,12 @@
 	background-color: #545759!important;
 }
 
-.search-container .select-arrow, .search-container .select-cross {
+.facets-container .select-arrow, .facets-container .select-cross {
 	position: relative;
 	margin-left: auto;
 	margin-right: auto;
 }
 
-.search-container .select-arrow select::-ms-expand, .search-container .select-cross select::-ms-expand {
+.facets-container .select-arrow select::-ms-expand, .facets-container .select-cross select::-ms-expand {
 	display: none;
 }
-
-.search-container .select-cross:after {
-	/* pointer-events: none; */
-	/* position: absolute; */
-	/* content: ''; */
-	/* top: 9px; */
-	/* right: 10px; */
-	/* height: 10px; */
-	/* width: 10px; */
-	/* background-size: cover!important; */
-	/* background: url('../images/cross.svg'); */
-}
-
-.search-container .select-arrow:after {
-	/* width: 0; */
-	/* pointer-events: none; */
-	/* position: absolute; */
-	/* content: ''; */
-	/* top: 8px; */
-	/* right: 10px; */
-	/* border-top: 8px solid #3D3D3D; */
-	/* border-bottom: 8px solid transparent; */
-	/* border-left: 8px solid transparent; */
-	/* border-right: 8px solid transparent; */
-}
-
-.search-container .select-arrow span, .container-fluid .search-container .select-cross span {
-	/* padding-right: 5%; */
-}
-
-.search-container button {
-	width: 73%;
-	font-family: 'open-bold';
-	margin-left: auto;
-	margin-right: auto;
-	padding-top: 7px;
-	padding-bottom: 7px;
-	border-radius: 0;
-	border: 0;
-	background-color: #FF5E4D;
-	color: white;
-}
\ No newline at end of file

From 06ad8b9981c238689480c8f43f4593bb610dc046 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:04:17 +0200
Subject: [PATCH 055/161] Added layout features

---
 views/public/facets/browse.php | 48 ++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 41a6525..81b07c1 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,9 +1,8 @@
 <?php
-	$facetCollections = array();
-	$facetItemTypes = array();
-	$facetTags = array();
 	$facetsElements = json_decode(get_option('facets_elements'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
+	$facetsCollapsable = (bool)get_option('facets_collapsable');
+	$facetsDirection = (string)get_option('facets_direction');
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
@@ -20,17 +19,16 @@
 	}
 ?>
 
-<div class="search-container">
+<div class="facets-container <?php echo "facets-layout-" . $facetsDirection; ?>">
+	<button <?php if ($facetsCollapsable) echo "class=\"facets-collapsed\""; ?>><?php echo html_escape(__('Refine search by')) ?>...</button>
 	<div class="container">
-		<h4><?php echo html_escape(__('Refine search by')) ?>...</h4>
-
 		<?php 
 			if ($description = get_option('facets_description')) {
-				echo "<h5>" . $description . "</h5>\n";
+				echo "<p class=\"description\">" . $description . "</p>\n";
 			}
 		?>
 		
-		<form class="" action="index.html" method="post">
+		<form action="index.html" method="post" <?php echo ($facetsDirection == 'horizontal' ? 'class="flex"': 'class=""'); ?>>
 			<?php
 				if ($recordType == 'collection') {
 					foreach ($elements as $element) {
@@ -38,10 +36,10 @@
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
 							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
-								echo "<div class=\"container-fluid\">\n";
+								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo "</div>";
 								echo $html;
+								echo "</div>\n";
 							}
 						}
 					}
@@ -51,38 +49,38 @@
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
 							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
-								echo "<div class=\"container-fluid\">\n";
+								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo "</div>";
 								echo $html;
+								echo "</div>\n";
 							}
 						}
 					}
 
 					if ((bool)get_option('facets_item_types_active')) {
 						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'))) {
-							echo "<div class=\"container-fluid\">\n";
+							echo "<div class=\"container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
-							echo "</div>";
 							echo $html;
+							echo "</div>\n";
 						}
 					}
 
 					if ((bool)get_option('facets_collections_active')) {
 						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'))) {
-							echo "<div class=\"container-fluid\">\n";
+							echo "<div class=\"container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
-							echo "</div>";
 							echo $html;
+							echo "</div>\n";
 						}
 					}
 
 					if ((bool)get_option('facets_tags_active')) {
 						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'))) {
-							echo "<div class=\"container-fluid\">\n";
+							echo "<div class=\"container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
-							echo "</div>";
 							echo $html;
+							echo "</div>\n";
 						}
 					}
 				}
@@ -91,10 +89,22 @@
 	</div>
 </div>
 <script type="text/javascript">
-	window.jQuery( document ).ready(function() {
+	jQuery('.facets-collapsed').next().addClass('hidden');
+	window.jQuery(document).ready(function() {
 		window.jQuery('select').change(function() {
 			var option = window.jQuery(this).find('option:selected');
 			if (typeof(option.data("url")) !== 'undefined') window.location.href = option.data("url");
 		});
 	});
+	jQuery('.facets-collapsed').click(function () {
+		$header = jQuery(this);
+		//getting the next element
+		$content = $header.next();
+		//open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
+		$content.slideToggle(300, function () {
+			//execute this after slideToggle is done
+			//change icon of header based on visibility of content div
+			$header.toggleClass( "facets-collapsible facets-collapsed" );
+		});
+	});
 </script>

From faf642e9a1589a55718545bdf95f08ade129883e Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 13 Jun 2021 16:29:41 +0200
Subject: [PATCH 056/161] Update language files

---
 languages/eo.po        | 102 +++++++++++++++++++++++----------
 languages/it.mo        | Bin 3896 -> 4081 bytes
 languages/it.po        | 126 +++++++++++++++++++++++++++--------------
 languages/template.pot | 106 +++++++++++++++++++++++-----------
 4 files changed, 226 insertions(+), 108 deletions(-)

diff --git a/languages/eo.po b/languages/eo.po
index f70c673..aec4aeb 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -34,105 +34,145 @@ msgstr "Forigi filtron"
 msgid "Select"
 msgstr "Elektu"
 
-#: config_form.php:11
+#: config_form.php:14
 msgid "Use"
 msgstr ""
 
-#: config_form.php:15
+#: config_form.php:18
 msgid "Public hooks"
 msgstr ""
 
-#: config_form.php:19
+#: config_form.php:22
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
 "own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 
-#: config_form.php:32
+#: config_form.php:35
 msgid "Aspect"
 msgstr ""
 
-#: config_form.php:36
+#: config_form.php:39
 msgid "Description"
 msgstr ""
 
-#: config_form.php:40
+#: config_form.php:43
 msgid "Text to be used as additional description (tip: keep it short)."
 msgstr ""
 
-#: config_form.php:48
+#: config_form.php:51
 msgid "Hide single entries"
 msgstr ""
 
-#: config_form.php:52
+#: config_form.php:55
 msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
 msgstr ""
 
-#: config_form.php:60
-msgid "Sort order"
+#: config_form.php:63
+msgid "Block collapsable"
 msgstr ""
 
-#: config_form.php:64
-msgid "The sorting order for values in select fields."
+#: config_form.php:67
+msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
-#: config_form.php:70
-msgid "Alphabetical"
+#: config_form.php:75
+msgid "Block layout"
 msgstr ""
 
-#: config_form.php:71
-msgid "Popularity first, then alphabetical"
+#: config_form.php:79
+msgid "The layout direction of the facets block."
 msgstr ""
 
-#: config_form.php:79
-msgid "Hide popularity"
+#: config_form.php:86
+msgid "Horizontal (useful for themes with top main navigation menu)"
 msgstr ""
 
-#: config_form.php:83
-msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
+#: config_form.php:87
+msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:89
+#: config_form.php:93
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:97
+#: config_form.php:101
 msgid "The Dublin Core elements that can be used for search refinement."
 msgstr ""
 
-#: config_form.php:102
+#: config_form.php:106
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:107
 msgid "Item"
 msgstr ""
 
-#: config_form.php:104
+#: config_form.php:108
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:144
+#: config_form.php:109
+#: config_form.php:185
+#: config_form.php:231
+#: config_form.php:277
+msgid "Sort order"
+msgstr ""
+
+#: config_form.php:110
+#: config_form.php:205
+#: config_form.php:251
+#: config_form.php:297
+msgid "Popularity"
+msgstr ""
+
+#: config_form.php:145
+#: config_form.php:196
+#: config_form.php:242
+#: config_form.php:288
+msgid "Alphabetical"
+msgstr ""
+
+#: config_form.php:146
+#: config_form.php:197
+#: config_form.php:243
+#: config_form.php:289
+msgid "Popularity first, then alphabetical"
+msgstr ""
+
+#: config_form.php:169
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:148
+#: config_form.php:173
+#: config_form.php:219
+#: config_form.php:265
+msgid "Active"
+msgstr ""
+
+#: config_form.php:177
 msgid "If checked, search refinement by Item Type will be available (Items only)."
 msgstr ""
 
-#: config_form.php:156
+#: config_form.php:209
+#: config_form.php:255
+#: config_form.php:301
+msgid "If checked, values's popularity will be displayed."
+msgstr ""
+
+#: config_form.php:215
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:160
+#: config_form.php:223
 msgid "If checked, search refinement by Collection will be available (Items only)."
 msgstr ""
 
-#: config_form.php:168
+#: config_form.php:261
 msgid "Tags"
 msgstr ""
 
-#: config_form.php:172
+#: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
 msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index e80aafa0d6500a1d6f5bdc3ca9853211f734335b..08b2f60fffd62bb141f0064332368f8dd5b4d617 100644
GIT binary patch
delta 1563
zcmbV~&ug4T7{_Ph*8J#dYfH@~nyEcBThd@Hfs#fv8n88DTC63C9%kR2%}zV}&g(m~
z8(P7Y9&!}%MGr->7t!7-d-0$Lt)K<}20bhEAb1q?GrMn$74+b;yPtVx=9%X^&v(9f
z^w-(`j|Zyn3qFtWo8dQKiIEV?W4pYc;giHQxC&!@9zFy&%K1xhig*j|h1W{HQ?6f!
z6U=`K55ik;S%|*)mcd(0RPGaE4ZaPZhd;noI9(OO!q?yv@DAiFe&;V1tn3-F29FR=
z!zlDL+z-#d2jD9(3g3h=KZQ?GUw8&jGckY(xBm^+i8scDK!dmjPs44Pv;GZ?2Q5yH
z3NJ&Z#B=ZfT!*n>qg>BQz6oPzw#)VR-~{!>4F=QjCVUZo4L^qaxn2|Af*CwSb^^Dd
zgTKI2@Kvr$iYQ=g?ME;c`WzmHU%@EoC-^YD3m=44Ci^k*AcM$9U~K(Scmd|{CO7^L
z9wUBZ-^jxc;TrKLP^=`u^t4#9Sz9%9Fp08a#b-JR;u-6b%QA7+s?4i~)#Z#;S6nxU
zXIUurj4k!ONjI&QIt{teUYv2cx$4rOteoq5-RfG|a=8p`-O*ldnb4NOWwN78DpS=n
zn<^NW%8pLEb#b;OleSJS>*l;{sYC}a8$%ge##-6Xf0rZYg2|TTn)1>F=~a*8eMZte
z@lh``m2;o2Rk^()OC`hd?OlaKRdRGAUtbu!KISSl$~2A7nAOc<wmMThUfmcJ)t@VU
zaiOit-E7I}Qk3pm@pkv<T@WvOEiUS);6EDSO;i6%C(h;W66YU3+dR%Oo;pji_+$Lt
z@e?QIiN&Rp#Rn62P6f<!nAaM4#}Mm6a6_jON4GFVnTEl<7lyVC+nE$@a<%w=a$kQP
zuSRBR+zRZIna-t=L3d0{m)(&yT(@-VDpJ^$n=~<*BEfe_F)r72@e+}?I&M)x;RBvw
zA4*!r@;q=UzkOp@R-g1as(7<$ja!mUdew0}g@ATi8WkZ>#n<7Yxtu&NZ+}*L>+m*i
z9&L<|Bi)g%c5I4Xmp800{8M1@<<ybE<kX=`MHRDq-7zFvB{P?i6%g9gM)s5?l0BVA
z=^f|kXi!D9c6f$;D2O}7x!rN>O-B`rwe`XET4OBNc1KH-;XVD}nT&4e{(39_-v_IL
J&M~Ae{sef?mu>(6

delta 1059
zcmY+>Pe>F|90%~<{#Dntwm+7E)e|KYY|}%BL`Y+aFsg$}H({K4n@?xvjq~0ZE`bR`
z-5)_ngh3Gr;bAY{B0P2JTBoi-e<=t;2>L!(M3<fU%y0M2@6UU`&TgJr`gAn=i10a$
zs}ol?Wh0_*`z#{<jyMmuVF9MnM6Iy6YX`LJdSEjggooh}JO;<$bvOmb;5w`jEzuu5
z_;z82Xc4}IS=fb}Ep!fc!$D{ZOu`bJhHX$m+t@O+>mNdV$>4SwK87RkBYcWlr*cGP
z#G6e-8PuoGc!)98S7;MVwGiQv1hnz|uJ@pw_yM$q4YZR!gU8`IJPF@G4}O3V97Yls
zzJ?MWL6Q}?3|mm2@)*l*Q3-az9%u_(g(u(yJOt+;a#9Vp!<F556^<c(4kzGG_zDA6
zkYoh$54>y}y<pE{)Q@JIX|9Fq_%y0A5qC|J9w|gJN_;04deLm8+w1o;VQM^-noV=&
z2^IOyBKKIYlCc)y9VTOs$Ly}~eWtX%YiEu#p_vG^WUdUAzye1L8TK<#Wig*mM9jTD
zvz_fUUAY^Dab#+wsRy|)spg3p&Ss>XGyif|%xwOAh6!b!<ZtJM=7BQ5^RwlH#j7%A
z3yz;~g`!MxpSzk>1@}Ewrb)%k+ol&y1DDv~#i0QcG`}nP)yCWsV@F(T6Sh>kF}B<p
zduxquItrb8!lsq6U<#8;U(`1W*HS5I{<g{`+0T53?R$xNd~bayL$<)<cx#OXQfZ9u
zuwE?pFnJ9-VRzDwEJ7#XcAxNzZmf4@kc9IIw_B%CL~;D-a;0!0vad`P=_Yu`tQI>;
zu?P;dVBQyRwO96P>?=_3Y;)7Y2Wv(+x4n*S^R5#_!ggl2aHmadAI?<NYLfl~RS){j

diff --git a/languages/it.po b/languages/it.po
index 5afb21d..45d124f 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Reference\n"
 "Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
 "POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: 2021-06-09 15:09-0000\n"
+"PO-Revision-Date: 2021-06-13 15:39-0000\n"
 "Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: browse.php:22
+#: browse.php:23
 msgid "Refine search by"
 msgstr "Raffina la ricerca per"
 
@@ -34,113 +34,151 @@ msgstr "Rimuovi filtro"
 msgid "Select"
 msgstr "Seleziona"
 
-#: config_form.php:11
+#: config_form.php:14
 msgid "Use"
 msgstr "Utilizzo"
 
-#: config_form.php:15
+#: config_form.php:18
 msgid "Public hooks"
 msgstr "Hook pubblici"
 
-#: config_form.php:19
+#: config_form.php:22
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
 "own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
-
-"The hook you want to use: Omeka's default <code>public_items_browse</code>, already coded into every page "
-"(so no change is needed), normally showing up at the end of the page; or the plugin's own "
-"<code>public_items_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 "Gli hook che si vogliono usare: quelli di default di Omeka (<code>public_items_browse</code> e <code>public_collections_browse</code>), "
 "già codificati in ogni pagina (così nessuna modifica è necessaria), solitamente mostrati alla fine della pagina; oppure, "
 "quello proprio del plugin (<code>public_facets</code>), che deve essere codificato nelle giuste pagine del tema "
 "ma può essere usato ovunque lo si ritenga opportuno."
 
-#: config_form.php:32
+#: config_form.php:35
 msgid "Aspect"
 msgstr "Aspetto"
 
-#: config_form.php:36
+#: config_form.php:39
 msgid "Description"
 msgstr "Descrizione"
 
-#: config_form.php:40
+#: config_form.php:43
 msgid "Text to be used as additional description (tip: keep it short)."
 msgstr "Testo da usare come descrizione addizionale (consiglio: mantenerlo corto)."
 
-#: config_form.php:48
+#: config_form.php:51
 msgid "Hide single entries"
 msgstr "Nascondi valori singoli"
 
-#: config_form.php:52
+#: config_form.php:55
 msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
-msgstr "Se selezionato, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
-
-#: config_form.php:60
-msgid "Sort order"
-msgstr "Direzione ordinamento"
+msgstr "Se selezionata, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
 
-#: config_form.php:64
-msgid "The sorting order for values in select fields."
-msgstr "La direzione di ordinamento per i valori dei campi di selezione."
+#: config_form.php:63
+msgid "Block collapsable"
+msgstr "Blocco contraibile"
 
-#: config_form.php:70
-msgid "Alphabetical"
-msgstr "Alfabetico"
+#: config_form.php:67
+msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgstr ""
+"Se selezionata, il blocco filtri sarà contraibile (consiglio: dal momento che utilizza meno spazio, è particolarmente "
+"utile con i temi a layout orizzontale)."
 
-#: config_form.php:71
-msgid "Popularity first, then alphabetical"
-msgstr "Prima popolarità, poi alfabetico"
+#: config_form.php:75
+msgid "Block layout"
+msgstr "Layout blocco"
 
 #: config_form.php:79
-msgid "Hide popularity"
-msgstr "Nascondi popolarità"
+msgid "The layout direction of the facets block."
+msgstr "La direzione del layout del blocco filtri."
 
-#: config_form.php:83
-msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
-msgstr "Se selezionato, la popolarità dei valori non verrà mostrata (la direzione di ordinamento ne terrà comunque conto, se necessario)."
+#: config_form.php:86
+msgid "Horizontal (useful for themes with top main navigation menu)"
+msgstr "Orizzontale (utile per i temi con un menu di navigazione principale superiore)"
 
-#: config_form.php:89
+#: config_form.php:87
+msgid "Vertical (useful for themes with side main navigation menu)"
+msgstr "Verticale (utile per i temi con un menu di navigazione principale laterale)"
+
+#: config_form.php:93
 msgid "Elements"
 msgstr "Elementi"
 
-#: config_form.php:97
+#: config_form.php:101
 msgid "The Dublin Core elements that can be used for search refinement."
 msgstr "Gli elementi Dublin Core che possono essere usati per il raffinamento della ricerca."
 
-#: config_form.php:102
+#: config_form.php:106
 msgid "Element name"
 msgstr "Nome elemento"
 
-#: config_form.php:103
+#: config_form.php:107
 msgid "Item"
 msgstr "Documento"
 
-#: config_form.php:104
+#: config_form.php:108
 msgid "Collection"
 msgstr "Collezione"
 
-#: config_form.php:144
+#: config_form.php:109
+#: config_form.php:185
+#: config_form.php:231
+#: config_form.php:277
+msgid "Ordinamento"
+msgstr ""
+
+#: config_form.php:110
+#: config_form.php:205
+#: config_form.php:251
+#: config_form.php:297
+msgid "Popularity"
+msgstr "Popolarità"
+
+#: config_form.php:145
+#: config_form.php:196
+#: config_form.php:242
+#: config_form.php:288
+msgid "Alphabetical"
+msgstr "Alfabetico"
+
+#: config_form.php:146
+#: config_form.php:197
+#: config_form.php:243
+#: config_form.php:289
+msgid "Popularity first, then alphabetical"
+msgstr "Popolarità prima, poi alfabetico"
+
+#: config_form.php:169
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:148
+#: config_form.php:173
+#: config_form.php:219
+#: config_form.php:265
+msgid "Active"
+msgstr "Attivo"
+
+#: config_form.php:177
 msgid "If checked, search refinement by Item Type will be available (Items only)."
 msgstr "Se selezionata, il raffinamento della ricerca per Tipologia di Documento sarà disponibile (solo per Documenti)."
 
-#: config_form.php:156
+#: config_form.php:209
+#: config_form.php:255
+#: config_form.php:301
+msgid "If checked, values's popularity will be displayed."
+msgstr "Se selezionata, la poporità dei valori verrà mostrata."
+
+#: config_form.php:215
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:160
+#: config_form.php:223
 msgid "If checked, search refinement by Collection will be available (Items only)."
 msgstr "Se selezionata, il raffinamento della ricerca per Collezione sarà disponibile (solo per Documenti)."
 
-#: config_form.php:168
+#: config_form.php:261
 msgid "Tags"
 msgstr "Etichette"
 
-#: config_form.php:172
+#: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
 msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile (solo per Documenti)."
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
index fd7adf2..16dc8da 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Reference\n"
 "Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
 "POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2021-06-13 15:39-0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: browse.php:22
+#: browse.php:23
 msgid "Refine search by"
 msgstr ""
 
@@ -34,105 +34,145 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: config_form.php:11
+#: config_form.php:14
 msgid "Use"
 msgstr ""
 
-#: config_form.php:15
+#: config_form.php:18
 msgid "Public hooks"
 msgstr ""
 
-#: config_form.php:19
+#: config_form.php:22
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
 "own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 
-#: config_form.php:32
+#: config_form.php:35
 msgid "Aspect"
 msgstr ""
 
-#: config_form.php:36
+#: config_form.php:39
 msgid "Description"
 msgstr ""
 
-#: config_form.php:40
+#: config_form.php:43
 msgid "Text to be used as additional description (tip: keep it short)."
 msgstr ""
 
-#: config_form.php:48
+#: config_form.php:51
 msgid "Hide single entries"
 msgstr ""
 
-#: config_form.php:52
+#: config_form.php:55
 msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
 msgstr ""
 
-#: config_form.php:60
-msgid "Sort order"
+#: config_form.php:63
+msgid "Block collapsable"
 msgstr ""
 
-#: config_form.php:64
-msgid "The sorting order for values in select fields."
+#: config_form.php:67
+msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
-#: config_form.php:70
-msgid "Alphabetical"
+#: config_form.php:75
+msgid "Block layout"
 msgstr ""
 
-#: config_form.php:71
-msgid "Popularity first, then alphabetical"
+#: config_form.php:79
+msgid "The layout direction of the facets block."
 msgstr ""
 
-#: config_form.php:79
-msgid "Hide popularity"
+#: config_form.php:86
+msgid "Horizontal (useful for themes with top main navigation menu)"
 msgstr ""
 
-#: config_form.php:83
-msgid "If checked, values's popularity will not be displayed (sorting order will still take it into consideration, if required)."
+#: config_form.php:87
+msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:89
+#: config_form.php:93
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:97
+#: config_form.php:101
 msgid "The Dublin Core elements that can be used for search refinement."
 msgstr ""
 
-#: config_form.php:102
+#: config_form.php:106
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:107
 msgid "Item"
 msgstr ""
 
-#: config_form.php:104
+#: config_form.php:108
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:144
+#: config_form.php:109
+#: config_form.php:185
+#: config_form.php:231
+#: config_form.php:277
+msgid "Sort order"
+msgstr ""
+
+#: config_form.php:110
+#: config_form.php:205
+#: config_form.php:251
+#: config_form.php:297
+msgid "Popularity"
+msgstr ""
+
+#: config_form.php:145
+#: config_form.php:196
+#: config_form.php:242
+#: config_form.php:288
+msgid "Alphabetical"
+msgstr ""
+
+#: config_form.php:146
+#: config_form.php:197
+#: config_form.php:243
+#: config_form.php:289
+msgid "Popularity first, then alphabetical"
+msgstr ""
+
+#: config_form.php:169
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:148
+#: config_form.php:173
+#: config_form.php:219
+#: config_form.php:265
+msgid "Active"
+msgstr ""
+
+#: config_form.php:177
 msgid "If checked, search refinement by Item Type will be available (Items only)."
 msgstr ""
 
-#: config_form.php:156
+#: config_form.php:209
+#: config_form.php:255
+#: config_form.php:301
+msgid "If checked, values's popularity will be displayed."
+msgstr ""
+
+#: config_form.php:215
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:160
+#: config_form.php:223
 msgid "If checked, search refinement by Collection will be available (Items only)."
 msgstr ""
 
-#: config_form.php:168
+#: config_form.php:261
 msgid "Tags"
 msgstr ""
 
-#: config_form.php:172
+#: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
 msgstr ""
\ No newline at end of file

From 606286488cb07f261f280799348a856421991e6c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 14 Jun 2021 21:40:54 +0200
Subject: [PATCH 057/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 3298253..98605fa 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -1,7 +1,7 @@
 [info]
 name = "Facets"
 author = "Jean-Baptiste HEREN and Daniele BINAGHI"
-description="Filter browse/advanced search using facets"
+description="Adds a faceted navigation block to narrow down Items and Collections search results by applying multiple filters"
 license="GPLv3"
 link=""
 support_link=""

From bb2441d27ee841d573038de396d9adaa32c506bb Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:19:51 +0200
Subject: [PATCH 058/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 98605fa..4b72021 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -1,6 +1,6 @@
 [info]
 name = "Facets"
-author = "Jean-Baptiste HEREN and Daniele BINAGHI"
+author = "Jean-Baptiste Heren and Daniele Binaghi"
 description="Adds a faceted navigation block to narrow down Items and Collections search results by applying multiple filters"
 license="GPLv3"
 link=""

From 14892555315ddfcfd51a68d51056360b9b0938d6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:20:25 +0200
Subject: [PATCH 059/161] Delete facets.jpg

---
 facets.jpg | Bin 24284 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 facets.jpg

diff --git a/facets.jpg b/facets.jpg
deleted file mode 100644
index 23c948d82240fe105ffddeb0e98ec16a1f7a4c99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24284
zcmeHucR&=&((f!w&N(MZA_yo^a*`~PL9!%?OU`K(6_g-~3MvvLND`171<4{x4w92d
z65JJm1(w}6sCdr1_q^|T?{~lV{&@p4{oC&9?yBmZnd<5q><8=|K&h>+r4B$K0B{%l
z1F-YJRkdK(D*&LY3kU!JKnUPLr~xR5AmASWVFvKNV*t>Gu>8V?5dNPuH~<ji3gG^v
zu>jMf18n)I_Rkb26X%!$VwDL!#yHwXq}UDMoW6^fzn7njmp7-F@EPEoik2?!QH$X5
z9rJ#Nl*4TC<B32y?&?*dN1stDk=O+aB`sA|TYW=4b*&3(--V($W9RMdfkO!ZFi(G9
zLk$(qOXe1w1PdVNH~=xg4iMTo_<1Yq>t8r(^Emz9{;$i<=y%?MA)%wTer5k2pmKEb
za{z_c2g&Un{TyH*t^@#FMh9<Se*nOH2j+7J`FkH>1c+&UK?VT;|43e1=O38y2;2X_
zr@zw}8>)gdO5pI2+S&O!0|5CE|D1si&R{#_M?9YKbaeFu@ly~hIJnq3f_MtVr(rNJ
z5K|C>nBV?S?KuAl+u7OwYSYfn`4|2n3s@8E_`Iv1w})NG_aFbs3(O+`)Ytce3%ruL
z_-Y!0DJ`hCe0MLMBTNe7Mo;^TdLX6-@f%lAqMvxeB|y^z#7Fd>9sE>}W*|KP4z{D+
zc^we5f|x$Q-9-5(7Pa#Q(RX^Bi?04!#y_#Wub1J^_HhC|JuV*U_o$s)E>2p<INixl
z%?Qi~dB6$0;;OC%VsNJ6RED}3n}HbQ6Q@1U)$}5W$wA!j=WcYw!%;gkp)RUN`QK@L
z0}PLN<^l7+UGY^vk`bhVGQ#{o^u2wku!G(AzQDNvRq}T+)&%pxy3k8bewU8;`Obr*
z(|I)zgFHYTojgr`@&*NGm&#F_M|GpUJ-*L%kRF=u<e_nt59%5E(l5~HxbC38uklen
zs6*(2o1OO2+&$`R$J<~3NIxKNxH!NCKovL-Z~_6~X%Bb-Zh&j==bF#puOB7qfF0lq
zI0H_A(9fLX8fM>1Ji)6G5DIJno*<3iuX-xqOPzo~F#qsZ?vJ`cz?JW%f!}Mm1E0Vi
zV7Sb<3b?Yk7r?6$c#7hl!<9a+$4PO_C%zi~d3;TLb^KGuIe-JmwFh|m0<M3NrvsKb
zfztVcSI=V^{%8;H6W##c0^SJT9Nsu!3Vi(D%1=pcU88)DIr!DGE-(kS_CqU9pvL|r
z9WEcpwFIsTt~|&;$U81QE;As6D-KGcjH?LBCIRLiYww8bfM2}*q03{vAJZLi&G{!8
zf98`5kW2jJ!v0t)a3qg4@sF+iQQ`_Xf>b*HNC~|Kt$=nxTcF+0MraMd32lbfLf=7O
z9pRrmtAE#y^RM0vziZSTl)?3w=1kF<)iday^v4p|fu%?NAB}*Yzf-V3IQIZmFYgdv
zS7#T0PG#_E?8K?%=^%WXQ}oQ)a{zGkY(Js_fGzs(&uj?&+duMrUIT!1EcjeFdaQCD
zQ2~G*HvrUq0sxwwKk~T0g46vj0KDpV2=ER3L5F*k;DK)p3h=IA0^b|l06!>?C?E;Q
z0!n}ypbh8&#(+6s18Up_fPp**0pY+kAR34R-+B*$CqM>}4desGKsitYGy*L^C(r}*
z10%pBI4_ofbpQeE00$5VgaASYp@A?#I3T<bL5L{i97F-42Dtz+gqTAvL!2R=kN`+H
z<T@k{k_34Ic?KzfltJnsEs$==0Aw684_SqLh3w-%aY%7!aoBM9a71v<;V9$i;27gr
z<2d8^;DqAbz`29-2qz2Y1x__i3r-Kt2+kbNI?gr}fRaGzp(mh1&~s2#s2<b;dIjnW
zjfBQRlc8DA5@<a*&O^{S=x692E<P>|E+?)KI5#zMO>iA>eQ+aj<8hzh=Hpi5w&M=r
z&f_9*F?eKntayTWGI&~em++kNg7Bj8lJTD7RpE7j_stUC4n96UJ^o32De%5D$9KaI
z!;i;L!!N~ujX!|Dh`&uhK)^&GNFYz3M_@<bPY_M;nBWCLGr=Ii5&?>kgph+!lu(_}
zg3yyNiZGe5kg$nxkZ_ssfQXWamq><4kI0cIgeZ|Hhp3*Yk7$YLfS8K-B(XfPF|ix*
zHR4CaCBz-XQ^Z>&BqUrU(j*2Xt|V7U9+A8xc|$T!vPViyDnP1AYDF4AdWSTR^fl=?
z=@uCo86TMvnFX0Y*&VV1vNp0AG88!txiGmFxg$B8Je9nfe2{#Tf{22bLYcybB9tPT
zqJpB2;xi=?B_E|Kr5$A?Wh!MI<rw8Q6%Ex{Dm^L~RXkN8RX5cNH32mrwHmb}^$qH5
z>Ne^{8Ym4njVg@;&2^d_nhu&JT724*v|6-ov~je>w7s+lI%+y`I#aq}x>UMXbaV7j
zdOmtBdJp<U`f~bF`h5mA24w~(hT9A!41)~2j4X^wj82TPjHQetjQdQSOlnN-O!t^-
zn5LO=nFW{)n1h(pnLC(2v(U20vN*8BvXrw-u;Q=^uo|+4v1YTrW8G$BXVYNwW_!%m
z#`c+=o?VIEjr{?86Z<L$4Tl1UE5`$lW{x#ZI!<Ly56(xN?VN}ctS2;21e|zwqW8oB
z*GVoDt|+cju4!&!?sME%xF2x0awB*+cyxKfd5U-@c!_w=@w)J)@OJU;@}1-}<BQ>|
z;afS$cv9<R=*gm!Q~YH7iu^wOS^UGN@K2pP<$fydRKEa@fP{dHK&n8WAdaA<psQe-
z;J|6T)6%CsPiLJT6CxE-777$95}FsL7rr1IC0rxCDZ(RSA#zWoO9XR9;*7_coHLVW
zsn2SkjXGO@_N%CXsDo&#=&%@>n7SBTtX2#uE-3CKo-Y1Df<{7DB1WQB;!sjb(pR!X
za#e~)>ax^Rsj+jk=k(9TpL-*XC#@n4mu{5alaZA1mnoO|A}b{8E?X$OB6m{GNiIij
zQJzcQPX3wvoC2r9Wra+IImHu-c8Xbw3rgHdj!Ms!mX%K_yD7g=-c&iG;;T}nva2ei
z8ln37JoLQA`PlQlYSd~bYERT=)Vb81)r-^-8WI{|8m~3+G<7uZX^v^JX*p;WXd$$v
zv?H|Jbx3uLbe`xeToAb6d!b$zM^{_-zV6gT-iw|WYxDp;Exr4C)A}d%ee@d)@D210
zQVl*Co;3_N>@uP;vNb9++A&r!PBfl0;Wr5|X*H!VwK6R*-8DOJmSi?}N#s(*r5<x;
zb64|P3jzyMi{}>GmTHy{Etjk$tfH+(txsA9TX)+q+j!W#vZb)Kv#q#{ciHT6;bpX)
zo?VvRw!N19Q+tGiszZvyx}%cg1IJY-d8Z_&<ty@6lCG>c%RAq9UUgA)Np|_{s_Od0
z73rqwmf^PRuIHZTj`c9}D1{NiF2m|PsXg62+r8Mmg1rX31-+xa=X_**9{M1Bb$p-u
zLHw-!YW-<JGv{3Zf56Rv`9Ouh)Id~_X;4KlRj_C9yAXkp+ab%L>Y=$|xM2=qt>Gua
zuZ7P?C`UYtghbj$w!*pLH{eTGHLm7gBfjQ-?S0glsHCWG*Uhfi-(b6O^~T~&jhjW$
z<k7y-V==NZ8Mkn6x!&r%Eq43yZA`3V?Ay3AamjJ$c!&7631<@?C1CGdxzn2{nV5bT
z|E}lV(R+&b@{_2NLX#Hn>)x+^!1*Bd!MBID54)4alQU9?Qvy=v9$k1;`<UnP-N)!B
zE>A{MRZ>fzvOc~2bT`d0Z7^Lay(EJzBQ9e<(>3$MGmU4}S$tW^+4$Lk*`IPubGmZR
z<rX|=ejfMyFwZk@F5fV}y+Ep<ppdmNu?VLqplJ1l)r<b(^To9#LM6{i=}Y5Y0xttz
zu9aOb8!gu<Z>>02QBuiU`Lv3rDz+L@9a4>`ajBWBHLo40)2?f+m#wdA5N^n8Jkgl?
zitbfn6LHgxCTw$P^Y&}+*PmOQTNYbwTPNEtwGFo$wD)%CbiC<Q?`-Q*?rMG`|E959
zrn~O#xwkbvl0DV$B;HlMmv~>*E7@D!C)HQmFWp~1AUDu7s5sa%bbhFFSZlav<l@M{
zsLAMuF{`n;4~`#J#y!T76M+*4lUJwkredclr;}$`XR>Bb&6dtd&b^vHKmTsQXkl{E
zVR8MV-$(S)jZb8sl9xG_3syu|8dud<``0Yjme#%34?ah4P;ETj<ln6PqV(k*;u2yB
z>5IgEjo)J0%KIk%t#w;}du9i=bFdqWVnXHbo!jf$H``x62tpH}A03`LtjFkJrm!$9
z*4xh4?z=4j1+O?)z!mb>JOCgw2W^Lb03as+vG)2-@qMNI6M^Q&cl0Cu6aKM2`(7pq
z0C`FPU~&}zF1!YSbnxT_F)5fHncl`q0FId0uM^BUI{dDPiGBwVQeV(CL1D35Yydz|
z4*-Y0SnNR>7JHZj+U(;1@Y?6cn(v4jpArBvkJeSdd+x9kN9msr>}!CE5Jwwg1%+?{
zI8+cQ6$IN3aDcqyfrbfq91}xuptyMW1cXGyBp^W*C4d8gLUC}Rcz8z(bw~tQ4&YMZ
zQJ*-gj89`=N5JJnD|+qTGeT~avKBhS0R)ejy>Ao|F+Bq#6EiR0N&Zs;;u4Zl=cHv+
z&#S3xXliL28Jn1zfhL)Qqtg{<7gskw|A4@t;E>SkH*QA9+`1i`bpOG_<djE`pJZj{
z<UY^KFDNXpsI024sjaJTZENr7?0VDvc5rBTWOVGq_{99e;>V>=%PXsE$gf-9ws&?>
zd;3RnK>+9vv3^PR4{}j~a^c|OLU9R><bvP?fhUv-7w^Pbd}?I_0y`fXF41d*v?}+W
zm9-FYiy0#5?0pA_>3PKGd67q=eV6R_1dIB&B>N@UA978CCNs|W1BwHV5)=xK6fSt+
z5#Svi1cabj1s;Sy5903!Xa<pxfELcr0}D0+0owp8<AeWXL<B^~MZce7r$NUKJ$3>h
zg+jo|1f>ELfkSjwEI;t~=bqVOUq>?=S^|j$+A_$3Vc)Xt785KF1cI8XlFebnl_3wA
zgt<-e92Es2QDR9l;w6J@iG}&40Aj3zB~>hcJyLSCGBtzLdTP=<ILM&9GI_#svNQeD
zgu61)lcnWHS~!p5xv2$lvg&)_32@>~w1{H-98&1ID}8<9j@(eniN#^`fY%P+t!w-Z
zVrSx&E8YvM-0Y)0SH_;F7Q&;*ra)u0YC6$TdTYZucGswG05*R^i+Act+TFmqN=p+}
zZ%@uk)47Q~)64~@0o*Z`e9T}vV9SbPXqn-tWqzk1Re9g2W<&`3-tn|t-kEONvg{Wd
zr=OX*v8v}(-i*|5)op-$gV8O^P;|g!W=@WbsrE}e@+$e5gy9d*x!WPT>PzT#UW}GX
zXUA19MYs!=__dmXZe{o?e^xB;cPF<0_r{<!zS$KXV<U;WjwG0me3lt(qwA-ENH3YV
zQ)1&Te#bI|RQZ`^37@JUOnvIbGeS<skBgrtP8BmdTtH1O612|JxHOZ?(acj^kEE{{
z_NdgOnOxI@i3eWU)hegf^|sVu5Kiu&dOb+^%&+!*S}Id%s^WZxg6!nDTO?;$KU<X$
z$-=ux`JrzI?=KQvEOvx7_1YgO-A}!7u#`*4bbIp6^0sfRPpX;w{v`Uw;N<=~#`(1^
zbtEHd*8&N@svv}teJ#5Ba>XLOK(chcL0)}KZ^T*GLVT+fcXW#fXYNg&_kptW1y8%$
z!uDALIoP~jEEXULcb!wj5h}Sk4-;$Ok&>}kL-z2c@zu#0st@UkoptgMzrUw$9Z#(B
z$y;xQj&@Ost-0uS(OTclCK5C!>iV2WY_dgX0)5#tlniFpv~et4zHr8Jc6H}T?(nSv
zg$MH=(@af8rE#CX>Fw&CDA?7dHLl50UHf35M*Ft|haLF6LHqj~>z{5uD0c8y+mIJ;
zn}e@ypUc^@$LwS5%L6jDeXu|y{Nd%x`ULKuIu5td9qb;qv$pTd=&q^b0f9~5e;E8I
z@wr6%|H=N33gP$ns#o4;Uho#Q)xZLlCl9js`UzCkX!RlBNq`;tH3(1^b1Y!SaL~19
zis!YixVC@=g0X<W>r9+j{{P-tEe_u<hu15nIgEBDVyg9aHMTOzqkgtZfgS$$S)h<d
zl`U4G91vse8I)wHZe-6~hpaoU+z_;Scb)1y5hu>3iLYj-d+b2tDdZ#9C-^mmsOgfb
zyoR#cQGe9u4cNEDa!uv>sByWJI>TFf$?s*)+I4?wXpUvatw3cUzO>s?cx^hB$Fwv1
z?<l%mXNNVsZRY7tms0;=w<&nDzcf-oHOu7*eqGi|n@Lqe`E{ewVz0IjQ<s#v;%+~y
z3T{XC$q59u2c7nuU1t^6RfRX~qf4l<fa3ZVhx>sNN+xWUvLz^QT_zyqMqXo#&F~i(
zJqy_xbIZ8rVYeGwaT?Flk<`_(L`CCH3^mCF+kD#a2!M%M^lu7_vy{?&P|Y9z`~(YV
zm5(pKCpD0}!+!R()3dugZSSm}`w|dvv?|gEXSXyng;OnPX7$gb;==O#@@6cjHA4H<
z!kozpA9H`ed6Pi?Rl$k#T9ThRJ)E?OOEF4<<1?JZMS%j9=rtd9cv2gAo;l8qi{#+e
zfJt$(i}_;B!$or*YDm>X^|4MB)9P2v8v9tlI&FIolUHDYb{qOKd1+`Ku~X;%!u1KR
z4R_7Z7oo+3FE50pUKpzMh-sv)oWIv_`d&P}!NXpH8%+w6HfSM4-kor}?3oX13a1h;
zM76fQJ>hd$kneUjBuoCB*DQ}V^lXwHrRIZfz7E_w?k$RB;c(buLk5+*h5W0V>A7=X
zJ`*{nSf!dY-a%SV=iXZ~`o!}N4dZsv*AuD=N#K}2*>Nk9C7h$8aj^0YS_ct|1@zK{
zqH|N_ZO*-L9uj`5&3WbO9!=%T7!L7Rs@Q^QGnehJ2PI!nmizs2P3iEYL(ee$+ymuc
zRki+b^B3+io)u1hbAd4jK^Kxo6vo}jT8X&othDW(j1TeX(%z{f&4@79$O|@VUtf5o
zV681AW;nQ@6>lJ1;I(7!oak2m?q2d~Ztp2C;&EI$y05c$BFWJz$aqD%a3ilg3rlw!
zxdHJ+GS?>_^-(u!$_Jl>-0T=$XW@GDb?S{=?e%%Oi@us1wyS-9yf+(DUPdI(wWoV1
z*!L{eG77$mH0{b?*M2+3?71UsphgEJ=FhtNPv?gLEHK)QS-}J(S~4r{k1I}d^j?)Y
zCR4<Y{O-*tXft-<&H~=!r%~gJ(6UU@SV8y!y~y6m?A`32X(lQ0e<Uvl(-DUWmHNmJ
z#gCo&iBG}H?6E+4!X7d3I;#c?9RE^02LEret3AbQ=WZ^Mx99hs5oG?M{lC-r=x=Jg
zzE}z)w}^&6E;0QDGf9RG)BxH)opgxi+X^zl3kQp~i3+5yk=z5}3=0vGy(5i8x$gBL
z$s#n5Jum}8Z>J>M*?o&!T;$?>ODU2Z{Wv3T@2Z8X9;k-%qHZH=UMonT!irI<Y9pmK
zYa!v#g;NrE)hQZJH1B`jtq^VX6nb8f_OzgS%fe-tV8Xm00MlIbpjzPuQmWGyK#|k2
zOAmKGK=3B+#21s6PptOkpNoZr_)yD9wrX7*akVzy?wxVJ-QOhO#;nnv5o=+V7~n2}
zzydcvBK8L3O%rGb672cf$*PvZ3YIe5RH*2lmS;WlwCr3$F(6N>qT&`MQ(I?fPzm$R
z9Fr?!Vz$9|{Mb4(id=UjC!D$_ge+zP8Y+?mFKtp8B<V?oo^88LUD^)6W=oH@Ek&!0
z_)p8Kzwa!VOYmxI-CvQYE|9vBL)`}p!)cv$xU;fk?=SX%(U<OlkWC7vxmb}#R#p&h
z0k?@6VTN~RMDM3(ghjX(W{6!JiN5aV#9N7UJG&PDY_Na4(cR}$qX&-?cUyaS2cP1T
zT9(;~l=*xlM-*E6nQ(To&LUfw8Dclp+0M5o&t}Ev!tUMa(uYmbi%CN17pD(&bQAfc
zd_FeuqBM|KHW%A6XwXD+eT2ad?dkML?ci(Sk}0{|qe(D<WvzPmjf*T7c;7^?#QA-^
zKy^a@UHJR5AO(JeUMB@raOym~U1LC;Uj!|(U~OhFEFKo2+^Xu7ziMU?N)-$nwz^oZ
zUH&%w0gDcomjK%ob@Qu3*TYcqpqhq5ufvcGivb(+uwt}X;(^|0cE-WwuK_)>FvZ9h
z1BZF)_qz{tKW41FU(%yr4YWkJ>c(xAY|123*anw>(I4YN(x<rRjZfO{S)3o;y|VP>
zbYuQx?_*M*J?fC$p&mSp30cEaqL;lTvHUql#s|d473pPxx<5Y)U1R>znug!i!OmHx
zC&R|RzwudZ?W72+(F<R^M~Ssefn|F-!a)=|SyvS)`LIA#G5TWlR?`@wr)}r?c&^UP
z+Og8h!R$Du#*ZC`=(2(zn>(5jzj+-EL=mixeV#{BEPUy(g>)=t#5Pe>Af$(HrCb=|
zYDiz(*r1rIt))@+yet|odcOM;9%s`iFTO~uq9aEXy9jC^5A8czX~$RNT<spGq%>4T
zvLYFgyt6sW;#6Bra>L&HgDPiWG!4hlH;5q?z{o9OfxtR}buTQi*lWA%p7g_L`WxeC
z?6>cJ@x-z&6c!M(DrORgOgS3dvr^Xu(d5Vf8W}p8(cD+p1p>!u>*(4Y2ktAeRjUcB
z`7nt)_7iyBQ~wu{c?1?<_r(GYRu7rPzuS<IU+<B!b%#GpOyyrD<{t~c|7RxVAIq43
zjfJA=E+2^(Wfr<Su4zmTsh98f_@09$v|Zl1-cm$o@ihbn<Ex9F(W&E74~U|U($Zui
ze6D_;bQ=GY!I~P>GJ`53!Ilm!i)d@X0t^xnI=Ukp+Zl8gs33jtEnK0N-9xui=-;07
z*74!AQ{3$|Ye#artCPbK6hX+Y`NNc(+s%wqS_Q(7=Qm7sS@adhgKYezd>)v-Q?Px+
z{VwjH6~}LkZh00GNx3>f5nVai#~Q4B8f}n0J3D1LHPb^kA3xnEUL;h~{rnF7*IcSH
z;)JJnG*0%(InTl4is!IEtSxz^7g2SVoX!H#cAAti!%nxC#KRuTw@BI`>fFI{IhXh*
z13*kOJ9bDTZ+i$sSU<bJjs<{?O$Bk)IgU6urMMoW+moiET-Q+3gdz*`ORI_bx_K@B
z!U^rsvW#*aHS88wzi!$q14(55w-<ZXXYVL5RS!sv2Z#`&5?h#`zoM%=+riuLs<<Ob
zRqph?y<QvX4;#YcCjsK_=E2AlE6tR0K?|^xt!B*mNaq-FcQQrTQjURIh%4KK4%=em
zv&97F0NzC{UnmTBj@@BCrd5$KTnMSxT72>|joZH7RSfG?u<4e`&5gx7?yKy*CTBZ%
zTCFoyUgSKSs}Ep#Y-PB9=z<02sQ5PWwhO_>N+`iK1z}fH3?5=Ldx0!;tHUDkc7X21
zt_$wg<d%Xxc~!}QE|IOG1Bc1{=GIgBu+%#w5Ubt_<UKA_9Add$#-^Z1cb<X?^#3=+
zY3WM5@8}p-yds$kYfP+u(cyTv(o;#l?sBa}s|8vZ$-CV8g*@1(V+McZW5ZCuMv!Uj
zme%lwP*no+r%wxEse-A}Nvryg>HSF8Y+bG2t__q;PX+6>HZz<+X0%4QcO{Dy%ml;R
zEUGg~*ZO;0xEY?@t~pD6Yk<MY(wEOAi|ExgwTX-4<@K2Qv+G{#b!+sttWB(L3e-br
z2M4&1L`gwGcb54?@zdD}F}Hh~$nGoEPUmOBVJwen^9l3cwF@Ni&tUp(N&Ppt58U+|
znrfnjyn}r=rG`qv57_h{lHg6*kto@QGLAQyn+$hai7qe88_iR+7pwGK95ZUG5e%5m
zxE<ORr=Bc9C?s4ZBw`l*X{xw*=~X9e)84#oKK;yxvzrs`V?GOtF`+SNZb`pj?$@EY
z54W*E!Z$DKwE-Kqz+JO3l3Y2K&6CMt-L!8Jt!3w<OwXxJzw{5hlOY1mMk(QRcqy8q
zaX+rj=0rKt<~FR<wcloPa@uR0{+X-9&9|R@W5Q_)wI2)Kt5a8}P_?YQ7I*bCaWYd|
z0Mlo0%{Tjl!)J@ZRcOwcfAn4yCvY5kWNaobU)nCq#sbCn4+qdI(9EA?e|B8_&C^71
zzArwb`i3o$0@qqP;6<oV=-*N8Rh6Km#B*@|l+=C&bkP$XvH0}L6Em8?se?PQ==WG4
zCSDZ_sNiOxByBNj*%<b-6o-V=@VRmL9(~ch7*WLw`K9k>QNits-#E3fz;!1q@X<nX
zevuLj^j|xPAxpsm_gp^Oy-OSt5Zsdb->N76LoI1WKkjdD|E|+J>a1@LMYEd4;Q!Fc
z|IVs<_IKu9^8XWeZvPf{ZvRp4)P8XHe^+(PKULR+k8(KhRYh_voQ#nJ<QVwU!<9ol
zI>v{S?eIC1VI6WerZGi~Q!<~L_E_VGD@W(jT92mX-%Z2cb=@?RHhYxrotve_0%P)0
zSU_{WbZP=EdRX54aWUKo3s`-dJ>-rqVYx4#_z3jk4!8f=l`B|`ppVH$WpvhaL<g)^
zk%S33=vNJ;!%kbK=BIBO-{djyCsm_*Dt<Mp1M-37GP`y|^Ua|T7U7zR>Su*(GLiQj
z?227?$IR+;-&9sbljz*~^q}$uBmRdQT#L)$!s@=lMACxyWxqDC*DZM6fD?&}Frju|
zo63yc$r}l$^9o39NQE)$a)q^1#<{Rs<V`v-7+rkXsf}ZMM>Gd9BY+}9I=5iB2IWo`
zpgb`!ON$}9VOVjoo!HYixzB4(*Xc<P!w!@Q-p1FXm!(T{B2S`K5*JR!Me+uRnV^>D
z#xcyOw3F`EGCk&14Wsk1xLTQaItO5s#XVD9HM>La8q8~X@@-1nF=8mc1wE?ZPdbVm
zE|ksf8PWA3F_qC_bvUc_(N8NR+L`0iZF(dcMY|}cCZBeyijX`#T%w)90tk*Z_s!`^
zFO=Xn1x7`3g%cvN8rLS<Wb%<D8lMtQPt?|(g=C1iGJY+?0z!VE0a;~peLmwxb&U-z
zDmQ2Wwf%~w9Se|u3zm==%8O<c$~m}@!2DuCP3pvh&i7wGC)|5bBz5ip+SW|d#L?Ww
z!VzWBbsH_3E*jTToXZww`gPluBB$AdhVQ<g_iRHNJ)QC0C?jqlnXyzcqpOK_q_~N{
zIT6DdtkeFaw_$FYqpii^$*k_n;oPAw!k!jyI~>*AA5oLsyfsxfdHUVk!e>6ZP3g_0
zdy$+;Rfmdt>-$5C#X7Iqr3cWmu!TdTwu!X#o1t&3Cm!sSBoFRo_>pTsu)x)q5Yz`t
zt~%mFJQNZsr8DYZ%HlS|fVw$vnL!-9);Xc0N3j~}CUW~q!);E@%wh8fk4{uN`fgQ^
zn-I6hvMGD@Rdn+`oNgbaj^%%@2|BF-@Pw>0bF?Vlvf)8F6^2{%zc4&d8Q7c{-4Ob?
z<)zORo#a))De|%FF5^>4h0D44Yl&T001v~7J_D{XqtRN6mbgQ6$n(D4&Ypvb)oM$2
z)l*7JE|2@8If6k8-fYi(rElD5L8`6qnhiZtv7<Ps-Dt+W91FBRA8JYV`q&*9oFw~r
zcgZ^R#)I&eB?zs+57LPfiya&kkvyn46;#<=25n!V-h!-9$`i5~i^cN?{3I2L$+SUz
zn{}u69+I4RV>VnQ$nJM=77KKDprx_E%SkM-N;e&eCXZ?cRdz*j?_6_?;tmV^kgK6|
z_FBKO@rsoseJuZr9^$|ACj725wV71Wqgweu9hG;QVDsBd9_A_dRM=nGhDXnmqm}b@
ziri-y2C4*CclK(e0x9*xK10m>>gmtv1Ko3^CTbrH%`~>+K52Y+%sax59P{4{umEw;
zJjWrC0vi@+u?C$oEZG>^FRhCE)ZwzAb=Ba7kuuw$Vt=2}+x(bgcWjF`<Q^7?fS<J;
z&_JJ>y#fEmg9-x2DR36;nTRrKCd2|OT8J+g;*Dn1H2VNSh4WVFzuu!prSj)-^!nb9
zt~9=POm|2NZ%spiYZVo}7&yWVh6OrTK<|SrA`x>VgB&yoOTYn17}%f;lZ4A)zRRc2
ztK`cH{XFuoRFzd<<i@wc0<R02+^|46eAeWU1`GTPJ=?=0LLKr~FVb9lswus`W%f<?
zH*~B~NpYob+4lX#)ULzre_vpOAG(ICaUk*{sX*fbT&JVyCgI3>#rcb9ZY=QZWLq;z
zuo_(L`iGtWe>AGMhe9#-iDxO0rJn@%`Tt@F|3Y6AoI4(9t;0uY6dO#4Ief#5)hH&8
zt;HbQW{1oY4qcQjVoZHlXxo~jHIz4DqiFB0)uihVQkQ0~<YR!+ThMTnZjqQ8);1Fm
zXi=jzen9ujL|kY8wblpxk9~6R-}k8gH+ETmb^O;mEWhhw{Hu+g>w~eXuf-u-X^HK6
z@fNRY;ynFDC{RHL8LbxY_Khx)Og4mgbu{Yt_L26{@c4@A+(;OXTEu%T%@!1mkq(y~
zLz85pcD@)Us#hX$sdc>E^C?rbc$?JT=`wrrZj4{jHm0+3yerrf&bFAENC<E3YK&>c
z@Qp~YnRPJKCnx5$WLux#MZU_d^s#rpwNP`@M)Pry?rA%vZqCaYiinz+a5y4*Y`*KJ
zL<F_U7U=GLHB$A8=7P-djzw>A0A0(F&~)^PsECdF5Uvk1+ME0W8+qLkJHzatA7xd9
zD%=+pFyDg(h$gJul6UDbXUwmZH$}P3j0kaGTV}X8Ul*<Wj55>SItIYe&@BqThzfaT
z+m^eoz&+$qvaI7ueQMeGa!qmhhh~@dFJC(vOLpdc-9J(gPP)%9A{ag&7OvT_jhQNv
z%+5}@-_^*|73xhNTHW<7s%ms`3=aQvsjdA*o;UZ$kE(^i^kG<lG5j(jrJcXg)^&dN
z_HOl9wT8;j%_*}TG1uy9FE8=uqahw8nMw34I<2v}))zNEvKH=~pPm4XI-@UZ0xT|S
zuPP<iYhM^-;VcW?)W=_3?^4*7(3w?92B)dvUxq&Xoq_qgzNuING_(I!JFiNnRDm?c
z7@`t8f_YPq`5Nhr=Klqt0{=s~B0Rg|4~q`(1sr}v_n{1qfj+*eUP1N;)6yNavEBPy
zit`%BK#9rt|8j18y$7Omuz`=(aV`V#V(ojZgy1h<*{Hk+=!RH#!~*_s8DQnu`u<bE
z#DBfa{IwhKUvCU-MK>HMljwSNP3YZd<Sh)&50{9g*ch^t&oPo1>BxUYKYG_nm!)^r
z6WJgZ;sV~sIROE-*?rpR?!#>VS2!@EPB>E&o!$Zk6b(bDzADagtxhpgUQ~7m!emdq
zXjf-5B^q^#^M&$OUdMZVC&dzOi_q5M$fZx|x3QR<KHugv?0(wn>)SP!L>sb@-5ZfS
zBC&E|i+YfzdwzL(bF1P@?vHb$HNQ9v+qq^ZQPEUz<s0T`($zq}F5;ru7TrVSERlj;
z3Z$qn9C4L#ho%%{ZcU_hh|%ORAy)l~$&l(NSF+iPyT(QAMh1f(+i14Lo)5fo>#UZ7
zpj#8y{SI43VSia6-%CPOwlNIMA1xvtlv`P?B#T~u(FJ?N%z~snU;IuI<GDRe1vCk4
zlx`oo4)@KJW9lPcQ4C!ZS637l{oDc@XYrO@elD0XB4;^Y%%DHuUu<SrUHuA4_b&N~
zF|{Uc%KZ-96ybX!rl&~txT#*7eEe403p4-5fv1rh-1d40BZ8!8oy@p(cAZ_UhFQF|
z_nh<K$ymjguKE_Le!TG(iQ}H0?fRMt-j~ukoJ_`%6gQd}EQ1&4N)zN{=Y@<gRF}g2
z7E+(r4*NIsT&LKnejFr;D$YyTgn3*UjtZe-T#W0zG$T&zV6Vd3+o!j_y&^3OEB%HA
zo<}Ab*jR=kgIabtCg3jCMi^e1jf@!2Kv%OQc%E&Df<dCk$@f=7)|>pNY2lKeSS;Bz
zV$inPs1*G%@#)jnM2+(B!?a*ep({12iVs<5>p~1ngLgEW8{^A8-!5~;W~}cYwC!V>
z77IZa3FDE8ZuS&yj7o$dvRhJSq=&_=ZLMAoF}!b#QM)EwvQT4?lG^Rc?R=i~rEV{Q
ztS0^|<|iwxFi+*V>%A_}t$Xmfe8q~Pn~sBx#`9MNOk1a-3GOO0T;kl}E{?E9$S#)L
zL~gbD1vj@oVXt|<(sL?$X3MN5c3i}oh?>RwzGm+&^&vhS`gt8npRbDX&2y<(fJ{yo
zSvcEe5iz@Cd);$F=e>KI<chvtSnU~0SL4KrNh|8kg)?IJ4zf}|jIDI0<gQNerNMGs
z>HEhojjJT@?Ch*?$1-NK7*H`lOq5;&mx+O-f7{{zyRPUz-PJF6N8Y(nOEVe!L$Sb!
z65CC>H;46Gm@uhT3~j_QfQ%VfB~F$qE>}cm%xfG2CANTniI}lOV`D61YrI(xk$ns@
z$s1@NmFOJ*{H=U5?w$3%z0b3GD1&35PhhR)tLWJXZri@!hu`G*g@AzJ{{*=P{MXLJ
zrLcy_wApVv^bERCCZWIixcws>>A!y5{*{sRyLo?Or~R%+=l{?h#TjH?e7Nm1cW+l4
zCd9BsBgeQ@eev}6$d<X~WSmBVDPTI|`}G~$V|<{MHT_{*xCm;#5VfU>7>k#fC2yJk
zLKa-qW{XIgaPuk%>Gq;JLl^bMpR$Yg#r;jjd)FpDoTU3~BQ`AL-$&%m5LDuD%iQXO
zK;j7@9*<a@tctT&I01;<SO+`Puwy?Ku&0QYWWcas#-Fqfwd@DxITc*8(X6-bsNCt;
z-1JzCx2k*jklyer|5UbLmZx2g;Zo37G`MpH@NC;EwsuWcD+nQ~^Kx_-$YjljHY*z<
zFah7B4CE^#ZD(is?c-{i^yrLqkjvM$dm6&X7}{k_p9KU~h*M6?sEQ{QH_eI{a?^9k
zuQx6(O^J;*;f}#z5*Z|DpT_#6Pl7Q>=V-KU?#sdSRw3VYz3X~m#&>3HPU`fe`gl5!
zEo){kG4Z>va9o>6yn)t5GIS}NVNR<+)fmL--Z?nWtk#<l@O*rN$Ua(&v&p3HZr_Oq
zObG4(HMQPW?Ildp`8t2w(Y)bG12yI24KT>hjj&(o-|d(E?h-y$;Il=<JLGK#lFD!0
z-!h4fO%r!amb0+HtTEilCRF5bTZw7-Kb1H0qrJI@(uT_0tcJ<<zL)N=r-RGdf9#Sy
zY_S>Yl0hYYsnR-PbJ5ar(pr0Pp?7|x1Xk*iL){{7cxwJ(7iUySohhCcent$2ef0^)
ztxdE;Km`27`dGF8>Yy8Qe131Wx9pp{U96{Q&z9_7u`j6Wm7>PEwmLg*mL3Os4Gaz+
zhO9L2j)+fuU`kU1&8Hs%YaDZPwKuC0US2BCfZ5MJ5ZD@ke<=k18(F0~c~)&Kn)8AA
z-JkONzmMeKjpFYH(){T;{|o*_SjU{giNj2^Y?hmiX!+1LwlLe6`L8FCyrcJFwB1gp
zljA~9Xr{Yt3OmscYH*VT=Mb}!Zju&#>1-Bmc9BFh$80y>YUWTNK-KHvqRkPHnFDL)
z4|2D@%`$6wu?ji3D?DA&of<RfW&`))3bssUyHEN)G>OpGQT?_#`iZ5-rDUUbB`?8I
zoi(Zi3hgQ@VQ9qyRQ_LRP<<Wg1W~Q~y}PXx_BDpqr&R=R4s*HMCrx$n#CKO|%C<@d
zcZ3ry!Wq;SL~ccjA<R0yFsyNqRuwoPK0TY$^hf0|KTY-?x3qfC9uKVylCqt!|3s4N
zgPWv9nZTnSU#x-jT3{QC4mUt%SPcf~#0kO_jZmI5d`~(#s%FerwD_j2XBb)FDXgTX
zE1i>Bx9V^y$*ik}z?ih?HRm9&^_p#mZ4!x;h+<b6>zOo%{25g*zalG%+<4Jib75!A
zoV4uQdcr-VhMGz%x84QgH;YSTu%c93cIp}8<m4CAG&(p4s+w;ZSfeUTUT!%dFb`e%
z9{RDGCJ(g_R$ADvc~5kQ(yQWnzGsc6Te?%(Xz7lyneCc|guCXg`K{T|rgYAnWR9#T
zwCa&4nKsgFsJ}C-SL;hu7M814rLQf<m7{i-lZX0#&Gr!b+op7rHMrS?1&(%G8cTK;
z&005P56m{2IBVh#Xl%+69hi?PyUd;0A0wWOynNc&>>7vbq>fBF<1-Q*)Y-&<G|etq
zRp1!re${|@j~d**boY#8O*G@C-18~m<lDzAg7>1=pT?%bZO8IA1B`!$4ACvy(qc}c
zyykYVdxb|V5?0|4`1iB#z+^gMDmuZ5_-4`5HnykW39WapfAZkx2^CV4qq1t>*(EGj
z<9gul&18P*aufwFRSQ8e5Dq$tD1;6lHmpT*fnF{LQ*dL-ZC__Dud5jn4)6DDG(gM;
zXnl**NvV)Z*@yL}v8GT_m-DDBal4XwNY?3_SPER6Q$n$H%pxx6k-23sZ3K9cx~*rS
zMH@vz3RYe+=&Wm*Tsxpo<6jWeiBDoo+lhT~7lCAf55viV-IWl5*YZ%7t>A}<ruT9!
zyIh@|Tp43Yg1J~ssLZYcnPe<j0JW8JIPtNlxETv1O2em1wExEfv`RYity&mkMH@6O
zBw7G#D<uvGrduQMFHaP!yyVR=dzs|vv7dh8?4L!z>Ti;*;a6Xqb`0*Xr+(X^ETCsd
zp|9(Q1tx0Ji$Eviz+q9yTJ!FEz#m5I`Sx>WxwAV}lGqqQwaZugkDqOPDWFfc(d$n!
zBaPd(2cHr*Ec;BbK$8nJ>ypEzcI`q+QWyY9yx^b5*njoRnOaVV=kkK7|4jVVLHg~T
zOK0bN+n((sN7M5Qwe%ql_pilg7+H<&6fc9D>9gW+x0%q=!!0E?dAfH$vBq&3WN5&u
z>-fjNOvnQ6aUz#R4yw9MR>6JzY?rB$QARlv=HE2*e%r0_Kj)D9cSB-oo7sa8+A_$+
zPn4pPv~KuLwK=(axszB~TTf5D)Vv%;i<fh6GIIsr{Fc7vhTu}h#6_2I`O@%{sFdRK
z@8|pQQLny86x}UZ&ua<Gv%b_3!j-95AMHB!E|7&wUGyx(@1np4r)PJ?n4CP4-rBZ<
zDp<n|F<Lgip|X52#kdC3e<0W;)JWY$dp)4Iecn<1p=iSO>z(ccCqoR0*e663jE%}U
z=cQ^{g%?{tBJaO0eHtknu3M8h504lB5-pSe3V9zTXff(<I?&j#e)G-<x9VwG5}c)6
zRqBi;btPH%zRGiGyyxMXD5-*Q=2z9pWX>0w?^{GDeCs3Ij6R)g@~VkT-Q3Z#kDs@F
z{Jvj(ben`p=^+@;dpEUadllncu-eRy|7^aQ5cME9FgO!wb}JXLSkQ2zDxuv>%<@Y(
z#Y_<+BRcIIL5W7cHFD}3d)40b{B)3tB4HEV+W=XiM5O(y31*0X)UMEt=W5X9yM%M0
zi3SE_r^0;}W^e6#mMy>-+GfrUHo{;5css>D0qkXYs|X#>Q4;$omxmrD&*HnvxtFxR
z@ZYnJD{zy-yi$C3(bNo61OFHq7X+<ak&k@X)3Gous9!cF94_BrQHwy2(WjUu2X7^8
zH0lUip1SYGL>RzY-LJ=Ud90hAsto12=*5gydWlLcEN)Jy^kN0wC^cr!2Qj0q6PGx&
z?z|I=))CB2bjaa${5)9X6lWZXKN!h4VS$DXl^AJPk9bIIgib#TNoIK@bfqk6-i+P8
zzH{=%<K132=1R-2%}W@kVoV?!eBm5$w>_yEt()JFwQL>|uGEQ}yi~$BR2mO=tq7r|
zA?@S~Mz_mJb~*K_xcd<dO*G*m)St~`0m?O7sJ|`SbX(ATg2sG<o*mxD*nN|oDrO4;
z>N153HD@ioT(Sdu<vLAxwQST0#jW+)BFTm%*wnA|!{@zbSJT<+QuUKhT>+O1gO+cj
z0`EB{P4*hGI#SDJ7RK1&PR6|QS`UNUoIiC?gQ>3DH`wGaebhuWjtXkypldoE%+flj
z3d{Xqv$A{FRe#DW_N`?q9nGz0!ZRvjToqh5tv^2XwAUM|BBT2VI^#KyL!5u5f47tN
zy9@PLfmVyDH()T*V?7ncLw|@(Y}F1+-`)ba_8m9|{dg7vV;{T}m*XNc7B!B65}iwt
zt=-XrSZE)f!0`(KCeQ0n#~QqLx~wWl8bzV6JQrJc+|nOS;^SvLa|u14q?5Bc8Ym*N
z-&tLAhaSEgD{vn*IKC1poIXZo2S${$G#+NQd9g+YhVG>rd#%q(y!xl6hH6<sJ0Aa9
znLVbb?CU_BKt!_8vs=Jj$;;FL(++!7ZieQdr<eV3i3jX?Be<_;;=@DLIDiG}mvltt
z)L@6vTbSUQRg8GVF|Z=ls!ZTp*cUQfcspVF2A``g*x-3QyyApm4~p6G316H<`<S2W
zPLiH?lyq)b@c2jNc)>D5^I%riJAz@Kr82fUn)Q&`#~=qEcb`5cz_H$GG|gG!N%cI8
zw-H8Yuk|LrK;PHz>6M%m&B2qG4Bc7G=|8}(%2B<%t$v1*ZVz}p@6&HOd#vnVTE9U0
zsB%MQ=9A83m`-pBZ{K54l{oHAY1ya1`}^J9A4lH)^Y9Jg6w|pMv-69uOyWwD(w8&v
zKKet&&ctJIRbarhsVxKx$XSA}H)e%DAW)=sDNN_la6@~GhEW%4<Uj40__ciaul>M_
zGyJFxL_^Ei#Ppq4FXS}ZD0w^U#3h5wOzX9^7}7IfwNXqbs;|UQ<2@Xy7OjJrYwges
zJwXqn#+*ygV#7@Wm_aOn6Rzb@^kKDtAN)*a*V^7gf=ImKoT(P<6HD&PCfGT?euITt
z_4o%LsY|`q_xoKra>{gA2Xe}u7UerBWZn@>>JJZ_htmWnwzJa=Z04jGBPx@TZg=Gy
z`}c$bqcyz;vrb>@_atL-+AX~upm&>H8adO9q)<gP$9qIF_RL)hmkP@!GeNRiT-c$X
zxG`pCdNEdbE^Wr0LBZ`7`ufs?l+(T#-f;a91y<DTLf7reSL$P0I`3`g@1#T&+7QID
zDYTjTdHKnfnV#VgP$}Rpppqr9yUA5h8rrkp)EPbj+To@a89CB)EIq7F(DJBdw~yEE
zM|sO%ge)`xNRD<z2DBv7ET)lZA>&qZjSNA26X)ayoe0|4EfoAh-Jq~%ab@+eHI;?V
z`hoGKrMn^Pq)W!pXEm!DVL6$oHiUxU>@As;TSA}FJ_{d`Ry~uag%)Law}%6hD$lF=
z31v}mUVPoN#Ki4Tm&4oQCwuY`uD3t9D-r}>hksR6<u7rwWe7H%-C&Qb$m`nCc~iNb
zFlHcfKg_4%ZB2Mhk9fMhNBn%M?;LCFP}#`0;)`KDFqxg1HJE}|g>@Hc5%=W#GRLn=
z#99eEGS#Ck6R#I>jX#hH9DgjbC>MmJY2hFhr$_3w3%T{R?aTS{7}~B;-xA6WA*Yl}
z_*(L5K8PwwiS@2v#ft>E(m=RT)@-m}d!W9Xg-tGQa!qm&KTmY96N@>UC1(NtRfPa>
zF*bIX1YapZ$zlQg9V~!032kmGjkhJi2wP0ghMz$yJYI;iB%&95{H^F_eKZrJBe&*b
zebln2UljQn<<d9J4Dc55#$a$s5Ux0vcDV~NW+)Ok@%~*aOjV;so#k`9FSTb0`J52n
zW#i|cYNwF!9862N1j>DG_C_S>5E^ezUS52ITUUiUp8Bf}ciNz?ctT2Yh*e6G25;JJ
zo_+#{KU{|a;PdT=ZTWk_&A;oi`_s)?S-dSRv~cMmUDR??gbVa}Rvi}Dcnn`o!dyxG
znSx*B2xef$Q!pVSpInYpFaq(nDN7ZGF?8W#qg6}+5w@-M5*wd)sjPK<d>ly2b>tfa
z)p+9H=rmr49jI`8rf-HzyaKNV;|SAr_MRvn1DPqgcx(84Oj{ydaGW+0ej6>6?Y6%e
ztu-VexK1c6a{9LPI~vV+<X5q;_pZNZP$W}en^CCYosAX`nQZT`YN{Ok@Os(kX7mu-
zjQ-&>!bOkN=yS!T|0rj(QA#CB8S%WWMKoNz4B>f=;Kr5NPcCOylY5>kKAL=5m7myc
z|9*?wjAzUAIm!|-xU4=PC+#yYPp*5i%}C8B>qAqTC(M65(^PY2kSmqb-_*&7(GbEJ
zAo1$3LInNQ_T9j7`UzjHuMHlvn*lp8i>`d!Tv;U>;kNaz{ASZY!T4UJ+Q&M*^aTz+
zMPbvPl8zP@HJGan3u5PHP{HiV1T6PvXO+K56;pAhW=>;0RgR7S=S(J^uZ!oW#$}Dk
zuNwVQ+b;la<dwh=uGsE<Y<`^mGd=q1aTyC7tN7oe9r?9<t^72?^MvnKXXcqsKl2Ai
zaZ!Nj@duVKLVwve{*eCTu&Mvfx0X2n2e0!#<^PS7`*$5<f7M-uM6rV|Vka@8bX|<Z
zolJ7VvZ3JCY3?XI;Z2n&O%vQX9QTWbwja#hs->8(<l+XIrufJ)P--`1C!d0tsS^~w
zJjY#|={Bv$R(F`CKs$bzV?DceCRIqzt%i7C_&GBR^r=;?WZk8ULotdX1nFd9@>T6p
zfk^AgYE)hVZ^BFUkKRldDdeIAm*d>ed13)K4yti$rSggQh%KEc%``uj_T60<{p&4;
zd5o)f1bem{umD}KU}vNVO5(7pD5Ob3My>1W7v`<qWXZ4f6SEVO)H?9?O7*exwX)d{
z^^;9r=a1)lHh;nb^WCpXW>q&P1Q(`lm4>%Dn9x>3o^k;T3EbL<>bP86*TJ?z84{M1
z%G!G+Y#-RxNZl?Ndfu+DFY7#~h!?!R(A+6+N=9IEU%zt1Xg(ua;=>F7jSDX2lWr4(
z)*-v)PvJQ?l4wnC6{)ea_(~$Lr_^jW??D4+!H?Se`qu;>B1BOIatxVychV>Hs7g}Z
z>MO>ZAA5|oO3+m5R!N<>&wFv?&1V@i6K(C@HcKmT!&>P$+~v>d-$us#c38@(7S{N}
zBzYxqVB!?Us(H%m&A?L6VJA8P5RHYWi0ra_6%PTwN%3jsRwB*H_)*0Eovt6spSSm;
zNaF_~@b({?@X-&KN9fkX@gk>~CCY=N{lDf8UximThR-wA_+Ixpaki3L6WF@sH8<^N
zf=Z=`ms9o0)6H2i{hAk3oLOxbLf7%xEyZxEchjWFWRkkG5V#^zyU~^ZzxTRH(5HjA
zIA)1@xG>8QyxFHS@-2}{Ij;rpwtF;xeQ*HIf+)Csu740)e)pyl%Qc=*joXn-;flyR
z*$zdh6s7W}=AjcwGrb#&r+jc}=tNbLIt|+Os)97q@}OJ|v%<EUQXgHuE@2iU)#G9w
z8;*`nbWR8g@+Xmm1&{J)C8*^1WVROO&jI)Vn?Q$RPs%~U9<y8>ymt0p&fhEOcXUj9
zm-NA9h3HfzJX!-Kyg$V=bo~l4QDXaE29|SRf7b=`r?=)W_!rLcCCn*QAELCy;^xld
zg+AKVCnlXK?sS`(HDWjDC5OIz&8_!p@J!nCT6(PgWg>8yZVkU#3M1|chV`lzqAwg~
zMlxBg&PXB1pAYIFHD2#$p0(m~H6?Kk@_RlF$6a@(RolojVl68%xaK7OSj*~=O~c&4
zn%v|n=bgE45<M=F=MX8kCEokBh0+(fM-&FTUAjE7aXDgeT*o`zQR@r_-+%9_+(XW9
zTul=7s9dDc0(sfu2F2WFX%5O>FQ#aI{Pc-2Pbyf6_`$Toq+!y!VZz3hTKd5*p6UV~
z!>+Qqz^QkPq+TrO3!{-7;i{--rNNPwE+<E~Gome+ZLQAI@7!JYggMrd4!n7Gk4M2s
zGlBVy@ta&#;u<!O=AzG6mK>W)Qk+*J=)kX9kPHibSHrF6zeGpMA=#77I%m!?d!`n&
zoi=g{^^D`Y9{^{Sg0EEXG`rO{RD`)ZQ?a(T+}Sg}|8S8-@fKyc14<~<U6I<einHk)
z@&a{&B#XP!PC>Sf&A8=kSNZuTn-iqx`);Twyh}HHUw-}syR*|_0BeRogTiiBA<LxN
zbiGSwH$C6p*liX@)jm?+Gcr$OpGeO?Oydghqw(<0p)S7a?bAPZ{koy3#j!b>4KG-o
zuyPm94Ztgug_)+S-J<XGCZQyH-7B!|ZA+uT6wJLy5LG1-GfO3&FOf!K64z5(o#q!M
zt;OwG*27|VZ;bQ>1plg(;=B-|<`7>TG(L&J4W!tjQJK+u1r1%#XC|#HFEd=?)6%~F
zn&;Fx0y^{>ssTe(hZIpm^|>Qz+7vj3sv;;%M11m4)e$myWi>;Kmw6+U9n{8y04F2d
zFts7kN?FRD9r#r9_`yyX%I`ob7-#miEyZa=+UcDHmBZ`=;VQw-gI$_OBW65^TbVps
zH`Gi3eS(Tvc-PbB%`skUFaQ-D(u3LXHU6!a`0siTf88=Ard6;i#fsLKdtuefPZtaJ
z^$9f8?680b78nvihk?5e8asW5qFA7-d4CvE_a85^(S3m?L+LEAq}i-nAeu6Q!&ODC
z+|Ry=w;TSLU_d$3%BU7l#jS?p<V~m4DfkLA4#uq5qIR)>MdC)rK4_UH!ngC+z0Y}3
zp{Y=63*cLIB6zudhH6kkD6*4q<HWGAkU`#ooG4ND%~X!YJJL%28l;7<&j5q7Xj+s(
z!4xX%i!q}5afnF5vpcixx;{Y4fhoWG2h$a4E(2;L{g-Wr8xw-Hf88zHtZHvA3W6|Q
zY>|SKdp0s;O$EDQf;UUPjc-u9IM?3d>Jm?F6MGxSEYLvxwy=;8fMkME%uTckaakyD
zl#w>GSB&S(fp)c})1?jJ9CDuIGiPHSXfLR*^X<&0b;+0hp?UZp<8kqe59`C_R*~o+
z(6g@yLww4R+G(nAUtrllLU$4@y51hhPj0;{3pu;tIZ2S~|AgU&oY;KPhJ#VR|6~|T
zDWwe-a9O*rl4`U0<*jD;svc4?g;_X))+FN(ef~+@yDSe(IsTFlrT=URv()kG%CvDm
zFN36GY0<kg$p27~>-V-|e%mMaKj*stQ<#XNepS*cl>;Xo&z5<{ID_qs-a9Y^+23EE
zK>9ce@mDyanT8tR_XiQj|0h3I(f^2MOx8(G!K^1#a?St_=@~cO27VYO-;Iwymh68S
P6${3&{k!>4?D+oz$Z@_Z


From e5347d42992596186a3c3cd8f48f43d2cd769e82 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 08:20:50 +0200
Subject: [PATCH 060/161] Delete cross.svg

---
 views/public/images/cross.svg | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100755 views/public/images/cross.svg

diff --git a/views/public/images/cross.svg b/views/public/images/cross.svg
deleted file mode 100755
index e4226af..0000000
--- a/views/public/images/cross.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-<title>cross</title>
-<path fill="white" d="M31.708 25.708c-0-0-0-0-0-0l-9.708-9.708 9.708-9.708c0-0 0-0 0-0 0.105-0.105 0.18-0.227 0.229-0.357 0.133-0.356 0.057-0.771-0.229-1.057l-4.586-4.586c-0.286-0.286-0.702-0.361-1.057-0.229-0.13 0.048-0.252 0.124-0.357 0.228 0 0-0 0-0 0l-9.708 9.708-9.708-9.708c-0-0-0-0-0-0-0.105-0.104-0.227-0.18-0.357-0.228-0.356-0.133-0.771-0.057-1.057 0.229l-4.586 4.586c-0.286 0.286-0.361 0.702-0.229 1.057 0.049 0.13 0.124 0.252 0.229 0.357 0 0 0 0 0 0l9.708 9.708-9.708 9.708c-0 0-0 0-0 0-0.104 0.105-0.18 0.227-0.229 0.357-0.133 0.355-0.057 0.771 0.229 1.057l4.586 4.586c0.286 0.286 0.702 0.361 1.057 0.229 0.13-0.049 0.252-0.124 0.357-0.229 0-0 0-0 0-0l9.708-9.708 9.708 9.708c0 0 0 0 0 0 0.105 0.105 0.227 0.18 0.357 0.229 0.356 0.133 0.771 0.057 1.057-0.229l4.586-4.586c0.286-0.286 0.362-0.702 0.229-1.057-0.049-0.13-0.124-0.252-0.229-0.357z"></path>
-</svg>

From 8b327502c6496962d7135b504ce13e1cebca489f Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:23:42 +0200
Subject: [PATCH 061/161] Improved styling for vertical layout

---
 views/public/css/facets.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index 6b08d09..629bd41 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -3,7 +3,15 @@
 }
 
 .facets-layout-vertical {
-	max-width: 350px;	
+	margin-left: 5.26316%;
+	margin-right: 5.26316%;
+}
+
+@media screen and (min-width: 768px) {
+	.facets-layout-vertical {
+		margin-left: 0;
+		margin-right: 0;
+	}
 }
 
 .facets-layout-horizontal {

From 2c38930ff1ae58b6c136b3218bcf1e5c7b5b28f6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:21:01 +0200
Subject: [PATCH 062/161] Fixed references, cleaned up code

---
 views/public/css/facets.css | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index 629bd41..fcbe7a9 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -43,7 +43,7 @@
 }
 
 .container-vertical {
-	max-width: 350px;
+	/* max-width: 350px; */
 }
 
 .container-vertical:not(:last-child) {
@@ -53,11 +53,9 @@
 .flex {
 	/* We first create a flex layout context */
 	display: flex;
+
 	/* Then we define the flow direction 
 	 and if we allow the items to wrap 
-	* Remember this is the same as:
-	* flex-direction: row;
-	* flex-wrap: wrap;
 	*/
 	flex-flow: row wrap;
 
@@ -68,8 +66,6 @@
 .container-horizontal {
 	max-width: 350px;
 	display: inline-block;
-	/* float: left; */
-	/* display: flex; */
 }
 
 .container-horizontal:not(:last-child) {
@@ -87,7 +83,7 @@
 	padding: 10px;
 }
 
-.facets-container .container {
+#facets-body {
 	width: 100%;
 	background-color: #F1F1F1;
 }
@@ -120,13 +116,3 @@
 	color: #FFF;
 	background-color: #545759!important;
 }
-
-.facets-container .select-arrow, .facets-container .select-cross {
-	position: relative;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.facets-container .select-arrow select::-ms-expand, .facets-container .select-cross select::-ms-expand {
-	display: none;
-}

From 46286f40b538f1b8c7569468b967562d12910125 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:21:46 +0200
Subject: [PATCH 063/161] Added ability to collapse automatically if screen
 size is too small

---
 views/public/facets/browse.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 81b07c1..8027f5e 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,7 +1,7 @@
 <?php
 	$facetsElements = json_decode(get_option('facets_elements'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
-	$facetsCollapsable = (bool)get_option('facets_collapsable');
+	$facetsCollapsible = (bool)get_option('facets_collapsible');
 	$facetsDirection = (string)get_option('facets_direction');
 
 	$table = get_db()->getTable('Element');
@@ -20,8 +20,8 @@
 ?>
 
 <div class="facets-container <?php echo "facets-layout-" . $facetsDirection; ?>">
-	<button <?php if ($facetsCollapsable) echo "class=\"facets-collapsed\""; ?>><?php echo html_escape(__('Refine search by')) ?>...</button>
-	<div class="container">
+	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsible\""; ?>><?php echo html_escape(__('Refine search by')) ?>...</button>
+	<div id="facets-body">
 		<?php 
 			if ($description = get_option('facets_description')) {
 				echo "<p class=\"description\">" . $description . "</p>\n";
@@ -89,22 +89,33 @@
 	</div>
 </div>
 <script type="text/javascript">
-	jQuery('.facets-collapsed').next().addClass('hidden');
+	// force block collapsible if screen size small
+	jQuery(window).on('load', function() {
+		if (jQuery(window).width() < 768) {
+			jQuery('#facets-title').addClass('facets-collapsed');
+			jQuery('#facets-body').addClass('hidden');
+		}
+	});
+	// hides facets block (but for title) on load
+	jQuery('#facets-body').next().addClass('hidden');
+	// submit results of refining search to reload the page
 	window.jQuery(document).ready(function() {
 		window.jQuery('select').change(function() {
 			var option = window.jQuery(this).find('option:selected');
-			if (typeof(option.data("url")) !== 'undefined') window.location.href = option.data("url");
+			if (typeof(option.data('url')) !== 'undefined') window.location.href = option.data('url');
 		});
 	});
-	jQuery('.facets-collapsed').click(function () {
+	// collapse/expands facets block
+	jQuery('#facets-title').click(function () {
 		$header = jQuery(this);
+		if (!$header.hasClass('facets-collapsible') && !$header.hasClass('facets-collapsed')) return;
 		//getting the next element
 		$content = $header.next();
 		//open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
 		$content.slideToggle(300, function () {
 			//execute this after slideToggle is done
 			//change icon of header based on visibility of content div
-			$header.toggleClass( "facets-collapsible facets-collapsed" );
+			$header.toggleClass('facets-collapsible facets-collapsed');
 		});
 	});
 </script>

From 66e67e8b5a134da9370415f6268b2aeaabc6db8d Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:24:27 +0200
Subject: [PATCH 064/161] Update Readme.md

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index fc4570c..e5e8c89 100644
--- a/Readme.md
+++ b/Readme.md
@@ -21,7 +21,7 @@ Then install it like any other Omeka plugin.
 
 Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. 
 
-For **Thanks, Roy** theme, for example, best way is to change `common/header.php` code using the custom hook, while unchecking **Block collapsable** option and setting **Vertical** as **Block layout**:
+For **Thanks, Roy** theme, for example, best way is to change `common/header.php` code using the custom hook, while unchecking **Block collapsible** option and setting **Vertical** as **Block layout**:
 ```php
 <div id="search-container" role="search">
     <?php if (get_theme_option('use_advanced_search') === null || get_theme_option('use_advanced_search')): ?>
@@ -32,7 +32,7 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
 </div>
 <?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
 ```
-For **Berlin** theme, instead, check **Block collapsable** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
+For **Berlin** theme, instead, check **Block collapsible** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
 <?php fire_plugin_hook('public_facets', array('view' => $this)); ?>

From 57841d00a8b2a9daa8491e5e71fbed23e489df1b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:26:44 +0200
Subject: [PATCH 065/161] Corrected typo

---
 config_form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config_form.php b/config_form.php
index 91ad045..24a966b 100644
--- a/config_form.php
+++ b/config_form.php
@@ -60,13 +60,13 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collapsable', __('Block collapsable')); ?>
+		<?php echo $view->formLabel('facets_collapsible', __('Block collapsible')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, facets block will be collapsable (tip: as it saves space, it\'s particularly useful with horizontal layout).'); ?>
+			<?php echo __('If checked, facets block will be collapsible (tip: as it saves space, it\'s particularly useful with horizontal layout).'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_collapsable', get_option('facets_collapsable'), null, array('1', '0')); ?>
+		<?php echo $view->formCheckbox('facets_collapsible', get_option('facets_collapsible'), null, array('1', '0')); ?>
     </div>
 </div>
 

From fa74ece196bd2f8f7a39047d9d0f053c02e773b6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:28:03 +0200
Subject: [PATCH 066/161] Update template.pot

---
 languages/template.pot | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/template.pot b/languages/template.pot
index 16dc8da..65b72c6 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -70,11 +70,11 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr ""
 
 #: config_form.php:63
-msgid "Block collapsable"
+msgid "Block collapsible"
 msgstr ""
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
 #: config_form.php:75
@@ -175,4 +175,4 @@ msgstr ""
 
 #: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr ""
\ No newline at end of file
+msgstr ""

From 0e6c543410da24e67b9fce57b2661845cca24073 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:28:47 +0200
Subject: [PATCH 067/161] Update it.po

---
 languages/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/it.po b/languages/it.po
index 45d124f..c47eb2f 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -74,11 +74,11 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr "Se selezionata, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
 
 #: config_form.php:63
-msgid "Block collapsable"
+msgid "Block collapsible"
 msgstr "Blocco contraibile"
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 "Se selezionata, il blocco filtri sarà contraibile (consiglio: dal momento che utilizza meno spazio, è particolarmente "
 "utile con i temi a layout orizzontale)."
@@ -181,4 +181,4 @@ msgstr "Etichette"
 
 #: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile (solo per Documenti)."
\ No newline at end of file
+msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile (solo per Documenti)."

From 8d1ea80c46c42a3fbdf5bbb5eae117dfbe6f2d84 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 15 Jun 2021 10:29:31 +0200
Subject: [PATCH 068/161] Update eo.po

---
 languages/eo.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/eo.po b/languages/eo.po
index aec4aeb..7215739 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -70,11 +70,11 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr ""
 
 #: config_form.php:63
-msgid "Block collapsable"
+msgid "Block collapsible"
 msgstr ""
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsable (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
 #: config_form.php:75
@@ -175,4 +175,4 @@ msgstr ""
 
 #: config_form.php:269
 msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr ""
\ No newline at end of file
+msgstr ""

From ce0924f65cc0a0e30a12d0a9b58e461a1de8c7d8 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 19:54:26 +0200
Subject: [PATCH 069/161] Added isset() controls to fix possible warnings issue

---
 FacetsPlugin.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 873ac3f..f204d26 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -104,7 +104,7 @@ public function hookConfigForm($args)
 			->order('elements.order');
 		$elements = $table->fetchObjects($select);
 
-		include('config_form.php');
+		include 'config_form.php';
 	}
 
 	/**
@@ -284,10 +284,10 @@ public function showFacets($args)
  		
 		if ($controller == 'items' && $action == 'browse') {
 			$params = array(
-				'advanced' => $_GET['advanced'], 
-				'collection' => $_GET['collection'], 
-				'type' => $_GET['type'], 
-				'tags' => $_GET['tags']
+				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''), 
+				'collection' => (isset($_GET['collection']) ? $_GET['collection'] : ''), 
+				'type' => (isset($_GET['type']) ? $_GET['type'] : ''),
+				'tags' => (isset($_GET['tags']) ? $_GET['tags'] : '')
 			);
 
 			if (recordTypeActive('item', $settings['elements']) && count(get_records('item', $params, null)) > 0) {
@@ -298,7 +298,7 @@ public function showFacets($args)
 			}
 		} elseif ($controller == 'collections' && $action == 'browse') {
 			$params = array(
-				'advanced' => $_GET['advanced']
+				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : '')
 			);
 			if (recordTypeActive('collection', $settings['elements']) && count(get_records('collection', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(

From 5b3e7fa3ec10ad5f38675ee30d7efa8ec55ca773 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 19:55:15 +0200
Subject: [PATCH 070/161] Added isset() controls to solve possible warnings
 issue

---
 views/public/facets/browse.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 8027f5e..5663918 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -35,7 +35,7 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
+							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
 								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo $html;
@@ -48,7 +48,7 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, $facetElement['sort'], $facetElement['popularity'])) {
+							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
 								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo $html;

From e1faef31fb863c1377c4d3d31a643db5dbe423ab Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:19:09 +0200
Subject: [PATCH 071/161] Added isset() check to avoid warnings issue

---
 helpers/FacetsFunctions.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 16d822b..9e99b11 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -431,7 +431,10 @@ function getFieldUrl($filter, $value = null)
 	}
 	
 	function isFacetActive($recordType, $element_name, $settings) {
-		return ((bool)$settings['elements'][$element_name][$recordType]);
+		if (isset($settings['elements'][$element_name][$recordType]) {
+			return ((bool)$settings['elements'][$element_name][$recordType]);
+		}
+		return false;
 	}
 	
 	function isNotSingleEntry($count) {

From 20ed45f2ae3b0359eea01c9ca2639c92a43efd02 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:22:41 +0200
Subject: [PATCH 072/161] Added isset() checks to avoid warnings issues

---
 helpers/FacetsFunctions.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 9e99b11..02b4dca 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -113,8 +113,10 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			}
 			
 			// Stores data for selected collection, if any
-			if ($collection_id = $_GET['collection']) {
-				$selectedCollection = $facetCollections[$collection_id];
+			if (isset($_GET['collection'])) {
+				if ($collection_id = $_GET['collection']) {
+					$selectedCollection = $facetCollections[$collection_id];
+				}
 			}
 
 			// Remove single entries if required
@@ -198,8 +200,10 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			}
 			
 			// Stores data for selected item type, if any
-			if ($itemType_id = $_GET['type']) {
-				$selectedItemType = $facetItemTypes[$itemType_id];
+			if (isset($_GET['type'])) {
+				if ($itemType_id = $_GET['type']) {
+					$selectedItemType = $facetItemTypes[$itemType_id];
+				}
 			}
 
 			// Remove single entries if required

From d964977e78e66f3eae9a32d14516cc7965d8afec Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:23:43 +0200
Subject: [PATCH 073/161] Update FacetsFunctions.php

---
 helpers/FacetsFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 02b4dca..2382947 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -45,7 +45,7 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 			}
 			
 			// Stores data for selected tag, if any
-			$selectedTagName = $_GET['tags'];
+			$selectedTagName = (isset($_GET['tags']) ? $_GET['tags'] : '');
 
 			// Remove single entries if required
 			if ($hideSingleEntries && count(array_filter($facetTags, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {

From 5695eaf449ed991243eb1e5abd15a659ce39f1c7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 4 Jul 2021 21:56:39 +0200
Subject: [PATCH 074/161] Closed brackets

---
 helpers/FacetsFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 2382947..9d3b4e7 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -435,7 +435,7 @@ function getFieldUrl($filter, $value = null)
 	}
 	
 	function isFacetActive($recordType, $element_name, $settings) {
-		if (isset($settings['elements'][$element_name][$recordType]) {
+		if (isset($settings['elements'][$element_name][$recordType])) {
 			return ((bool)$settings['elements'][$element_name][$recordType]);
 		}
 		return false;

From 7b6eed633aeead4e33b5ac5230cc252d7efe755f Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 10:01:01 +0200
Subject: [PATCH 075/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index e5e8c89..0eaf5ad 100644
--- a/Readme.md
+++ b/Readme.md
@@ -4,7 +4,7 @@
 
 Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context. Works for both Items and Collections.
 
-Settings allow to choose the hook to be used, which elements use for search refinement, whether to ignore single entries, sorting order for values, whether to show values popolarity, whether to use an horizontal or vertical layout, etc.
+Settings allow to choose the hook to be used, which criteria use for search refinement, whether to ignore single entries, sorting order for values, whether to show values popolarity, whether to use an horizontal or vertical layout, etc.
 
 ## Credits
 

From eebc7d8844f3b1d2ddb9e9ba90249de50a449230 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:26:12 +0200
Subject: [PATCH 076/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 4b72021..7eab199 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link=""
 support_link=""
-version="2.2"
+version="2.3"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From fb04250f9d0ba21598a27af8cbef3571cad5c18e Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:26:51 +0200
Subject: [PATCH 077/161] Changed elements table, adding not-DC elements

---
 config_form.php | 320 ++++++++++++++++++++++++------------------------
 1 file changed, 160 insertions(+), 160 deletions(-)

diff --git a/config_form.php b/config_form.php
index 24a966b..420d044 100644
--- a/config_form.php
+++ b/config_form.php
@@ -64,7 +64,7 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, facets block will be collapsible (tip: as it saves space, it\'s particularly useful with horizontal layout).'); ?>
+			<?php echo __('If checked, facets block will be collapsible (tip: as it saves space, it\'s particularly useful with horizontal theme layouts).'); ?>
 		</p>
 		<?php echo $view->formCheckbox('facets_collapsible', get_option('facets_collapsible'), null, array('1', '0')); ?>
     </div>
@@ -93,12 +93,9 @@
 <h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_elements-table', __('Dublin Core')); ?>
-	</div>
-	<div class="inputs five columns omega">
+	<div class="inputs seven columns alpha">
 		<p class="explanation">
-			<?php echo __('The Dublin Core elements that can be used for search refinement.'); ?>
+			<?php echo __('The elements that can be used for search refinement. Item and Collection columns to (de)activate, Sort order column to choose sorting order, Popularity column to show counters near names.'); ?>
 		</p>
 		<table id="facets_elements-table">
 			<thead>
@@ -111,9 +108,18 @@
 				</tr>
 			</thead>
 			<tbody>
-			<?php
-				foreach ($elements as $element):
-			?>
+				<?php
+					$current_element_set = null;
+					foreach ($elements as $element):
+						if ($element->set_name != $current_element_set):
+							$current_element_set = $element->set_name;
+				?>
+				<tr>
+					<th colspan="5">
+						<strong><?php echo __($current_element_set); ?></strong>
+					</th>
+				</tr>
+				<?php 	endif; ?>
 				<tr>
 					<td><?php echo __($element->name); ?></td>
 					<td class="boxes">
@@ -127,19 +133,27 @@
 						); ?>
 					</td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"elements[{$element->name}][collection]",
-							'1', 
-							array(
-								'disableHidden' => true,
-								'checked' => isset($settings['elements'][$element->name]['collection'])
-							)
-						); ?>
+						<?php 
+							if ($element->set_name == 'Dublin Core') {
+								echo $view->formCheckbox(
+									"elements[{$element->name}][collection]",
+									'1', 
+									array(
+										'disableHidden' => true,
+										'checked' => isset($settings['elements'][$element->name]['collection'])
+									)
+								); 
+							} else {
+								echo "&nbsp";
+							}								
+						?>
 					</td>
 					<td class="boxes">
-						<?php echo $view->formSelect(
+						<?php 
+							$sortOrder = (isset($settings['elements'][$element->name]['sort']) ? $settings['elements'][$element->name]['sort'] : '');
+							echo $view->formSelect(
 							"elements[{$element->name}][sort]",
-							$settings['elements'][$element->name]['sort'],
+							$sortOrder,
 							array(),
 							array(
 								'alpha' => __('Alphabetical'),
@@ -158,148 +172,134 @@
 						); ?>
 					</td>
 				</tr>
-			<?php 
-				endforeach;
-			?>
+			<?php endforeach; ?>
+				<tr>
+					<th colspan="5">
+						<strong><?php echo __('Item Types'); ?></strong>
+					</th>
+				</tr>
+				<tr>
+					<td><?php echo __('Item Types'); ?></td>
+					<td class="boxes">
+						<?php echo $view->formCheckbox(
+							"facets_item_types_active",
+							get_option('facets_item_types_popularity'), 
+							null, 
+							array('1', '0')
+						); ?>
+					</td>
+					<td class="boxes">
+						&nbsp
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formSelect(
+								'facets_item_types_sort',
+								get_option('facets_item_types_sort'),
+								array(),
+								array(
+									'alpha' => __('Alphabetical'),
+									'count_alpha' => __('Popularity first, then alphabetical')
+								)
+							); 
+						?>
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formCheckbox(
+								'facets_item_types_popularity', 
+								get_option('facets_item_types_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
+					</td>
+				</tr>				
+				<tr>
+					<th colspan="5">
+						<strong><?php echo __('Collections'); ?></strong>
+					</th>
+				</tr>
+				<tr>
+					<td><?php echo __('Collections'); ?></td>
+					<td class="boxes">
+						<?php echo $view->formCheckbox(
+							"facets_collections_active",
+							get_option('facets_collections_popularity'), 
+							null, 
+							array('1', '0')
+						); ?>
+					</td>
+					<td class="boxes">
+						&nbsp
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formSelect(
+								'facets_collections_sort',
+								get_option('facets_collections_sort'),
+								array(),
+								array(
+									'alpha' => __('Alphabetical'),
+									'count_alpha' => __('Popularity first, then alphabetical')
+								)
+							); 
+						?>
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formCheckbox(
+								'facets_collections_popularity', 
+								get_option('facets_collections_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
+					</td>
+				</tr>				
+				<tr>
+					<th colspan="5">
+						<strong><?php echo __('Tags'); ?></strong>
+					</th>
+				</tr>
+				<tr>
+					<td><?php echo __('Tags'); ?></td>
+					<td class="boxes">
+						<?php echo $view->formCheckbox(
+							"facets_tags_active",
+							get_option('facets_tags_popularity'), 
+							null, 
+							array('1', '0')
+						); ?>
+					</td>
+					<td class="boxes">
+						&nbsp
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formSelect(
+								'facets_tags_sort',
+								get_option('facets_tags_sort'),
+								array(),
+								array(
+									'alpha' => __('Alphabetical'),
+									'count_alpha' => __('Popularity first, then alphabetical')
+								)
+							); 
+						?>
+					</td>
+					<td class="boxes">
+						<?php 
+							echo $view->formCheckbox(
+								'facets_tags_popularity', 
+								get_option('facets_tags_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
+					</td>
+				</tr>
 			</tbody>
 		</table>
 	</div>
 </div>
-
-<h2><?php echo __('Item Types'); ?></h2>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_item_types_active', __('Active')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, search refinement by Item Type will be available (Items only).'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_item_types_active', get_option('facets_item_types_active'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_item_types_sort', __('Sort order')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('The sort order used for values.'); ?>
-		</p>
-		<?php echo $view->formSelect(
-			'facets_item_types_sort',
-			get_option('facets_item_types_sort'),
-			array(),
-			array(
-				'alpha' => __('Alphabetical'),
-				'count_alpha' => __('Popularity first, then alphabetical')
-			)); 
-		?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_item_types_popularity', __('Show popularity')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_item_types_popularity', get_option('facets_item_types_popularity'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<h2><?php echo __('Collections'); ?></h2>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collections_active', __('Active')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, search refinement by Collection will be available (Items only).'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_collections_active', get_option('facets_collections_active'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collections_sort', __('Sort order')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('The sort order used for values.'); ?>
-		</p>
-		<?php echo $view->formSelect(
-			'facets_collections_sort',
-			get_option('facets_collections_sort'),
-			array(),
-			array(
-				'alpha' => __('Alphabetical'),
-				'count_alpha' => __('Popularity first, then alphabetical')
-			)); 
-		?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collections_popularity', __('Show popularity')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_collections_popularity', get_option('facets_collections_popularity'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<h2><?php echo __('Tags'); ?></h2>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_tags_active', __('Active')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, search refinement by Tag will be available (Items only).'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_tags_active', get_option('facets_tags_active'), null, array('1', '0')); ?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_tags_sort', __('Sort order')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('The sort order used for values.'); ?>
-		</p>
-		<?php echo $view->formSelect(
-			'facets_tags_sort',
-			get_option('facets_tags_sort'),
-			array(),
-			array(
-				'alpha' => __('Alphabetical'),
-				'count_alpha' => __('Popularity first, then alphabetical')
-			)); 
-		?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_tags_popularity', __('Show popularity')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('If checked, values\'s popularity will be displayed.'); ?>
-		</p>
-		<?php echo $view->formCheckbox('facets_tags_popularity', get_option('facets_tags_popularity'), null, array('1', '0')); ?>
-    </div>
-</div>

From 6dcf43684274e6b7da92800b39fc54308cbde45a Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:27:59 +0200
Subject: [PATCH 078/161] Added not-DC elements

---
 FacetsPlugin.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index f204d26..ada45fd 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -6,9 +6,7 @@
  * @package FacetsPlugin
  */
 
-if (!defined('FACETS_PLUGIN_DIR')) {
-	define('FACETS_PLUGIN_DIR', dirname(__FILE__));
-}
+define('FACETS_PLUGIN_DIR', dirname(__FILE__));
 define('FACETS_MINIMUM_AMOUNT', 5);
 
 require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
@@ -98,7 +96,6 @@ public function hookConfigForm($args)
 
 		$table = get_db()->getTable('Element');
 		$select = $table->getSelect()
-			->where('element_sets.name = \'Dublin Core\'')
 			->order('elements.element_set_id')
 			->order('ISNULL(elements.order)')
 			->order('elements.order');

From 2bd82c60e63b87ab576c6f2b3ab9ac549a7b8515 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:28:53 +0200
Subject: [PATCH 079/161] Update template.pot

---
 languages/template.pot | 80 +++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 52 deletions(-)

diff --git a/languages/template.pot b/languages/template.pot
index 65b72c6..132c708 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -5,10 +5,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Reference\n"
-"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
-"POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: 2021-06-13 15:39-0000\n"
+"Project-Id-Version: Facets\n"
+"Report-Msgid-Bugs-To: https://github.com/DBinaghi/plugin-Facets/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0001\n"
+"PO-Revision-Date: 2021-06-13 15:39-0001\n"
+"PO-Revision-Date: 2021-07-05 15:17-0001\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -97,82 +98,57 @@ msgstr ""
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:101
-msgid "The Dublin Core elements that can be used for search refinement."
+#: config_form.php:98
+msgid 
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
+"Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:106
+#: config_form.php:103
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:107
+#: config_form.php:104
 msgid "Item"
 msgstr ""
 
-#: config_form.php:108
+#: config_form.php:105
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:109
-#: config_form.php:185
-#: config_form.php:231
-#: config_form.php:277
+#: config_form.php:106
 msgid "Sort order"
 msgstr ""
 
-#: config_form.php:110
-#: config_form.php:205
-#: config_form.php:251
-#: config_form.php:297
+#: config_form.php:107
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:145
-#: config_form.php:196
-#: config_form.php:242
-#: config_form.php:288
+#: config_form.php:159
+#: config_form.php:201
+#: config_form.php:243
+#: config_form.php:285
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:146
-#: config_form.php:197
-#: config_form.php:243
-#: config_form.php:289
+#: config_form.php:160
+#: config_form.php:202
+#: config_form.php:244
+#: config_form.php:286
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:169
+#: config_form.php:178
+#: config_form.php:182
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:173
-#: config_form.php:219
-#: config_form.php:265
-msgid "Active"
-msgstr ""
-
-#: config_form.php:177
-msgid "If checked, search refinement by Item Type will be available (Items only)."
-msgstr ""
-
-#: config_form.php:209
-#: config_form.php:255
-#: config_form.php:301
-msgid "If checked, values's popularity will be displayed."
-msgstr ""
-
-#: config_form.php:215
+#: config_form.php:220
+#: config_form.php:224
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:223
-msgid "If checked, search refinement by Collection will be available (Items only)."
-msgstr ""
-
-#: config_form.php:261
+#: config_form.php:262
+#: config_form.php:266
 msgid "Tags"
 msgstr ""
-
-#: config_form.php:269
-msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr ""

From 62c853db399c28dd458950714629809afffb2cfe Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 5 Jul 2021 15:29:23 +0200
Subject: [PATCH 080/161] Updated fi

---
 languages/eo.mo | Bin 543 -> 574 bytes
 languages/eo.po |  84 ++++++++++++++++-----------------------------
 languages/it.mo | Bin 4081 -> 3644 bytes
 languages/it.po |  89 ++++++++++++++++++------------------------------
 4 files changed, 64 insertions(+), 109 deletions(-)

diff --git a/languages/eo.mo b/languages/eo.mo
index 85390589f090f8bbb1aace50e4d6355c027100ee..0c30b48f2e59fdf343a504a34035a9fdb8cd7e14 100644
GIT binary patch
delta 222
zcmbQwvX5ngjqF5528Lz^1_mJ@7G+{!-~-YcK$;Cmn@^0iV{=PPPAw^(xIkL9*h*hN
zJ+maEG)XTxKUd$yDKjrIJtI@UAg44vGfx+)@Q!}HAy<IEZcu7jW^rbIo~}z`Nvf5C
zk%5t+u7R1Zp|OIYsg<#%u7QC8Zgu9m2Bsi&hCl{LoljzMiEc<yVqS4hVo83Hm4aKS
hkB@?%qpz!ijjOMtr;mf9i%XDeaIhUv>Es;7%>V)0JaGU3

delta 187
zcmdnTGM{CFjcgGk14A<d1A`C{e*?1lfHWr)0|Oh7mY5i6#~GBGmRgjWmz+9ruC$_+
zzJ7XUNk(asUUGh}zDr_WW@?VEx34}z(Ovym1Fisn-JsO6%;L=aJYAQ>l2j{&NLR-o
zU0;7)7e@sTe=A>4?I?dgS1zB#;u77EqQt!7oWzp+A}a-miKz-snR$un8JP+;i7C06
Wc@9aLCHW<(+4*{zC6n73w*vrv`Z(GE

diff --git a/languages/eo.po b/languages/eo.po
index 7215739..eeb01cd 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -5,11 +5,12 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Reference\n"
-"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
-"POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
+"Project-Id-Version: Facets\n"
+"Report-Msgid-Bugs-To: https://github.com/DBinaghi/plugin-Facets/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0001\n"
+"PO-Revision-Date: 2021-06-13 15:39-0001\n"
+"PO-Revision-Date: 2021-07-05 15:17-0001\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
@@ -97,82 +98,57 @@ msgstr ""
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:101
-msgid "The Dublin Core elements that can be used for search refinement."
+#: config_form.php:98
+msgid 
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
+"Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:106
+#: config_form.php:103
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:107
+#: config_form.php:104
 msgid "Item"
 msgstr ""
 
-#: config_form.php:108
+#: config_form.php:105
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:109
-#: config_form.php:185
-#: config_form.php:231
-#: config_form.php:277
+#: config_form.php:106
 msgid "Sort order"
 msgstr ""
 
-#: config_form.php:110
-#: config_form.php:205
-#: config_form.php:251
-#: config_form.php:297
+#: config_form.php:107
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:145
-#: config_form.php:196
-#: config_form.php:242
-#: config_form.php:288
+#: config_form.php:159
+#: config_form.php:201
+#: config_form.php:243
+#: config_form.php:285
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:146
-#: config_form.php:197
-#: config_form.php:243
-#: config_form.php:289
+#: config_form.php:160
+#: config_form.php:202
+#: config_form.php:244
+#: config_form.php:286
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:169
+#: config_form.php:178
+#: config_form.php:182
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:173
-#: config_form.php:219
-#: config_form.php:265
-msgid "Active"
-msgstr ""
-
-#: config_form.php:177
-msgid "If checked, search refinement by Item Type will be available (Items only)."
-msgstr ""
-
-#: config_form.php:209
-#: config_form.php:255
-#: config_form.php:301
-msgid "If checked, values's popularity will be displayed."
-msgstr ""
-
-#: config_form.php:215
+#: config_form.php:220
+#: config_form.php:224
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:223
-msgid "If checked, search refinement by Collection will be available (Items only)."
-msgstr ""
-
-#: config_form.php:261
+#: config_form.php:262
+#: config_form.php:266
 msgid "Tags"
-msgstr ""
-
-#: config_form.php:269
-msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index 08b2f60fffd62bb141f0064332368f8dd5b4d617..e6601e7e1358ae1357a135c9c2640cfdd48c39f0 100644
GIT binary patch
delta 992
zcmYk&O=uHA6bJB0nzreeXbOt7#SszPnwsQLiv2)i(?V@hi&4arOg3XOxH}VeCoPJY
zi#HEN78NO?C#&8hH!XT79(&ZDR20Qa6+do@;D6E;8aDIWH}huR?EA5AwYT;z7P&?6
z>%+en|47J0glulJ6Y*EXE$}zo1w&y%%zQU&hZJ_e!+|5g`Xr2Eejawi^KcwG@ERdC
z@&qq7CI*^N9NvcJz~#V)@Brec&=h<Pcfyab3;u%UVj*lc`=c0+!7lh5=Aea3w>6^%
zVh73CLhisZ)F;b$xru}gXbKBlw-ss_gIA#`v;@uiy}(D%d~rQke+luBbqssp8#o8Q
z!TWHcjSvOjLOdjg!@5zQoWqMb=n~uy7ojP57w(2Da0h$=&Bpb>4R{jq2lyGramZtQ
zNDOTnM7)Ya%!R(dS@_)?nzk!tR^VD#%qD5i&xd0n;a?1|VH|8K_~l5!{~LMcuQexY
zbVhTBGFhaP%C@<sg_6`#cGZy{)r$5P`2fT00@FNB^UBp!xkc^<IVQy_E9G(OVNJ-=
z)^eQAt4h^ouF#jarFvzxh_EU(cReaOYjvq)4)^Lmn?HqGrkTaH=f7|5Ip~ch5+$L_
z)xr@=If={(Az7&`5*52z5^^ZW?1?5qDStM4s4?z6Ix>_Trm5l46kd|aRC|_rdgzSH
zq-Qg&+)+AxHk+k$>D&|@pUS0Yvd7bz%;~9o-d~9>)hF7nhx|Vs7ks~S)4$O*Rx>?O
zQgWJ6R@LDWAIrD;bOmkVw1PhL7lk*#wCRwG4xMs~xan4|S@tYmvITcJ6*jfd4(<v?
vi^8<&e`2Fqs?n^q2aQ7=<!P7onO$g?)aLSnE(l9VMVX*dIimimD<1v_D}UY9

delta 1397
zcmcK2KTK0W90%}gDYO)ne^CZ89+(IyP$VG|s1dbBu?kT;pmDkPdTmdx@5+0xCDp_l
zhK`!}bTJxPjA6rcl|eBvCT?z;=-_75gv8Oo@7XHGV4{Of+t1y-yWj8be(!PD`mWO3
z_P}j|PY-@w_zn1UkC3Q;!v-`DqTdW-Q1{QkHaJ@wzXZeRFTf_aSo3=A`5hR-_(RwM
zS74No5_yKkRSfv*2#LdM@FaW*W3V$oh=dp62z&wYC13HU6Z-0_HpAWMcS60<3D^ox
zz%B4R)EiGjz21U{ke@hcOk$t{O`QG<>_>k#NC@^o7U2XeLmSVZLLF$dv6?svF+`5T
zb~podLZkLPSMv(gH&d=XzX?OgPnOW=gv)RmK7sdPD~^|hD=-JQVYLa%P{9vy3|_!-
zv4nU~U+q1p6Fq|6a24tey@T7~C%6>`FsL_8I?&MWg!<}xVFKE487F=Y_o6@FQmx@#
z7)SpBB!^8`6u9@%*W+Vei+>IOulz>I;mkHO)aEH+@hrDoY82^FB_+pvWzhv8B{eu@
z1tugjB&U5-F3&ntS+dwaM5a>I%y4s#CkN=JvGi=3DCYR4p{D;SR)VEBjq)>yx2JA?
z_?I0On9Osh*P%I;%S&bpxA-$aQaCxuiahDvs#^`m@`e-^PHuZMfssn6{=Kj9EKhNp
zTPF9`8+LS$M<QwAX7a|6sj`t6vjmre@zarwS^I+#->}Dmy`#h7Q_OJ(6E?FP$y{ZR
z)9M0Fj|hvUGlE80GApb}L%7Q2b81Mq-kac!dKXnvl}xDYD@kgz6w1PMSrkojDH*ke
z$!(L-9Ji}wx{NAu>M(n4iRvRMOBh0z$x%{$pB7VQUWX7U*Evk(lIumxWdl_FIZ3IO
zB_VQ%lokx(>5o|Ie`KsBJmw0#Qf{Bi{w|64y3slC`@wKksJTML^}TRG@hYH43*6Q>
bl~s;w;|9EV_;b@n?YTGB6s@#1@AH2Hi+EZ$

diff --git a/languages/it.po b/languages/it.po
index c47eb2f..0f41193 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -5,11 +5,12 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Reference\n"
-"Report-Msgid-Bugs-To: http://github.com/Daniel-KM/Reference/issues\n"
-"POT-Creation-Date: 2021-06-08 13:56-0000\n"
-"PO-Revision-Date: 2021-06-13 15:39-0000\n"
-"Last-Translator: Daniele Binaghi <admin@bitoteko.it>\n"
+"Project-Id-Version: Facets\n"
+"Report-Msgid-Bugs-To: https://github.com/DBinaghi/plugin-Facets/issues\n"
+"POT-Creation-Date: 2021-06-08 13:56-0001\n"
+"PO-Revision-Date: 2021-06-13 15:39-0001\n"
+"PO-Revision-Date: 2021-07-05 15:17-0001\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -104,81 +105,59 @@ msgid "Elements"
 msgstr "Elementi"
 
 #: config_form.php:101
-msgid "The Dublin Core elements that can be used for search refinement."
-msgstr "Gli elementi Dublin Core che possono essere usati per il raffinamento della ricerca."
-
-#: config_form.php:106
+msgid 
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
+"Sort order column to choose sorting order, Popularity column to show counters near names."
+msgstr 
+"Gli elementi che possono essere usati per il raffinamento della ricerca. Colonne Documento e Collezione "
+"per (dis)attivare, Ordinamento per scegliere il criterio di ordinamento, Popolarità per mostrare i "
+"contatori vicino ai nomi."
+
+#: config_form.php:103
 msgid "Element name"
 msgstr "Nome elemento"
 
-#: config_form.php:107
+#: config_form.php:104
 msgid "Item"
 msgstr "Documento"
 
-#: config_form.php:108
+#: config_form.php:105
 msgid "Collection"
 msgstr "Collezione"
 
-#: config_form.php:109
-#: config_form.php:185
-#: config_form.php:231
-#: config_form.php:277
+#: config_form.php:106
 msgid "Ordinamento"
 msgstr ""
 
-#: config_form.php:110
-#: config_form.php:205
-#: config_form.php:251
-#: config_form.php:297
+#: config_form.php:107
 msgid "Popularity"
 msgstr "Popolarità"
 
-#: config_form.php:145
-#: config_form.php:196
-#: config_form.php:242
-#: config_form.php:288
+#: config_form.php:159
+#: config_form.php:201
+#: config_form.php:243
+#: config_form.php:285
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: config_form.php:146
-#: config_form.php:197
-#: config_form.php:243
-#: config_form.php:289
+#: config_form.php:160
+#: config_form.php:202
+#: config_form.php:244
+#: config_form.php:286
 msgid "Popularity first, then alphabetical"
 msgstr "Popolarità prima, poi alfabetico"
 
-#: config_form.php:169
+#: config_form.php:178
+#: config_form.php:182
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:173
-#: config_form.php:219
-#: config_form.php:265
-msgid "Active"
-msgstr "Attivo"
-
-#: config_form.php:177
-msgid "If checked, search refinement by Item Type will be available (Items only)."
-msgstr "Se selezionata, il raffinamento della ricerca per Tipologia di Documento sarà disponibile (solo per Documenti)."
-
-#: config_form.php:209
-#: config_form.php:255
-#: config_form.php:301
-msgid "If checked, values's popularity will be displayed."
-msgstr "Se selezionata, la poporità dei valori verrà mostrata."
-
-#: config_form.php:215
+#: config_form.php:220
+#: config_form.php:224
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:223
-msgid "If checked, search refinement by Collection will be available (Items only)."
-msgstr "Se selezionata, il raffinamento della ricerca per Collezione sarà disponibile (solo per Documenti)."
-
-#: config_form.php:261
+#: config_form.php:262
+#: config_form.php:266
 msgid "Tags"
-msgstr "Etichette"
-
-#: config_form.php:269
-msgid "If checked, search refinement by Tag will be available (Items only)."
-msgstr "Se selezionata, il raffinamento della ricerca per Etichetta sarà disponibile (solo per Documenti)."
+msgstr "Etichette"
\ No newline at end of file

From 7c39d1910be62806e16f0e1ed1865eb31a4cc852 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:13:57 +0200
Subject: [PATCH 081/161] Fixed typos, tidied up indentation

---
 FacetsPlugin.php | 214 +++++++++++++++++++++++------------------------
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index ada45fd..da8617c 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -19,7 +19,7 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 		'initialize',
 		'config_form',
 		'config',
-        'collections_browse_sql',
+		'collections_browse_sql',
 		'public_head',
 		'public_items_browse',
 		'public_collections_browse',
@@ -34,7 +34,7 @@ public function hookInstall()
 		set_option('facets_public_hook', 'default');
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
-		set_option('facets_collapsable', 0);
+		set_option('facets_collapsible', 0);
 		set_option('facets_direction', 'vertical');
 
 		$defaults = array(
@@ -60,7 +60,7 @@ public function hookUninstall()
 		delete_option('facets_public_hook');
 		delete_option('facets_description');
 		delete_option('facets_hide_single_entries');
-		delete_option('facets_collapsable');
+		delete_option('facets_collapsible');
 		delete_option('facets_direction');
 		delete_option('facets_elements');
 		delete_option('facets_item_types_active');
@@ -79,7 +79,7 @@ public function hookUninstall()
 	 */
 	public function hookInitialize()
 	{
-        add_translation_source(dirname(__FILE__) . '/languages');
+		add_translation_source(dirname(__FILE__) . '/languages');
 
 		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
 
@@ -114,7 +114,7 @@ public function hookConfig($args)
 		set_option('facets_public_hook', $post['facets_public_hook']);
 		set_option('facets_description', $post['facets_description']);
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
-		set_option('facets_collapsable', $post['facets_collapsable']);
+		set_option('facets_collapsible', $post['facets_collapsible']);
 		set_option('facets_direction', $post['facets_direction']);
 
 		$settings = array(
@@ -133,117 +133,117 @@ public function hookConfig($args)
 		set_option('facets_tags_popularity', $post['facets_tags_popularity']);
 	}
 
-    /**
-     * Hook into collections_browse_sql
-     *
-     * @select array $args
-     * @params array $args
-     */
-    public function hookCollectionsBrowseSql($args)
-    {
-        $db = $this->_db;
-        $select = $args['select'];
-        $params = $args['params'];
+	/**
+	 * Hook into collections_browse_sql
+	 *
+	 * @select array $args
+	 * @params array $args
+	 */
+	public function hookCollectionsBrowseSql($args)
+	{
+		$db = $this->_db;
+		$select = $args['select'];
+		$params = $args['params'];
 
 		// if (array_key_exists('_advanced_0', $select->getPart('from')) return;
 		
 		if (strpos($select, '_advanced_') !== false) return;
-        
-        if ($advancedTerms = @$params['advanced']) {
-            $where = '';
-            $advancedIndex = 0;
-            foreach ($advancedTerms as $v) {
-                // Do not search on blank rows.
-                if (empty($v['element_id']) || empty($v['type'])) {
-                    continue;
-                }
-
-                $value = isset($v['terms']) ? $v['terms'] : null;
-                $type = $v['type'];
-                $elementId = (int) $v['element_id'];
-                $alias = "_advanced_{$advancedIndex}";
-
-                $joiner = isset($v['joiner']) && $advancedIndex > 0 ? $v['joiner'] : null;
-
-                $negate = false;
-                // Determine what the WHERE clause should look like.
-                switch ($type) {
-                    case 'does not contain':
-                        $negate = true;
-                    case 'contains':
-                        $predicate = "LIKE " . $db->quote('%'.$value .'%');
-                        break;
-
-                    case 'is not exactly':
-                        $negate = true;
-                    case 'is exactly':
-                        $predicate = ' = ' . $db->quote($value);
-                        break;
-
-                    case 'is empty':
-                        $negate = true;
-                    case 'is not empty':
-                        $predicate = 'IS NOT NULL';
-                        break;
-
-                    case 'starts with':
-                        $predicate = "LIKE " . $db->quote($value.'%');
-                        break;
-
-                    case 'ends with':
-                        $predicate = "LIKE " . $db->quote('%'.$value);
-                        break;
-
-                    case 'does not match':
-                        $negate = true;
-                    case 'matches':
-                        if (!strlen($value)) {
-                            continue 2;
-                        }
-                        $predicate = 'REGEXP ' . $db->quote($value);
-                        break;
-
-                    default:
-                        throw new Omeka_Record_Exception(__('Invalid search type given!'));
-                }
-
-                $predicateClause = "{$alias}.text {$predicate}";
-
-                // Note that $elementId was earlier forced to int, so manual quoting
-                // is unnecessary here
-                $joinCondition = "{$alias}.record_id = collections.id AND {$alias}.record_type = 'Collection' AND {$alias}.element_id = $elementId";
-
-                if ($negate) {
-                    $joinCondition .= " AND {$predicateClause}";
-                    $whereClause = "{$alias}.text IS NULL";
-                } else {
-                    $whereClause = $predicateClause;
-                }
-
-                $select->joinLeft(array($alias => $db->ElementText), $joinCondition, array());
-                if ($where == '') {
-                    $where = $whereClause;
-                } elseif ($joiner == 'or') {
-                    $where .= " OR $whereClause";
-                } else {
-                    $where .= " AND $whereClause";
-                }
-
-                $advancedIndex++;
-            }
-
-            if ($where) {
-                $select->where($where);
-            }
-        }            
-    }
+		
+		if ($advancedTerms = @$params['advanced']) {
+			$where = '';
+			$advancedIndex = 0;
+			foreach ($advancedTerms as $v) {
+				// Do not search on blank rows.
+				if (empty($v['element_id']) || empty($v['type'])) {
+					continue;
+				}
+
+				$value = isset($v['terms']) ? $v['terms'] : null;
+				$type = $v['type'];
+				$elementId = (int) $v['element_id'];
+				$alias = "_advanced_{$advancedIndex}";
+
+				$joiner = isset($v['joiner']) && $advancedIndex > 0 ? $v['joiner'] : null;
+
+				$negate = false;
+				// Determine what the WHERE clause should look like.
+				switch ($type) {
+					case 'does not contain':
+						$negate = true;
+					case 'contains':
+						$predicate = "LIKE " . $db->quote('%'.$value .'%');
+						break;
+
+					case 'is not exactly':
+						$negate = true;
+					case 'is exactly':
+						$predicate = ' = ' . $db->quote($value);
+						break;
+
+					case 'is empty':
+						$negate = true;
+					case 'is not empty':
+						$predicate = 'IS NOT NULL';
+						break;
+
+					case 'starts with':
+						$predicate = "LIKE " . $db->quote($value.'%');
+						break;
+
+					case 'ends with':
+						$predicate = "LIKE " . $db->quote('%'.$value);
+						break;
+
+					case 'does not match':
+						$negate = true;
+					case 'matches':
+						if (!strlen($value)) {
+							continue 2;
+						}
+						$predicate = 'REGEXP ' . $db->quote($value);
+						break;
+
+					default:
+						throw new Omeka_Record_Exception(__('Invalid search type given!'));
+				}
+
+				$predicateClause = "{$alias}.text {$predicate}";
+
+				// Note that $elementId was earlier forced to int, so manual quoting
+				// is unnecessary here
+				$joinCondition = "{$alias}.record_id = collections.id AND {$alias}.record_type = 'Collection' AND {$alias}.element_id = $elementId";
+
+				if ($negate) {
+					$joinCondition .= " AND {$predicateClause}";
+					$whereClause = "{$alias}.text IS NULL";
+				} else {
+					$whereClause = $predicateClause;
+				}
+
+				$select->joinLeft(array($alias => $db->ElementText), $joinCondition, array());
+				if ($where == '') {
+					$where = $whereClause;
+				} elseif ($joiner == 'or') {
+					$where .= " OR $whereClause";
+				} else {
+					$where .= " AND $whereClause";
+				}
+
+				$advancedIndex++;
+			}
+
+			if ($where) {
+				$select->where($where);
+			}
+		}			
+	}
 
 	public function hookPublicHead($args)
 	{
 		$request = Zend_Controller_Front::getInstance()->getRequest();
 		$controller = $request->getControllerName();
 		$action = $request->getActionName();
- 		
+		
 		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
 			queue_css_file('facets');
 		}
@@ -278,7 +278,7 @@ public function showFacets($args)
 		$request = Zend_Controller_Front::getInstance()->getRequest();
 		$controller = $request->getControllerName();
 		$action = $request->getActionName();
- 		
+		
 		if ($controller == 'items' && $action == 'browse') {
 			$params = array(
 				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''), 

From 782a9f961fff1f018b7db7bc26c98f04af3e7f08 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:40:36 +0200
Subject: [PATCH 082/161] Changed header string

---
 views/public/facets/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 5663918..45c24d9 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -20,7 +20,7 @@
 ?>
 
 <div class="facets-container <?php echo "facets-layout-" . $facetsDirection; ?>">
-	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsible\""; ?>><?php echo html_escape(__('Refine search by')) ?>...</button>
+	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsible\""; ?>><?php echo html_escape(__('Refine search')) ?></button>
 	<div id="facets-body">
 		<?php 
 			if ($description = get_option('facets_description')) {

From accbfb7e4f959bd2e78e8968e034a3d36ec94b2d Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:41:16 +0200
Subject: [PATCH 083/161] Changed string

---
 languages/template.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/template.pot b/languages/template.pot
index 132c708..20b8436 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: browse.php:23
-msgid "Refine search by"
+msgid "Refine search"
 msgstr ""
 
 #: FacetsFunctions.php:59

From 0fc4143a37bb7e9d0b022bb7e9bfc45c739dad3b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:41:34 +0200
Subject: [PATCH 084/161] Changed string

---
 languages/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/it.po b/languages/it.po
index 0f41193..88ef543 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: browse.php:23
-msgid "Refine search by"
-msgstr "Raffina la ricerca per"
+msgid "Refine search"
+msgstr "Raffina la ricerca"
 
 #: FacetsFunctions.php:59
 #: FacetsFunctions.php:135
@@ -160,4 +160,4 @@ msgstr "Collezioni"
 #: config_form.php:262
 #: config_form.php:266
 msgid "Tags"
-msgstr "Etichette"
\ No newline at end of file
+msgstr "Etichette"

From 1d61b847ec7dee2fee6cea2887f4b1291ddeef01 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:41:57 +0200
Subject: [PATCH 085/161] Changed string

---
 languages/eo.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/eo.po b/languages/eo.po
index eeb01cd..3f3838b 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -18,8 +18,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: browse.php:22
-msgid "Refine search by"
-msgstr "Rafini serĉon per"
+msgid "Refine search"
+msgstr "Rafini serĉon"
 
 #: FacetsFunctions.php:59
 #: FacetsFunctions.php:135
@@ -151,4 +151,4 @@ msgstr ""
 #: config_form.php:262
 #: config_form.php:266
 msgid "Tags"
-msgstr ""
\ No newline at end of file
+msgstr ""

From d4206e7959320f65dd4533974a23e653c43484e6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 6 Jul 2021 10:46:11 +0200
Subject: [PATCH 086/161] Updated files

---
 languages/eo.mo | Bin 574 -> 567 bytes
 languages/it.mo | Bin 3644 -> 3637 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/languages/eo.mo b/languages/eo.mo
index 0c30b48f2e59fdf343a504a34035a9fdb8cd7e14..89935c25f2ec71e563f07175cb789d904569985d 100644
GIT binary patch
delta 105
zcmdnTvYlmuiW@Hj14AqjgXnA^W&`3%AfCv`z|a7s`G8o62|_CZX^^}DkY)%<P0P$n
oRVYqPEK1JUn7fTpoWU)>C^J1%AuThfq$od+!8Io}yQGu>02}BOIRF3v

delta 93
zcmdnavX5ngil+br14Aqj^8#@m5VHYs4G>RcWMF6p(n3Hi%EZ9H2c$KCG)UeYNHYYb
gre)@(Dio(C7A0pWBvo$A+Q!JDP>@<QS%FC$07Uf<jQ{`u

diff --git a/languages/it.mo b/languages/it.mo
index e6601e7e1358ae1357a135c9c2640cfdd48c39f0..34248112e3ab81b26d1c5ed67d3b3765c8de6b2b 100644
GIT binary patch
delta 333
zcmXZXv1-CV9LMorj7ekCI@rO*#lb;eK+vIk3Z41}g(6*w(8Vb)&_O{&TwLnlR*0d4
z>Dof4f}Jvn&>?gweE{kAYT>xg{r~sB|J|jvq&8edCz5uyWc)@K_gF-S=?r~bV~AH4
zHICFIzM+^>jj@YU9I^j_KJm3D9bq3UI6!mHJ(~TQr|567AQ6yw{4Yq6p*N-~Ztw!X
zaE_glbc-1>6w>V!FVXbrVIA+#TsT4VfCnt&6Pj}`e*3U^ClQj!@Dm$!S@M(MSZWa`
YbTJRw;yLDVZn=f{$9{F=XFsxk0bOS(-T(jq

delta 342
zcmXZXu}eZx6vy%3>*@3P(g=lI9CS?D8zkHlTiulg2{A+vL3n>cHi<+umh)4WL`NrA
zof;BCS}gD%=zA+T+|NDd-h1x7<McG$8~MkQHntSUJvwNGBtkAj0ps|JC9GOfG%THx
z*V)Vw^)ZhRc+dJ8J@T3>MX-el?4r5n4$b<bEB|-$LgA1?@V{Y>gq92`T;Ub&@Ch%X
zQUl+RP>F6yETidjgIR2&xp06d_>4z5LvwEFo&QbN6fP;e;|HG6WyntwF)2qrrHgsc
c7K`{Dd|J+dovCz!FMHvHGPl>wVB-1q5A9Ma+W-In


From cf6e5932fa113e68422ef2b8c64a0ec9eb7e8655 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:26:24 +0200
Subject: [PATCH 087/161] Corrected bug

---
 helpers/FacetsFunctions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 9d3b4e7..34111fc 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -302,7 +302,7 @@ function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title',
 			$facet = array();
 			foreach ($elements as $element) {
 				if ($isDate) {
-					$facet[$element->year] = $facet[$element->year] + $element->count;
+					$facet[$element->year] = $element->count;
 				} else {
 					$facet[$element->text] = $element->count;
 				}

From 69a131ed7d46856f33d84d5cc9b079122ad24f4b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 7 Jul 2021 10:27:18 +0200
Subject: [PATCH 088/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 7eab199..c3c07ac 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link=""
 support_link=""
-version="2.3"
+version="2.4"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 60477e8b9e38552ac0664db130dacf5374b0543b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 8 Jul 2021 09:24:47 +0200
Subject: [PATCH 089/161] Update plugin.ini

---
 plugin.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.ini b/plugin.ini
index c3c07ac..fee0875 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -3,8 +3,8 @@ name = "Facets"
 author = "Jean-Baptiste Heren and Daniele Binaghi"
 description="Adds a faceted navigation block to narrow down Items and Collections search results by applying multiple filters"
 license="GPLv3"
-link=""
-support_link=""
+link="https://github.com/DBinaghi/plugin-Facets"
+support_link="https://github.com/DBinaghi/plugin-Facets/issues"
 version="2.4"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From df27bb9ff1686d1c140c000e362c01254af8cd8b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 9 Jul 2021 23:43:47 +0200
Subject: [PATCH 090/161] Modified get_facet_select() function

---
 helpers/FacetsFunctions.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 34111fc..15c4a58 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -241,14 +241,14 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 	 * Return HTML Select associated with Array of facets values.
 	 *
 	 * @param itemsArray
-	 * @param dcElementName
+	 * @param elementId
 	 * @param isDate
 	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @return html.
+	 * @return html
 	 */
-	function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title', $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Create Where clauses
 		$whereRecordType = createWhereRecordTypeClause($recordType);
 		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
@@ -279,19 +279,15 @@ function get_dc_facet_select($recordType, $subsetSQL, $dcElementName = 'Title',
 		// Build the select query.
 		$select = $table->getSelect();
 		$select->columns($columns);
-		$select->joinInner(array('elements' => $db->Elements),
-				'element_texts.element_id = elements.id', array());
-		$select->joinInner(array('element_sets' => $db->ElementSet),
-				'element_sets.id = elements.element_set_id', array());
+		$select->joinInner(array('elements' => $db->Elements), 'element_texts.element_id = elements.id', array());
+		$select->joinInner(array('element_sets' => $db->ElementSet), 'element_sets.id = elements.element_set_id', array());
 		if ($recordType == 'item') {
-			$select->joinInner(array('items' => $db->Item),
-					'items.id = element_texts.record_id', array());
+			$select->joinInner(array('items' => $db->Item), 'items.id = element_texts.record_id', array());
 		} else {
-			$select->joinInner(array('collections' => $db->Collection),
-					'collections.id = element_texts.record_id', array());
+			$select->joinInner(array('collections' => $db->Collection), 'collections.id = element_texts.record_id', array());
 		}
-		$select->where('element_sets.name = '. $db->quote('Dublin Core'));
-		$select->where('elements.name = '. $db->quote($dcElementName));
+		// $select->where('element_sets.name = '. $db->quote('Dublin Core'));
+		$select->where('elements.id = '. $elementId);
 		$select->where($whereRecordType);
 		$select->where($whereSubset);
 		$select->group($groupBy);

From 24b5efdb67cd7dba3a4f77239ead8e1991798152 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 9 Jul 2021 23:45:00 +0200
Subject: [PATCH 091/161] Removes Dublin Core element set limit

---
 views/public/facets/browse.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 45c24d9..023b9e3 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -6,7 +6,6 @@
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
-		->where('element_sets.name = \'Dublin Core\'')
 		->order('elements.element_set_id')
 		->order('ISNULL(elements.order)')
 		->order('elements.order');
@@ -35,7 +34,7 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_dc_facet_select('collection', $subsetSQL, $element->name, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
+							if ($html = get_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
 								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo $html;
@@ -48,7 +47,7 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_dc_facet_select('item', $subsetSQL, $element->name, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
+							if ($html = get_facet_select('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
 								echo "<div class=\"container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo $html;

From be8e02fca9caf25fee26a3dcbac84b6548b868c2 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 10 Jul 2021 01:52:51 +0200
Subject: [PATCH 092/161] Corrected name of variable

---
 helpers/FacetsFunctions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 15c4a58..0143c64 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -324,12 +324,12 @@ function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = fa
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($term)){
-				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $dcElementName . "\">";
+				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $elementId . "\">";
 				$url = getElementFieldUrl($element_id, null, $isDate);
 				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">$term</option>";
 			} elseif (count($facet) > 0) {
-				$html =	"<div class=\"select-arrow\"><select id=\"" . $element_id . "\" class=\"facet\" name=\"" . $dcElementName . "\">";
+				$html =	"<div class=\"select-arrow\"><select id=\"" . $element_id . "\" class=\"facet\" name=\"" . $elementId . "\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
 				$addOptions = true;
 			}

From 13f4b5c7148c4d2baf2ba89c5ae4529dc02c5ab7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:51:29 +0200
Subject: [PATCH 093/161] Added extra check for Collection and ItemType id
 existence

---
 helpers/FacetsFunctions.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 0143c64..ade6b58 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -114,7 +114,7 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			
 			// Stores data for selected collection, if any
 			if (isset($_GET['collection'])) {
-				if ($collection_id = $_GET['collection']) {
+				if ($collection_id = $_GET['collection'] && array_key_exists($collection_id, $facetCollections)) {
 					$selectedCollection = $facetCollections[$collection_id];
 				}
 			}
@@ -201,7 +201,7 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			
 			// Stores data for selected item type, if any
 			if (isset($_GET['type'])) {
-				if ($itemType_id = $_GET['type']) {
+				if ($itemType_id = $_GET['type'] && array_key_exists($itemType_id, $facetItemTypes)) {
 					$selectedItemType = $facetItemTypes[$itemType_id];
 				}
 			}
@@ -286,7 +286,6 @@ function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = fa
 		} else {
 			$select->joinInner(array('collections' => $db->Collection), 'collections.id = element_texts.record_id', array());
 		}
-		// $select->where('element_sets.name = '. $db->quote('Dublin Core'));
 		$select->where('elements.id = '. $elementId);
 		$select->where($whereRecordType);
 		$select->where($whereSubset);

From cab0ad541b5c7df1b23305d158d1fd9371ba93ef Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:00:08 +0200
Subject: [PATCH 094/161] Removed dropdown arrows hiding

---
 views/public/css/facets.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index fcbe7a9..2a8cec5 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -104,9 +104,6 @@
 .facets-container form select {
 	width: 100%;
 	border: 0;
-	appearance: none !important;
-	-webkit-appearance: none !important;
-	-moz-appearance: none !important;
 	background-color: #FFF;
 	text-align: left;
 	font-size: 80%;

From 3d08bc51656e68f3ea0df9434c9a3a4512271cd4 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:02:03 +0200
Subject: [PATCH 095/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 0eaf5ad..40d0611 100644
--- a/Readme.md
+++ b/Readme.md
@@ -47,7 +47,7 @@ Similarly, one can choose to also include **Item Types**, **Collections** and **
 
 **Single values** can be exluded as not really significant, although they will be listed anyway if less than 5 values are available.
 
-Facets block can be set up for **vertical** or **horizontal** layout, according to the theme layout; and it can be made **collapsable**, to use less vertical space (recommended for horizontal layout).
+Facets block can be set up for **vertical** or **horizontal** layout, according to the theme layout; and it can be made **collapsible**, to use less vertical space (recommended for horizontal layout).
 
 Sorting order can be **alphabetical**, or **first by popularity and then alphabetical**. Popularity count can be shown, if needed.
 

From 60e899d117feaab5603653ab412887d37f0132ff Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 10 Jul 2021 10:02:59 +0200
Subject: [PATCH 096/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 40d0611..886ea6a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -54,4 +54,4 @@ Sorting order can be **alphabetical**, or **first by popularity and then alphabe
 **Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
 
 ## Licence
-MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/) and Daniele Binaghi.
+MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/) and [Daniele Binaghi](https://github.com/DBinaghi).

From 521c14912190e688680b7f43f5203c03dcf0beb6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 11 Jul 2021 09:43:46 +0200
Subject: [PATCH 097/161] Corrected check in functions

---
 helpers/FacetsFunctions.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index ade6b58..4a715f5 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -114,8 +114,10 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			
 			// Stores data for selected collection, if any
 			if (isset($_GET['collection'])) {
-				if ($collection_id = $_GET['collection'] && array_key_exists($collection_id, $facetCollections)) {
-					$selectedCollection = $facetCollections[$collection_id];
+				if ($collection_id = $_GET['collection']) {
+                                        if (array_key_exists($collection_id, $facetCollections)) {
+					        $selectedCollection = $facetCollections[$collection_id];
+                                        }
 				}
 			}
 
@@ -201,8 +203,10 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			
 			// Stores data for selected item type, if any
 			if (isset($_GET['type'])) {
-				if ($itemType_id = $_GET['type'] && array_key_exists($itemType_id, $facetItemTypes)) {
-					$selectedItemType = $facetItemTypes[$itemType_id];
+				if ($itemType_id = $_GET['type']) {
+                                        if (array_key_exists($itemType_id, $facetItemTypes)) {
+					        $selectedItemType = $facetItemTypes[$itemType_id];
+                                        }
 				}
 			}
 

From c052abfec1eb140d1a2cfe38c9d2dce90fd4bf1c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 16 Jul 2021 10:43:28 +0200
Subject: [PATCH 098/161] Update FacetsFunctions.php

---
 helpers/FacetsFunctions.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 4a715f5..24132ed 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -98,8 +98,7 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 		// Build the select query.
 		$select = $table->getSelect()
 			->columns('COUNT(collections.id) AS count')
-			->joinInner(array('items' => $db->Items),
-				'collections.id = items.collection_id', array())
+			->joinInner(array('items' => $db->Items), 'collections.id = items.collection_id', array())
 			->where($whereSubset)
 			->group('collections.id');
 
@@ -115,9 +114,9 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			// Stores data for selected collection, if any
 			if (isset($_GET['collection'])) {
 				if ($collection_id = $_GET['collection']) {
-                                        if (array_key_exists($collection_id, $facetCollections)) {
-					        $selectedCollection = $facetCollections[$collection_id];
-                                        }
+					if (array_key_exists($collection_id, $facetCollections)) {
+						$selectedCollection = $facetCollections[$collection_id];
+					}
 				}
 			}
 
@@ -186,8 +185,7 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 		// Build the select query.
 		$select = $table->getSelect()
 			->columns('COUNT(item_types.id) AS count')
-			->joinInner(array('items' => $db->Items),
-				'item_types.id = items.item_type_id', array())
+			->joinInner(array('items' => $db->Items), 'item_types.id = items.item_type_id', array())
 			->where($whereSubset)
 			->group('item_types.id')
 			->order($orderBy);
@@ -204,9 +202,9 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			// Stores data for selected item type, if any
 			if (isset($_GET['type'])) {
 				if ($itemType_id = $_GET['type']) {
-                                        if (array_key_exists($itemType_id, $facetItemTypes)) {
-					        $selectedItemType = $facetItemTypes[$itemType_id];
-                                        }
+					if (array_key_exists($itemType_id, $facetItemTypes)) {
+						$selectedItemType = $facetItemTypes[$itemType_id];
+					}
 				}
 			}
 

From 7429568d504b20bf21e27fec098eaabc9fe5bcc7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 16 Jul 2021 13:33:31 +0200
Subject: [PATCH 099/161] Update Readme.md

---
 Readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 886ea6a..43f40e2 100644
--- a/Readme.md
+++ b/Readme.md
@@ -19,7 +19,7 @@ Then install it like any other Omeka plugin.
 
 ## (optional) Theme customization
 
-Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used. 
+Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used; in such a case, the use of [get_specific_plugin_hook_output](http://omeka.readthedocs.io/en/latest/Reference/libraries/globals/get_specific_plugin_hook_output.html) function is suggested. 
 
 For **Thanks, Roy** theme, for example, best way is to change `common/header.php` code using the custom hook, while unchecking **Block collapsible** option and setting **Vertical** as **Block layout**:
 ```php
@@ -30,12 +30,12 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
     <?php echo search_form(); ?>
     <?php endif; ?>
 </div>
-<?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
+<?php get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
 ```
 For **Berlin** theme, instead, check **Block collapsible** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
-<?php fire_plugin_hook('public_facets', array('view' => $this)); ?>
+<?php get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
 <?php echo pagination_links(); ?>
 ```
 

From 0e26cdfa189e18b30f8f9d22ab53d65afbdac324 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 16 Jul 2021 14:00:56 +0200
Subject: [PATCH 100/161] Added echo

---
 Readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 43f40e2..3745008 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,12 +30,12 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
     <?php echo search_form(); ?>
     <?php endif; ?>
 </div>
-<?php get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
+<?php echo get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
 ```
 For **Berlin** theme, instead, check **Block collapsible** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
-<?php get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
+<?php echo get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
 <?php echo pagination_links(); ?>
 ```
 

From 35e495bfe99834fcbf224469c19a02774113bc91 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:16:55 +0200
Subject: [PATCH 101/161] Added style and Minimum checkbox count options

---
 config_form.php | 81 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 8 deletions(-)

diff --git a/config_form.php b/config_form.php
index 420d044..0521a0e 100644
--- a/config_form.php
+++ b/config_form.php
@@ -60,13 +60,13 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collapsible', __('Block collapsible')); ?>
+		<?php echo $view->formLabel('facets_checkbox_minimum_amount', __('Minimum checkbox count')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, facets block will be collapsible (tip: as it saves space, it\'s particularly useful with horizontal theme layouts).'); ?>
+			<?php echo __('For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed).', FACETS_MINIMUM_AMOUNT); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_collapsible', get_option('facets_collapsible'), null, array('1', '0')); ?>
+		<?php echo $view->formText('facets_checkbox_minimum_amount', get_option('facets_checkbox_minimum_amount')); ?>
     </div>
 </div>
 
@@ -90,12 +90,24 @@
    </div>
 </div>
 
+<div class="field">
+	<div class="two columns alpha">
+		<?php echo $view->formLabel('facets_collapsible', __('Block collapsible')); ?>
+	</div>
+	<div class="inputs five columns omega">
+		<p class="explanation">
+			<?php echo __('If checked, facets block will be collapsible (tip: as it saves space, it\'s particularly useful with horizontal theme layouts).'); ?>
+		</p>
+		<?php echo $view->formCheckbox('facets_collapsible', get_option('facets_collapsible'), null, array('1', '0')); ?>
+    </div>
+</div>
+
 <h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">
 	<div class="inputs seven columns alpha">
 		<p class="explanation">
-			<?php echo __('The elements that can be used for search refinement. Item and Collection columns to (de)activate, Sort order column to choose sorting order, Popularity column to show counters near names.'); ?>
+			<?php echo __('The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names.'); ?>
 		</p>
 		<table id="facets_elements-table">
 			<thead>
@@ -103,6 +115,7 @@
 					<th class="boxes"><?php echo __('Element name'); ?></th>
 					<th class="boxes"><?php echo __('Item'); ?></th>
 					<th class="boxes"><?php echo __('Collection'); ?></th>
+					<th class="boxes"><?php echo __('Style'); ?></th>
 					<th class="boxes"><?php echo __('Sort order'); ?></th>
 					<th class="boxes"><?php echo __('Popularity'); ?></th>
 				</tr>
@@ -115,7 +128,7 @@
 							$current_element_set = $element->set_name;
 				?>
 				<tr>
-					<th colspan="5">
+					<th colspan="6">
 						<strong><?php echo __($current_element_set); ?></strong>
 					</th>
 				</tr>
@@ -148,6 +161,19 @@
 							}								
 						?>
 					</td>
+					<td class="boxes">
+						<?php 
+							$type = (isset($settings['elements'][$element->name]['type']) ? $settings['elements'][$element->name]['type'] : '');
+							echo $view->formSelect(
+							"elements[{$element->name}][type]",
+							$type,
+							array(),
+							array(
+								'dropdown' => __('Dropdown'),
+								'checkbox' => __('Checkbox')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php 
 							$sortOrder = (isset($settings['elements'][$element->name]['sort']) ? $settings['elements'][$element->name]['sort'] : '');
@@ -174,7 +200,7 @@
 				</tr>
 			<?php endforeach; ?>
 				<tr>
-					<th colspan="5">
+					<th colspan="6">
 						<strong><?php echo __('Item Types'); ?></strong>
 					</th>
 				</tr>
@@ -191,6 +217,19 @@
 					<td class="boxes">
 						&nbsp
 					</td>
+					<td class="boxes">
+						<?php 
+							$type = (isset($settings['facets_item_types_style']) ? $settings['facets_item_types_style'] : '');
+							echo $view->formSelect(
+							"facets_item_types_style",
+							$type,
+							array(),
+							array(
+								'dropdown' => __('Dropdown'),
+								'checkbox' => __('Checkbox')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php 
 							echo $view->formSelect(
@@ -216,7 +255,7 @@
 					</td>
 				</tr>				
 				<tr>
-					<th colspan="5">
+					<th colspan="6">
 						<strong><?php echo __('Collections'); ?></strong>
 					</th>
 				</tr>
@@ -233,6 +272,19 @@
 					<td class="boxes">
 						&nbsp
 					</td>
+					<td class="boxes">
+						<?php 
+							$type = (isset($settings['facets_collections_style']) ? $settings['facets_collections_style'] : '');
+							echo $view->formSelect(
+							"facets_collections_style",
+							$type,
+							array(),
+							array(
+								'dropdown' => __('Dropdown'),
+								'checkbox' => __('Checkbox')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php 
 							echo $view->formSelect(
@@ -258,7 +310,7 @@
 					</td>
 				</tr>				
 				<tr>
-					<th colspan="5">
+					<th colspan="6">
 						<strong><?php echo __('Tags'); ?></strong>
 					</th>
 				</tr>
@@ -275,6 +327,19 @@
 					<td class="boxes">
 						&nbsp
 					</td>
+					<td class="boxes">
+						<?php 
+							$type = (isset($settings['facets_tags_style']) ? $settings['facets_tags_style'] : '');
+							echo $view->formSelect(
+							"facets_tags_style",
+							$type,
+							array(),
+							array(
+								'dropdown' => __('Dropdown'),
+								'checkbox' => __('Checkbox')
+							)); 
+						?>
+					</td>
 					<td class="boxes">
 						<?php 
 							echo $view->formSelect(

From dca686c6c3896e07b519bb3e0897806cdaa9780a Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:17:45 +0200
Subject: [PATCH 102/161] Added checkbox support

---
 views/public/css/facets.css | 59 ++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index 2a8cec5..b4abb86 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -1,4 +1,4 @@
-.facets-container {
+#facets-container {
 	margin-bottom: 20px;
 }
 
@@ -19,7 +19,7 @@
 	width: 100%;
 }
 
-.facets-container button {
+#facets-container button {
 	width: 100%;
 	text-align: center;
 	font-weight: bold;
@@ -42,11 +42,20 @@
 	margin-left: 5px;
 }
 
-.container-vertical {
+.facets-container-vertical {
 	/* max-width: 350px; */
 }
 
-.container-vertical:not(:last-child) {
+.facets-container-vertical:not(:last-child) {
+	padding-bottom: 20px;
+}
+
+.facets-container-horizontal {
+	max-width: 350px;
+	display: inline-block;
+}
+
+.facets-container-horizontal:not(:last-child) {
 	padding-bottom: 20px;
 }
 
@@ -63,16 +72,7 @@
 	justify-content: space-between;
 }
 
-.container-horizontal {
-	max-width: 350px;
-	display: inline-block;
-}
-
-.container-horizontal:not(:last-child) {
-	padding-bottom: 20px;
-}
-
-.facets-container p.description {
+#facets-container p.description {
 	text-align: left;
 	color: #545759;
 	font-size: 90%;
@@ -88,20 +88,20 @@
 	background-color: #F1F1F1;
 }
 
-.facets-container .hidden {
+#facets-container .hidden {
 	display: none;
 }
 
-.facets-container form {
+#facets-container form {
 	padding: 20px 10px;
 }
 
-.facets-container form label {
+#facets-container form label {
 	margin-bottom: 8px;
 	color: #545759;
 }
 
-.facets-container form select {
+#facets-container form select {
 	width: 100%;
 	border: 0;
 	background-color: #FFF;
@@ -113,3 +113,26 @@
 	color: #FFF;
 	background-color: #545759!important;
 }
+
+.facet-checkbox, .facet-checkbox-all, .facet-visibility-toggle {
+	display: block;
+	font-size: 90%;
+}
+
+.facet-visibility-toggle {
+	float: right;
+	cursor: pointer;
+}
+
+.facet-checkbox-count {
+	float: right;
+	color: #545759;
+}
+
+.hidden {
+    display: none;
+}
+
+.unhidden {
+    display: block;
+}

From 6b7bc257dc11c027d243c7539551291b39b28159 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:18:19 +0200
Subject: [PATCH 103/161] Create facets.js

---
 views/public/javascripts/facets.js | 54 ++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 views/public/javascripts/facets.js

diff --git a/views/public/javascripts/facets.js b/views/public/javascripts/facets.js
new file mode 100644
index 0000000..96b1cf2
--- /dev/null
+++ b/views/public/javascripts/facets.js
@@ -0,0 +1,54 @@
+jQuery(document).ready(function () {
+	// loads language variables
+	var language = facetsLanguage.language;
+	
+	// submits results of refining search to reload the page
+	window.jQuery('#facets-body select').change(function() {
+		var option = window.jQuery(this).find('option:selected');
+		if (typeof(option.data('url')) !== 'undefined') window.location.href = option.data('url');
+	});
+	
+	// submits results of refining search to reload the page
+	window.jQuery('#facets-body input:checkbox').change(function() {
+		var checkbox = window.jQuery(this);
+		if (typeof(checkbox.data('url')) !== 'undefined') window.location.href = checkbox.data('url');
+	});
+
+	// toggles extra values visibility
+	jQuery('.facet-visibility-toggle').click(function () {
+		var id = jQuery(this).data('element-id');
+		var div = jQuery('#facet-extra-values-' + id);
+		var link = jQuery('#facet-extra-link-' + id);
+		div.toggleClass("hidden unhidden");
+		if (div.hasClass('hidden')) {
+			link.text(language.ShowMore);
+		} else {
+			link.text(language.ShowLess);
+		}
+	});
+
+	// collapses/expands facets block
+	jQuery('#facets-title').click(function () {
+		var header = jQuery(this);
+		if (!header.hasClass('facets-collapsible') && !header.hasClass('facets-collapsed')) return;
+		//getting the next element
+		var content = header.next();
+		//open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
+		content.slideToggle(300, function () {
+			//execute this after slideToggle is done
+			//change icon of header based on visibility of content div
+			header.toggleClass('facets-collapsible facets-collapsed');
+		});
+	});
+});	
+	
+// forces block collapsible if screen size small
+jQuery(window).on('load', function() {
+	if (jQuery(window).width() < 768) {
+		jQuery('#facets-title').addClass('facets-collapsed');
+		jQuery('#facets-body').addClass('hidden');
+	}
+
+	// hides facets block (but for title) on load
+	jQuery('#facets-body').next().addClass('hidden');
+});

From f88eceb838c40ff9b60e1bf415bf2213c491fbe3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:19:16 +0200
Subject: [PATCH 104/161] Added checkbox style

---
 views/public/facets/browse.php | 65 +++++++++++-----------------------
 1 file changed, 20 insertions(+), 45 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 023b9e3..fad7a38 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -3,6 +3,7 @@
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
 	$facetsCollapsible = (bool)get_option('facets_collapsible');
 	$facetsDirection = (string)get_option('facets_direction');
+	$checkboxMinCount = (int)get_option('facets_checkbox_minimum_amount');
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
@@ -18,7 +19,7 @@
 	}
 ?>
 
-<div class="facets-container <?php echo "facets-layout-" . $facetsDirection; ?>">
+<div id="facets-container" class="<?php echo "facets-layout-" . $facetsDirection; ?>">
 	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsible\""; ?>><?php echo html_escape(__('Refine search')) ?></button>
 	<div id="facets-body">
 		<?php 
@@ -34,10 +35,10 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
-								echo "<div class=\"container-" . $facetsDirection . "\">\n";
+							if ($html = get_element_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
+								echo "<div id=\"facets-field-" . $element->id . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo $html;
+								echo $html . "\n";
 								echo "</div>\n";
 							}
 						}
@@ -47,38 +48,43 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_facet_select('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
-								echo "<div class=\"container-" . $facetsDirection . "\">\n";
+							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
+								$html = get_element_facet_checkboxes('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);
+							} else {
+								$html = get_element_facet_select('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''));
+							}
+							if ($html != '') {
+								echo "<div id=\"facets-field-" . $element->id . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo $html;
+								echo $html . "\n";
 								echo "</div>\n";
-							}
+							}								
 						}
 					}
 
 					if ((bool)get_option('facets_item_types_active')) {
 						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'))) {
-							echo "<div class=\"container-" . $facetsDirection . "\">\n";
+							echo "<div id=\"facets-field-item-type\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
-							echo $html;
+							echo $html . "\n";
 							echo "</div>\n";
 						}
 					}
 
 					if ((bool)get_option('facets_collections_active')) {
 						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'))) {
-							echo "<div class=\"container-" . $facetsDirection . "\">\n";
+							echo "<div id=\"facets-field-collection\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
-							echo $html;
+							echo $html . "\n";
 							echo "</div>\n";
 						}
 					}
 
 					if ((bool)get_option('facets_tags_active')) {
 						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'))) {
-							echo "<div class=\"container-" . $facetsDirection . "\">\n";
+							echo "<div id=\"facets-field-tag\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
-							echo $html;
+							echo $html . "\n";
 							echo "</div>\n";
 						}
 					}
@@ -87,34 +93,3 @@
 		</form>
 	</div>
 </div>
-<script type="text/javascript">
-	// force block collapsible if screen size small
-	jQuery(window).on('load', function() {
-		if (jQuery(window).width() < 768) {
-			jQuery('#facets-title').addClass('facets-collapsed');
-			jQuery('#facets-body').addClass('hidden');
-		}
-	});
-	// hides facets block (but for title) on load
-	jQuery('#facets-body').next().addClass('hidden');
-	// submit results of refining search to reload the page
-	window.jQuery(document).ready(function() {
-		window.jQuery('select').change(function() {
-			var option = window.jQuery(this).find('option:selected');
-			if (typeof(option.data('url')) !== 'undefined') window.location.href = option.data('url');
-		});
-	});
-	// collapse/expands facets block
-	jQuery('#facets-title').click(function () {
-		$header = jQuery(this);
-		if (!$header.hasClass('facets-collapsible') && !$header.hasClass('facets-collapsed')) return;
-		//getting the next element
-		$content = $header.next();
-		//open up the content needed - toggle the slide- if visible, slide up, if not slidedown.
-		$content.slideToggle(300, function () {
-			//execute this after slideToggle is done
-			//change icon of header based on visibility of content div
-			$header.toggleClass('facets-collapsible facets-collapsed');
-		});
-	});
-</script>

From 59f00d583ae87641f81c20219f1b002d4ec18351 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 18:20:16 +0200
Subject: [PATCH 105/161] Added checkbox style options

---
 FacetsPlugin.php | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index da8617c..7ff576d 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -5,6 +5,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @package FacetsPlugin
  */
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
 
 define('FACETS_PLUGIN_DIR', dirname(__FILE__));
 define('FACETS_MINIMUM_AMOUNT', 5);
@@ -34,20 +37,25 @@ public function hookInstall()
 		set_option('facets_public_hook', 'default');
 		set_option('facets_description', '');
 		set_option('facets_hide_single_entries', 0);
-		set_option('facets_collapsible', 0);
 		set_option('facets_direction', 'vertical');
+		set_option('facets_collapsible', 0);
+		set_option('facets_checkbox_minimum_amount', FACETS_MINIMUM_AMOUNT);
 
 		$defaults = array(
-			'elements' => array('item', 'collection', 'sort', 'popularity')
+			'elements' => array('item', 'collection', 'type', 'sort', 'popularity')
 		);
 		set_option('facets_elements', json_encode($defaults));
+
 		set_option('facets_item_types_active', 0);
+		set_option('facets_item_types_style', '');
 		set_option('facets_item_types_sort', '');
 		set_option('facets_item_types_popularity', 0);
 		set_option('facets_collections_active', 1);
+		set_option('facets_collections_style', '');
 		set_option('facets_collections_sort', 'count_alpha');
 		set_option('facets_collections_popularity', 1);
 		set_option('facets_tags_active', 0);
+		set_option('facets_tags_style', '');
 		set_option('facets_tags_sort', '');
 		set_option('facets_tags_popularity', 0);
 	}
@@ -60,16 +68,20 @@ public function hookUninstall()
 		delete_option('facets_public_hook');
 		delete_option('facets_description');
 		delete_option('facets_hide_single_entries');
-		delete_option('facets_collapsible');
 		delete_option('facets_direction');
+		delete_option('facets_collapsible');
+		delete_option('facets_checkbox_minimum_amount');
 		delete_option('facets_elements');
 		delete_option('facets_item_types_active');
+		delete_option('facets_item_types_style');
 		delete_option('facets_item_types_sort');
 		delete_option('facets_item_types_popularity');
 		delete_option('facets_collections_active');
+		delete_option('facets_collections_style');
 		delete_option('facets_collections_sort');
 		delete_option('facets_collections_popularity');
 		delete_option('facets_tags_active');
+		delete_option('facets_tags_style');
 		delete_option('facets_tags_sort');
 		delete_option('facets_tags_popularity');
 	}
@@ -114,8 +126,9 @@ public function hookConfig($args)
 		set_option('facets_public_hook', $post['facets_public_hook']);
 		set_option('facets_description', $post['facets_description']);
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
-		set_option('facets_collapsible', $post['facets_collapsible']);
 		set_option('facets_direction', $post['facets_direction']);
+		set_option('facets_collapsible', $post['facets_collapsible']);
+		set_option('facets_checkbox_minimum_amount', $post['facets_checkbox_minimum_amount']);
 
 		$settings = array(
 			'elements' => isset($post['elements']) ? $post['elements'] : array()
@@ -123,12 +136,15 @@ public function hookConfig($args)
 		set_option('facets_elements', json_encode($settings));
 
 		set_option('facets_item_types_active', $post['facets_item_types_active']);
+		set_option('facets_item_types_style', $post['facets_item_types_style']);
 		set_option('facets_item_types_sort', $post['facets_item_types_sort']);
 		set_option('facets_item_types_popularity', $post['facets_item_types_popularity']);
 		set_option('facets_collections_active', $post['facets_collections_active']);
+		set_option('facets_collections_style', $post['facets_collections_style']);
 		set_option('facets_collections_sort', $post['facets_collections_sort']);
 		set_option('facets_collections_popularity', $post['facets_collections_popularity']);
 		set_option('facets_tags_active', $post['facets_tags_active']);
+		set_option('facets_tags_style', $post['facets_tags_style']);
 		set_option('facets_tags_sort', $post['facets_tags_sort']);
 		set_option('facets_tags_popularity', $post['facets_tags_popularity']);
 	}
@@ -245,6 +261,13 @@ public function hookPublicHead($args)
 		$action = $request->getActionName();
 		
 		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
+			$language = array(
+				'ShowMore' => __('show more'),
+				'ShowLess' => __('show less')
+			);
+			$language = json_encode($language);
+			queue_js_string("facetsLanguage = {language: $language};");
+			queue_js_file('facets');
 			queue_css_file('facets');
 		}
 	}

From 8f5ca2d4592fc69dff93c2e4d8e40e9b0c2cea57 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 17 Jul 2021 19:49:50 +0200
Subject: [PATCH 106/161] Update facets.css

---
 views/public/css/facets.css | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index b4abb86..02ad830 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -44,19 +44,21 @@
 
 .facets-container-vertical {
 	/* max-width: 350px; */
+	clear: both;
 }
 
-.facets-container-vertical:not(:last-child) {
-	padding-bottom: 20px;
+.facets-container-vertical:not(:last-child), .facets-container-horizontal:not(:last-child) {
+	margin-bottom: 20px;
 }
 
 .facets-container-horizontal {
 	max-width: 350px;
+	clear: both;
 	display: inline-block;
 }
 
-.facets-container-horizontal:not(:last-child) {
-	padding-bottom: 20px;
+.facets-container-vertical label, .facets-container-horizontal label {
+	font-weight: bold;
 }
 
 .flex {
@@ -122,6 +124,11 @@
 .facet-visibility-toggle {
 	float: right;
 	cursor: pointer;
+	line-height: 90%;
+}
+
+.facet-visibility-toggle:hover {
+	font-weight: normal!important;
 }
 
 .facet-checkbox-count {

From cc3f79afb97ba3f667a0ffc5c5d38c569dfad002 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 10:35:35 +0200
Subject: [PATCH 107/161] Modified code for new style option

---
 config_form.php | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/config_form.php b/config_form.php
index 0521a0e..a4f5b82 100644
--- a/config_form.php
+++ b/config_form.php
@@ -219,15 +219,15 @@
 					</td>
 					<td class="boxes">
 						<?php 
-							$type = (isset($settings['facets_item_types_style']) ? $settings['facets_item_types_style'] : '');
 							echo $view->formSelect(
-							"facets_item_types_style",
-							$type,
-							array(),
-							array(
-								'dropdown' => __('Dropdown'),
-								'checkbox' => __('Checkbox')
-							)); 
+								"facets_item_types_style",
+								get_option('facets_item_types_style'),
+								array(),
+								array(
+									'dropdown' => __('Dropdown'),
+									'checkbox' => __('Checkbox')
+								)
+							); 
 						?>
 					</td>
 					<td class="boxes">
@@ -274,15 +274,15 @@
 					</td>
 					<td class="boxes">
 						<?php 
-							$type = (isset($settings['facets_collections_style']) ? $settings['facets_collections_style'] : '');
 							echo $view->formSelect(
-							"facets_collections_style",
-							$type,
-							array(),
-							array(
-								'dropdown' => __('Dropdown'),
-								'checkbox' => __('Checkbox')
-							)); 
+								"facets_collections_style",
+								get_option('facets_collections_style'),
+								array(),
+								array(
+									'dropdown' => __('Dropdown'),
+									'checkbox' => __('Checkbox')
+								)
+							); 
 						?>
 					</td>
 					<td class="boxes">
@@ -329,15 +329,15 @@
 					</td>
 					<td class="boxes">
 						<?php 
-							$type = (isset($settings['facets_tags_style']) ? $settings['facets_tags_style'] : '');
 							echo $view->formSelect(
-							"facets_tags_style",
-							$type,
-							array(),
-							array(
-								'dropdown' => __('Dropdown'),
-								'checkbox' => __('Checkbox')
-							)); 
+								"facets_tags_style",
+								get_option('facets_tags_style'),
+								array(),
+								array(
+									'dropdown' => __('Dropdown'),
+									'checkbox' => __('Checkbox')
+								)
+							); 
 						?>
 					</td>
 					<td class="boxes">

From 3100647593ccd207e3e30814843107a0f97876b7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 10:46:29 +0200
Subject: [PATCH 108/161] Sligtly modified appearance

---
 views/public/css/facets.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index 02ad830..f74ea92 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -95,7 +95,7 @@
 }
 
 #facets-container form {
-	padding: 20px 10px;
+	padding: 10px 10px 20px 10px;
 }
 
 #facets-container form label {
@@ -121,6 +121,10 @@
 	font-size: 90%;
 }
 
+.facet-checkbox {
+	clear: both;
+}
+
 .facet-visibility-toggle {
 	float: right;
 	cursor: pointer;

From ea16d1cf28ce7a9f6932eb60672e099ee36b0ade Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 12:03:20 +0200
Subject: [PATCH 109/161] Tidied up indentation

---
 config_form.php | 90 +++++++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/config_form.php b/config_form.php
index a4f5b82..3372508 100644
--- a/config_form.php
+++ b/config_form.php
@@ -165,37 +165,41 @@
 						<?php 
 							$type = (isset($settings['elements'][$element->name]['type']) ? $settings['elements'][$element->name]['type'] : '');
 							echo $view->formSelect(
-							"elements[{$element->name}][type]",
-							$type,
-							array(),
-							array(
-								'dropdown' => __('Dropdown'),
-								'checkbox' => __('Checkbox')
-							)); 
+								"elements[{$element->name}][type]",
+								$type,
+								array(),
+								array(
+									'dropdown' => __('Dropdown'),
+									'checkbox' => __('Checkbox')
+								)
+							); 
 						?>
 					</td>
 					<td class="boxes">
 						<?php 
 							$sortOrder = (isset($settings['elements'][$element->name]['sort']) ? $settings['elements'][$element->name]['sort'] : '');
 							echo $view->formSelect(
-							"elements[{$element->name}][sort]",
-							$sortOrder,
-							array(),
-							array(
-								'alpha' => __('Alphabetical'),
-								'count_alpha' => __('Popularity first, then alphabetical')
-							)); 
+								"elements[{$element->name}][sort]",
+								$sortOrder,
+								array(),
+								array(
+									'alpha' => __('Alphabetical'),
+									'count_alpha' => __('Popularity first, then alphabetical')
+								)
+							); 
 						?>
 					</td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"elements[{$element->name}][popularity]",
-							'1', 
-							array(
-								'disableHidden' => true,
-								'checked' => isset($settings['elements'][$element->name]['popularity'])
-							)
-						); ?>
+						<?php 
+							echo $view->formCheckbox(
+								"elements[{$element->name}][popularity]",
+								'1', 
+								array(
+									'disableHidden' => true,
+									'checked' => isset($settings['elements'][$element->name]['popularity'])
+								)
+							); 
+						?>
 					</td>
 				</tr>
 			<?php endforeach; ?>
@@ -207,12 +211,14 @@
 				<tr>
 					<td><?php echo __('Item Types'); ?></td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"facets_item_types_active",
-							get_option('facets_item_types_popularity'), 
-							null, 
-							array('1', '0')
-						); ?>
+						<?php 
+							echo $view->formCheckbox(
+								"facets_item_types_active",
+								get_option('facets_item_types_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
 					</td>
 					<td class="boxes">
 						&nbsp
@@ -262,12 +268,14 @@
 				<tr>
 					<td><?php echo __('Collections'); ?></td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"facets_collections_active",
-							get_option('facets_collections_popularity'), 
-							null, 
-							array('1', '0')
-						); ?>
+						<?php 
+							echo $view->formCheckbox(
+								"facets_collections_active",
+								get_option('facets_collections_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
 					</td>
 					<td class="boxes">
 						&nbsp
@@ -317,12 +325,14 @@
 				<tr>
 					<td><?php echo __('Tags'); ?></td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"facets_tags_active",
-							get_option('facets_tags_popularity'), 
-							null, 
-							array('1', '0')
-						); ?>
+						<?php 
+							echo $view->formCheckbox(
+								"facets_tags_active",
+								get_option('facets_tags_popularity'), 
+								null, 
+								array('1', '0')
+							); 
+						?>
 					</td>
 					<td class="boxes">
 						&nbsp

From 9ff53f268cd0422fae2f792865014c6b892bf0fb Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 12:47:32 +0200
Subject: [PATCH 110/161] Added checkbox option to collections, tags and item
 types

---
 views/public/facets/browse.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index fad7a38..2f62173 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -35,7 +35,12 @@
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
 							$isDate = in_array($element->name, array('Date'));
 							$facetElement = $facetsElements['elements'][$element->name];
-							if ($html = get_element_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''))) {
+							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
+								$html = get_element_facet_checkboxes('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);
+							} else {
+								$html = get_element_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''));
+							}
+							if ($html != '') {
 								echo "<div id=\"facets-field-" . $element->id . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
 								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
 								echo $html . "\n";
@@ -63,7 +68,12 @@
 					}
 
 					if ((bool)get_option('facets_item_types_active')) {
-						if ($html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'))) {
+						if (get_option('facets_item_types_style') == 'checkbox') {
+							$html = get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'), $checkboxMinCount);
+						} else {
+							$html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'));
+						}
+						if ($html != '') {
 							echo "<div id=\"facets-field-item-type\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
 							echo $html . "\n";
@@ -72,7 +82,12 @@
 					}
 
 					if ((bool)get_option('facets_collections_active')) {
-						if ($html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'))) {
+						if (get_option('facets_collections_style') == 'checkbox') {
+							$html = get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'), $checkboxMinCount);
+						} else {
+							$html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'));
+						}
+						if ($html != '') {
 							echo "<div id=\"facets-field-collection\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
 							echo $html . "\n";
@@ -81,7 +96,12 @@
 					}
 
 					if ((bool)get_option('facets_tags_active')) {
-						if ($html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'))) {
+						if (get_option('facets_item_types_style') == 'checkbox') {
+							$html = get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'), $checkboxMinCount);
+						} else {
+							$html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'));
+						}
+						if ($html != '') {
 							echo "<div id=\"facets-field-tag\" class=\"facets-container-" . $facetsDirection . "\">\n";
 							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
 							echo $html . "\n";

From 1f2a3e17ecd680c8ea25f3dd168e8e14ed09a932 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 13:42:00 +0200
Subject: [PATCH 111/161] Fixed typos

---
 config_form.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config_form.php b/config_form.php
index 3372508..2b36998 100644
--- a/config_form.php
+++ b/config_form.php
@@ -214,7 +214,7 @@
 						<?php 
 							echo $view->formCheckbox(
 								"facets_item_types_active",
-								get_option('facets_item_types_popularity'), 
+								get_option('facets_item_types_active'), 
 								null, 
 								array('1', '0')
 							); 
@@ -271,7 +271,7 @@
 						<?php 
 							echo $view->formCheckbox(
 								"facets_collections_active",
-								get_option('facets_collections_popularity'), 
+								get_option('facets_collections_active'), 
 								null, 
 								array('1', '0')
 							); 
@@ -328,7 +328,7 @@
 						<?php 
 							echo $view->formCheckbox(
 								"facets_tags_active",
-								get_option('facets_tags_popularity'), 
+								get_option('facets_tags_active'), 
 								null, 
 								array('1', '0')
 							); 

From 66e82b0a2ba50ebb7e0075eac000c2c20a54a37b Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 13:48:09 +0200
Subject: [PATCH 112/161] Corrected typo

---
 views/public/facets/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 2f62173..09f86a0 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -96,7 +96,7 @@
 					}
 
 					if ((bool)get_option('facets_tags_active')) {
-						if (get_option('facets_item_types_style') == 'checkbox') {
+						if (get_option('facets_tags_style') == 'checkbox') {
 							$html = get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'), $checkboxMinCount);
 						} else {
 							$html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'));

From 9fb0e1e7b438b2724675336c4aa970c8016fd86c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:01:46 +0200
Subject: [PATCH 113/161] Fixed function

---
 views/public/javascripts/facets.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/public/javascripts/facets.js b/views/public/javascripts/facets.js
index 96b1cf2..4e23fb2 100644
--- a/views/public/javascripts/facets.js
+++ b/views/public/javascripts/facets.js
@@ -50,5 +50,7 @@ jQuery(window).on('load', function() {
 	}
 
 	// hides facets block (but for title) on load
-	jQuery('#facets-body').next().addClass('hidden');
+	if (jQuery('#facets-title').hasClass('facets-collapsed')) {
+		jQuery('#facets-body').addClass('hidden');
+	}
 });

From f13195bcfc79dc678e1f9539a4119b35656fc6b2 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:02:35 +0200
Subject: [PATCH 114/161] Chanced initial collapsed status

---
 views/public/facets/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 09f86a0..22a4a6b 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -20,7 +20,7 @@
 ?>
 
 <div id="facets-container" class="<?php echo "facets-layout-" . $facetsDirection; ?>">
-	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsible\""; ?>><?php echo html_escape(__('Refine search')) ?></button>
+	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsed\""; ?>><?php echo html_escape(__('Refine search')) ?></button>
 	<div id="facets-body">
 		<?php 
 			if ($description = get_option('facets_description')) {

From 1d483bbc6a67920e76ed8c08230377fedeb3437c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:04:26 +0200
Subject: [PATCH 115/161] Added internationalization to js strings

---
 FacetsPlugin.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 7ff576d..969d901 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -5,12 +5,11 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @package FacetsPlugin
  */
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);
 
 define('FACETS_PLUGIN_DIR', dirname(__FILE__));
 define('FACETS_MINIMUM_AMOUNT', 5);
+define('FACETS_SHOW_MORE', __('show more'));
+define('FACETS_SHOW_LESS', __('show less'));
 
 require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
 
@@ -262,8 +261,8 @@ public function hookPublicHead($args)
 		
 		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
 			$language = array(
-				'ShowMore' => __('show more'),
-				'ShowLess' => __('show less')
+				'ShowMore' => FACETS_SHOW_MORE,
+				'ShowLess' => FACETS_SHOW_LESS
 			);
 			$language = json_encode($language);
 			queue_js_string("facetsLanguage = {language: $language};");

From ba6f890fa46edf394b2694ba9bb502c7f8311075 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:05:11 +0200
Subject: [PATCH 116/161] Added checkbox style

---
 helpers/FacetsFunctions.php | 654 +++++++++++++++++++++++++++++-------
 1 file changed, 529 insertions(+), 125 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 24132ed..f5b76a7 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -2,19 +2,14 @@
 	/**
 	 * Helper to display a Facets Block
 	 */
-	// class Facets_View_Helper_Facets extends Zend_View_Helper_Abstract
-	// {
 
 	/**
-	 * Return HTML Select associated with Array of facets tag values.
+	 * Return list of objects associated to collection.
 	 *
-	 * @param itemsArray
-	 * @param hideSingleEntries
-	 * @param sortOrder
-	 * @param showPopularity
-	 * @return html.
+	 * @param subsetSQL
+	 * @return objects
 	 */
-	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function get_objects_for_tags($subsetSQL, $sortOrder) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -24,7 +19,7 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 		} else {
 			$orderBy = array('name ASC');
 		}
-
+		
 		// Get the database.
 		$db = get_db();
 		// Get the table.
@@ -34,22 +29,30 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 		$table->filterByTagType($select, 'Item');
 		$select->where($whereSubset);
 		$select->order($orderBy);
+		
+		return $table->fetchObjects($select);
+	}
 
-		if ($tags = $table->fetchObjects($select)) {
+	/**
+	 * Return HTML Select associated with Array of facets tag values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($tags = get_objects_for_tags($subsetSQL, $sortOrder)) {
 			// Build array
-			$facetTags = array();
-			foreach ($tags as $tag) {
-				$facetTags[$tag->id]['id'] = $tag->id;
-				$facetTags[$tag->id]['name'] = $tag->name;
-				$facetTags[$tag->id]['count'] = $tag->tagCount;
-			}
+			$facetTags = buildTagsArray($tags);
 			
 			// Stores data for selected tag, if any
 			$selectedTagName = (isset($_GET['tags']) ? $_GET['tags'] : '');
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetTags, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
-				$facetTags = array_filter($facetTags, "isNotSingleEntry");
+			if ($hideSingleEntries && count(array_filter($facetTags, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetTags = array_filter($facetTags, "isNotSingleExtra");
 			}			
 
 			$addOptions = false;
@@ -77,20 +80,81 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 
 		return $html;
 	}
-	
+
 	/**
-	 * Return HTML Select associated with Array of facets collection values.
+	 * Return HTML Checkboxes associated with Array of facets tag values.
 	 *
-	 * @param itemsArray
+	 * @param subsetSQL
 	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($tags = get_objects_for_tags($subsetSQL, $sortOrder)) {
+			// Build array
+			$facetTags = buildTagsArray($tags);
+			
+			// Stores data for selected tags, if any
+			$selectedTags = (isset($_GET['tags']) ? $_GET['tags'] : '');
+			$selectedTagNames = explode(option('tag_delimiter'), $selectedTags);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetTags, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetTags = array_filter($facetTags, "isNotSingleExtra");
+			}			
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if ($selectedTags != '') {
+				$selectedTagNames = explode(option('tag_delimiter'), $selectedTags);
+				foreach ($selectedTagNames as $selectedTagName) {
+					$url = getTagUrl($selectedTagName);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedTagName) . "</b></div>";
+					$countCheckboxes++;
+				}
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetTags as $tag) {
+				if (!in_array($tag['name'], $selectedTagNames)) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-tags\">";
+						$hidingSeparator = true;
+					}
+					
+					$url = getTagUrl($tag['name']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $tag['name'] . "\" data-url=\"" . $url . "\">" . html_escape($tag['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $tag['count'] . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-tags\" class=\"facet-visibility-toggle\" data-element-id=\"tags\">" . FACETS_SHOW_MORE . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+	
+	/**
+	 * Return list of objects associated to collection.
+	 *
+	 * @param subsetSQL
+	 * @return objects
+	 */
+	function get_objects_for_collection($subsetSQL) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
-
+		
 		// Get the database.
 		$db = get_db();
 		// Get the table.
@@ -102,35 +166,33 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 			->where($whereSubset)
 			->group('collections.id');
 
-		if ($collections = $table->fetchObjects($select)) {
+		return $table->fetchObjects($select);
+	}
+
+	/**
+	 * Return HTML Select associated with Array of facets collection values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($collections = get_objects_for_collection($subsetSQL, $sortOrder)) {
 			// Build array
-			$facetCollections = array();
-			foreach ($collections as $collection) {
-				$facetCollections[$collection->id]['id'] = $collection->id;
-				$facetCollections[$collection->id]['name'] = $collection->getDisplayTitle();
-				$facetCollections[$collection->id]['count'] = $collection->count;
-			}
+			$facetCollections = buildCollectionsArray($collections);
 			
-			// Stores data for selected collection, if any
-			if (isset($_GET['collection'])) {
-				if ($collection_id = $_GET['collection']) {
-					if (array_key_exists($collection_id, $facetCollections)) {
-						$selectedCollection = $facetCollections[$collection_id];
-					}
-				}
-			}
+			// Store data for selected collection, if any
+			$selectedCollection = getSelectedCollection($facetCollections);
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetCollections, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
-				$facetCollections = array_filter($facetCollections, "isNotSingleEntry");
+			if ($hideSingleEntries && count(array_filter($facetCollections, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetCollections = array_filter($facetCollections, "isNotSingleExtra");
 			}			
 
 			// Sort array (have to do it now instead than in select because of the way we get the Collection name)
-			if ($sortOrder == 'count_alpha') {
-				array_multisort(array_column($facetCollections, 'count'), SORT_DESC, array_column($facetCollections, 'name'), SORT_ASC, $facetCollections);
-			} else {
-				array_multisort(array_column($facetCollections, 'name'), SORT_ASC, $facetCollections);
-			}
+			$facetCollections = sortCollections($facetCollections, $sortOrder);
 
 			$addOptions = false;
 			// Build first part of the select tag
@@ -159,15 +221,77 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 	}
 
 	/**
-	 * Return HTML Select associated with Array of facets item type values.
+	 * Return HTML Checkboxes associated with Array of facets values.
 	 *
-	 * @param itemsArray
+	 * @param subsetSQL
 	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @return html.
+	 * @param limitCheckboxes
+	 * @return html
 	 */
-	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($collections = get_objects_for_collection($subsetSQL, $sortOrder)) {
+			// Build array
+			$facetCollections = buildCollectionsArray($collections);
+			
+			// Store data for selected collection, if any
+			$selectedCollection = getSelectedCollection($facetCollections);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetCollections, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetCollections = array_filter($facetCollections, "isNotSingleExtra");
+			}			
+
+			// Sort array (have to do it now instead than in select because of the way we get the Collection's name)
+			$facetCollections = sortCollections($facetCollections, $sortOrder);
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if (isset($selectedCollection)) {
+				$url = getFieldUrl('collection', null, $selectedCollection);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedCollection['name']) . "</b></div>";
+				$countCheckboxes++;
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetCollections as $collection) {
+				if ($collection != $selectedCollection) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-collections\">";
+						$hidingSeparator = true;
+					}
+					
+					$url = getFieldUrl('collection', $collection['id']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $collection['name'] . "\" data-url=\"" . $url . "\">" . html_escape($collection['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $collection['count'] . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-collections\" class=\"facet-visibility-toggle\" data-element-id=\"collections\">" . FACETS_SHOW_MORE . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Return list of objects associated to collection.
+	 *
+	 * @param subsetSQL
+	 * @param sortOrder
+	 * @return objects
+	 */
+	function get_objects_for_item_type($subsetSQL, $sortOrder) {
 		// Create Where Subset clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -177,7 +301,7 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 		} else {
 			$orderBy = array('name ASC');
 		}
-
+		
 		// Get the database.
 		$db = get_db();
 		// Get the table.
@@ -189,33 +313,35 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 			->where($whereSubset)
 			->group('item_types.id')
 			->order($orderBy);
+			
+		return $table->fetchObjects($select);
+	}
 
-		if ($itemTypes = $table->fetchObjects($select)) {
+	/**
+	 * Return HTML Select associated with Array of facets item type values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($itemTypes = get_objects_for_item_type($subsetSQL, $sortOrder)) {
 			// Build array
-			$facetItemTypes = array();
-			foreach ($itemTypes as $itemType) {
-				$facetItemTypes[$itemType->id]['id'] = $itemType->id;
-				$facetItemTypes[$itemType->id]['name'] = $itemType->name;
-				$facetItemTypes[$itemType->id]['count'] = $itemType->count;
-			}
-			
-			// Stores data for selected item type, if any
-			if (isset($_GET['type'])) {
-				if ($itemType_id = $_GET['type']) {
-					if (array_key_exists($itemType_id, $facetItemTypes)) {
-						$selectedItemType = $facetItemTypes[$itemType_id];
-					}
-				}
-			}
+			$facetItemTypes = buildItemTypesArray($itemTypes);
+					
+			// Store data for selected item type, if any
+			$selectedItemType = getSelectedItemType($facetItemTypes);
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
-				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleEntry");
+			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleExtra");
 			}			
 
 			$addOptions = false;
 			// Build first part of the select tag
-			if (isset($selectedItemType)) {
+			if (!empty($selectedItemType)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"type\">";
 				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedItemType['name'] . "</option>";
@@ -238,85 +364,163 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 
 		return $html;
 	}
+
+	/**
+	 * Return HTML Checkboxes associated with Array of facets item type values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($itemTypes = get_objects_for_item_type($subsetSQL, $sortOrder)) {
+			// Build array
+			$facetItemTypes = buildItemTypesArray($itemTypes);
+					
+			// Store data for selected item type, if any
+			$selectedItemType = getSelectedItemType($facetItemTypes);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleExtra");
+			}			
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if (isset($selectedItemType)) {
+				$url = getFieldUrl('type', null, $selectedItemType);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedItemType['name']) . "</b></div>";
+				$countCheckboxes++;
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetItemTypes as $itemType) {
+				if ($itemType != $selectedItemType) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-item-types\">";
+						$hidingSeparator = true;
+					}
+					
+					$url = getFieldUrl('type', $itemType['id']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $itemType['name'] . "\" data-url=\"" . $url . "\">" . html_escape($itemType['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $itemType['count'] . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-item-types\" class=\"facet-visibility-toggle\" data-element-id=\"item-types\">" . FACETS_SHOW_MORE . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
 	
 	/**
-	 * Return HTML Select associated with Array of facets values.
+	 * Return list of objects associated to element.
 	 *
-	 * @param itemsArray
+	 * @param recordType
+	 * @param subsetSQL
 	 * @param elementId
 	 * @param isDate
-	 * @param hideSingleEntries
 	 * @param sortOrder
-	 * @param showPopularity
-	 * @return html
+	 * @return objects
 	 */
-	function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder) {
 		// Create Where clauses
 		$whereRecordType = createWhereRecordTypeClause($recordType);
 		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
-
+		
 		// Create the columns, groupBy and orderBy clauses
 		if ($isDate) {
-			$columns = array('SUBSTR(element_texts.text, 1, 4) AS year', 'COUNT(text) AS count');
-			$groupBy = 'year';
+			$columns1 = array('SUBSTR(element_texts.text, 1, 4) AS year');
+			$columns2 = 'COUNT(year) AS count';
+			$groupBy = array('year', 'record_id');
 			if ($sortOrder == 'count_alpha') {
-				$orderBy = array('count DESC', 'year DESC');
+				$orderBy = 'count DESC, year DESC';
 			} else {
-				$orderBy = array('year DESC');
+				$orderBy = 'year DESC';
 			}
 		} else {
-			$columns = array('COUNT(text) AS count');
-			$groupBy = 'text';
+			$columns1 = '';
+			$columns2 = 'COUNT(text) AS count';
+			$groupBy = array('text', 'record_id');
 			if ($sortOrder == 'count_alpha') {
-				$orderBy = array('count DESC', 'text ASC');
+				$orderBy = 'count DESC, text ASC';
 			} else {
-				$orderBy = array('text ASC');
+				$orderBy = 'text ASC';
 			}
-		}
+		}	
 
 		// Get the database.
 		$db = get_db();
 		// Get the table.
 		$table = $db->getTable('ElementText');
 		// Build the select query.
-		$select = $table->getSelect();
-		$select->columns($columns);
-		$select->joinInner(array('elements' => $db->Elements), 'element_texts.element_id = elements.id', array());
-		$select->joinInner(array('element_sets' => $db->ElementSet), 'element_sets.id = elements.element_set_id', array());
+		$subQuery = $table->getSelect();
+		$subQuery->columns($columns1);
+		$subQuery->joinInner(array('elements' => $db->Elements), 'element_texts.element_id = elements.id', array());
+		$subQuery->joinInner(array('element_sets' => $db->ElementSet), 'element_sets.id = elements.element_set_id', array());
 		if ($recordType == 'item') {
-			$select->joinInner(array('items' => $db->Item), 'items.id = element_texts.record_id', array());
+			$subQuery->joinInner(array('items' => $db->Item), 'items.id = element_texts.record_id', array());
 		} else {
-			$select->joinInner(array('collections' => $db->Collection), 'collections.id = element_texts.record_id', array());
+			$subQuery->joinInner(array('collections' => $db->Collection), 'collections.id = element_texts.record_id', array());
 		}
-		$select->where('elements.id = '. $elementId);
-		$select->where($whereRecordType);
-		$select->where($whereSubset);
-		$select->group($groupBy);
-		$select->order($orderBy);
+		$subQuery->where('elements.id = '. $elementId);
+		$subQuery->where($whereRecordType);
+		$subQuery->where($whereSubset);
+		$subQuery->group($groupBy);
+		
+		$select = "SELECT *, " . $columns2 . " FROM (" . $subQuery . ") foo GROUP BY `text` ORDER BY " . $orderBy;
+
+		return $table->fetchObjects($select);
+	}
 
+	/**
+	 * Return HTML Select associated with Array of facets values.
+	 *
+	 * @param recordType
+	 * @param subsetSQL
+	 * @param elementId
+	 * @param isDate
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html
+	 */
+	function get_element_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Build array
-		if ($elements = $table->fetchObjects($select)) {
-			$facet = array();
+		if ($elements = get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
+			$facetElement = array();
 			foreach ($elements as $element) {
 				if ($isDate) {
-					$facet[$element->year] = $element->count;
+					$facetElement[$element->year] = $element->count;
 				} else {
-					$facet[$element->text] = $element->count;
+					$facetElement[$element->text] = $element->count;
 				}
 			}
 			$element_id = $element->element_id;
 
 			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facet, 'excludeSingleValues')) > FACETS_MINIMUM_AMOUNT) {
-				$facet = array_filter($facet, "isNotSingleEntry");
+			if ($hideSingleEntries && count(array_filter($facetElement, 'isNotSingleElement')) > FACETS_MINIMUM_AMOUNT) {
+				$facetElement = array_filter($facetElement, "isNotSingleElement");
 			}			
 
 			// Get current parameters to check if one is selected
 			if (!empty($_GET['advanced'])) {
 				$search = $_GET['advanced'];
-				foreach ($search as $Searchindex => $SearchArray){
-					if (isset($SearchArray['element_id']) && $SearchArray['element_id'] == $element_id) {
-						$term = $SearchArray['terms'];
+				foreach ($search as $searchIndex => $searchArray){
+					if (isset($searchArray['element_id']) && $searchArray['element_id'] == $element_id) {
+						$term = $searchArray['terms'];
 						break;
 					}
 				}
@@ -329,7 +533,7 @@ function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = fa
 				$url = getElementFieldUrl($element_id, null, $isDate);
 				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">$term</option>";
-			} elseif (count($facet) > 0) {
+			} elseif (count($facetElement) > 0) {
 				$html =	"<div class=\"select-arrow\"><select id=\"" . $element_id . "\" class=\"facet\" name=\"" . $elementId . "\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
 				$addOptions = true;
@@ -337,7 +541,7 @@ function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = fa
 
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
-				foreach ($facet as $name => $count) {
+				foreach ($facetElement as $name => $count) {
 					$url = getElementFieldUrl($element_id, $name, $isDate);
 					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
@@ -349,23 +553,118 @@ function get_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = fa
 
 		return $html;
 	}
+	
+	/**
+	 * Return HTML Checkboxes associated with Array of facets values.
+	 *
+	 * @param recordType
+	 * @param subsetSQL
+	 * @param elementId
+	 * @param isDate
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @param limitCheckboxes
+	 * @return html
+	 */
+	function get_element_facet_checkboxes($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		// Build array
+		if ($elements = get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
+			$facetElement = array();
+			foreach ($elements as $element) {
+				if ($isDate) {
+					$facetElement[$element->year] = $element->count;
+				} else {
+					$facetElement[$element->text] = $element->count;
+				}
+			}
+			$element_id = $element->element_id;
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetElement, 'isNotSingleElement')) > FACETS_MINIMUM_AMOUNT) {
+				$facetElement = array_filter($facetElement, "isNotSingleElement");
+			}			
+
+			$selectedTerms = array();
+			// Get current parameters to check if one or more are selected
+			if (!empty($_GET['advanced'])) {
+				$search = $_GET['advanced'];
+				foreach ($search as $searchIndex => $searchArray){
+					if (isset($searchArray['element_id']) && $searchArray['element_id'] == $element_id) {
+						$selectedTerms[] = $searchArray['terms'];
+					}
+				}
+			}
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if (!empty($selectedTerms)) {
+				foreach ($selectedTerms as $term){
+					$url = getElementFieldUrl($element_id, null, $isDate, $term);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($term) . "</b></div>";
+					$countCheckboxes++;
+				}
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetElement as $name => $count) {
+				if (!in_array($name, $selectedTerms)) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-" . $elementId . "\">";
+						$hidingSeparator = true;
+					}
+					
+					$url = getElementFieldUrl($element_id, $name, $isDate);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $name . "\" data-url=\"" . $url . "\">" . html_escape($name) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-" . $elementId . "\" class=\"facet-visibility-toggle\" data-element-id=\"" . $elementId . "\">" . FACETS_SHOW_MORE . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
 
 	/**
 	 * Add an Element Field to Search to the current URL.
 	 *
-	 * @param string $field The Element id.
+	 * @param string $field_id The Element id.
 	 * @param string $value The Element value.
+	 * @param string $isDate 
 	 * @return string The new URL.
 	 */
-	function getElementFieldUrl($field_id, $value = null, $isDate = false)
+	function getElementFieldUrl($field_id, $value = null, $isDate = false, $oldValue = null)
 	{
 		// Get the current facets.
 		if (!empty($_GET['advanced'])) {
 			$search = $_GET['advanced'];
-			// unset current element filter if already set
-			foreach ($search as $Searchindex => $SearchArray){
-				if (isset($SearchArray['element_id']) && $SearchArray['element_id'] == $field_id){
-					unset ($search[$Searchindex]);
+			if ($value == '') {
+				if ($oldValue == '') {
+					// unset current element filter(s) if already set
+					foreach ($search as $searchIndex => $searchArray){
+						if (isset($searchArray['element_id']) && $searchArray['element_id'] == $field_id){
+							unset ($search[$searchIndex]);
+						}
+					}
+				} else {
+					// unset current element filter with specific value if already set
+					foreach ($search as $searchIndex => $searchArray){
+						if (isset($searchArray['element_id']) && $searchArray['element_id'] == $field_id && $searchArray['terms'] == $oldValue){
+							unset ($search[$searchIndex]);
+							break;
+						}
+					}
 				}
 			}
 		} else {
@@ -389,7 +688,6 @@ function getElementFieldUrl($field_id, $value = null, $isDate = false)
 		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
 
 		// Rebuild the route.
-		// return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
 		return 'browse?' . http_build_query($params);
 	}
 
@@ -400,7 +698,7 @@ function getElementFieldUrl($field_id, $value = null, $isDate = false)
 	 * @param string $value The Element value.
 	 * @return string The new URL.
 	 */
-	function getFieldUrl($filter, $value = null)
+	function getFieldUrl($filter, $value = null, $oldValue = null)
 	{
 		// Get the current facets.
 		if (!empty($_GET['advanced'])) {
@@ -420,17 +718,66 @@ function getFieldUrl($filter, $value = null)
 		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
 
 		// set(unset) current
-		if(!is_null($value)){
+		if (!is_null($value)){
 			$params[$filter] = $value;
 		} else {
 			unset($params[$filter]);
 		}
 
 		// Rebuild the route.
-		// return $_SERVER['HTTP_HOST'] . "?" . http_build_query($params);
 		return 'browse?' . http_build_query($params);
 	}
 	
+	/**
+	 * Add a Tag Field to Search to the current URL.
+	 *
+	 * @param string $filter The filter field name (tags|tag_id|type|collection).
+	 * @param string $value The Element value.
+	 * @return string The new URL.
+	 */
+	function getTagUrl($value = null)
+	{
+		// Get the current facets.
+		if (!empty($_GET['advanced'])) {
+			$search = $_GET['advanced'];
+		} else {
+			$search = array();
+		}
+		// set previous parameters
+		$params['advanced'] = $search;
+		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
+		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
+		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
+		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
+		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
+		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
+		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
+		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+
+		// set(unset) current
+		if (!is_null($value)) {
+			if (isset($params['tags'])) {
+				$tags = explode(option('tag_delimiter'), $params['tags']);
+				if (in_array($value, $tags)) {
+					$tagToRemove = array($value);
+					$tags = array_diff($tags, $tagToRemove);
+				} else {
+					$tags[] = $value;
+				}
+				$params['tags'] = implode(option('tag_delimiter'), $tags);
+		
+				if (empty($params['tags'])) unset($params['tags']);
+			} else {
+				$params['tags'] = $value;
+			}
+		} else {
+			unset($params['tags']);
+		}
+
+		// Rebuild the route.
+		return 'browse?' . http_build_query($params);
+	}
+
 	function isFacetActive($recordType, $element_name, $settings) {
 		if (isset($settings['elements'][$element_name][$recordType])) {
 			return ((bool)$settings['elements'][$element_name][$recordType]);
@@ -438,8 +785,12 @@ function isFacetActive($recordType, $element_name, $settings) {
 		return false;
 	}
 	
-	function isNotSingleEntry($count) {
-		return ($count != 1);
+	function isNotSingleElement($count) {
+		if ($count > 1) return $count;
+	}
+
+	function isNotSingleExtra($element) {
+		if ($element['count'] > 1) return $element;
 	}
 	
 	function createWhereRecordTypeClause($recordType) {
@@ -454,14 +805,67 @@ function createWhereSubsetClause($recordType, $sql) {
 		}
 	}
 	
-	function excludeSingleValues($element) {
-		if ($element > 1) return $element;
-	}
-	
 	function recordTypeActive($recordType, $elements) {
 		foreach ($elements as $element) {
 			if (array_key_exists($recordType, $element)) return true;
 		}
 		return false;
-	}	
+	}
+	
+	function buildCollectionsArray($collections) {
+		$facetCollections = array();
+		foreach ($collections as $collection) {
+			$facetCollections[$collection->id]['id'] = $collection->id;
+			$facetCollections[$collection->id]['name'] = $collection->getDisplayTitle();
+			$facetCollections[$collection->id]['count'] = $collection->count;
+		}
+		return $facetCollections;
+	}
+	
+	function getSelectedCollection($collections) {
+		if (isset($_GET['collection'])) {
+			$collection_id = $_GET['collection'];
+			if (array_key_exists($collection_id, $collections)) {
+				return $collections[$collection_id];
+			}
+		}
+	}
+	
+	function sortCollections($collections, $sortOrder = 'count_alpha') {
+		if ($sortOrder == 'count_alpha') {
+			array_multisort(array_column($collections, 'count'), SORT_DESC, array_column($collections, 'name'), SORT_ASC, $collections);
+		} else {
+			array_multisort(array_column($collections, 'name'), SORT_ASC, $collections);
+		}
+		return $collections;
+	}
+
+	function buildItemTypesArray($itemTypes) {
+		$facetItemTypes = array();
+		foreach ($itemTypes as $itemType) {
+			$facetItemTypes[$itemType->id]['id'] = $itemType->id;
+			$facetItemTypes[$itemType->id]['name'] = $itemType->name;
+			$facetItemTypes[$itemType->id]['count'] = $itemType->count;
+		}
+		return $facetItemTypes;
+	}
+
+	function getSelectedItemType($itemTypes) {
+		if (isset($_GET['type'])) {
+			$itemType_id = $_GET['type'];
+			if (array_key_exists($itemType_id, $itemTypes)) {
+				return $itemTypes[$itemType_id];
+			}
+		}
+	}
+	
+	function buildTagsArray($tags) {
+		$facetTags = array();
+		foreach ($tags as $tag) {
+			$facetTags[$tag->id]['id'] = $tag->id;
+			$facetTags[$tag->id]['name'] = $tag->name;
+			$facetTags[$tag->id]['count'] = $tag->tagCount;
+		}
+		return $facetTags;
+	}
 ?>

From 6cee805bc730bb870de2cc3575b7101f7b3493e3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:17:36 +0200
Subject: [PATCH 117/161] Update config_form.php

---
 config_form.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/config_form.php b/config_form.php
index 2b36998..95ffc57 100644
--- a/config_form.php
+++ b/config_form.php
@@ -205,7 +205,7 @@
 			<?php endforeach; ?>
 				<tr>
 					<th colspan="6">
-						<strong><?php echo __('Item Types'); ?></strong>
+						<strong><?php echo __('Extra parameters'); ?></strong>
 					</th>
 				</tr>
 				<tr>
@@ -260,11 +260,6 @@
 						?>
 					</td>
 				</tr>				
-				<tr>
-					<th colspan="6">
-						<strong><?php echo __('Collections'); ?></strong>
-					</th>
-				</tr>
 				<tr>
 					<td><?php echo __('Collections'); ?></td>
 					<td class="boxes">
@@ -317,11 +312,6 @@
 						?>
 					</td>
 				</tr>				
-				<tr>
-					<th colspan="6">
-						<strong><?php echo __('Tags'); ?></strong>
-					</th>
-				</tr>
 				<tr>
 					<td><?php echo __('Tags'); ?></td>
 					<td class="boxes">

From 9f94c0f472693cc94b470a7750aa9c79e64c5eb9 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:29:21 +0200
Subject: [PATCH 118/161] Strings updated

---
 languages/eo.mo        | Bin 567 -> 607 bytes
 languages/eo.po        |  78 +++++++++++++++++++----------
 languages/it.mo        | Bin 3637 -> 4243 bytes
 languages/it.po        | 109 ++++++++++++++++++++++++++---------------
 languages/template.pot |  96 +++++++++++++++++++++++-------------
 5 files changed, 184 insertions(+), 99 deletions(-)

diff --git a/languages/eo.mo b/languages/eo.mo
index 89935c25f2ec71e563f07175cb789d904569985d..bdde674e7a4ccdafaf1e4aee0da23da238aede3a 100644
GIT binary patch
delta 57
zcmdnaa-U^_jqFZF28IR(1_nMLwqk<No<N!n$dA|<$;3F>m{E$u&_cn`+{(~wawy{?
E02!$Y761SM

delta 44
rcmcc5vYlmujqF5528IR(1_nML7Gi?Xia?qT$T!#+$;3Fhneh$)r5Oh!

diff --git a/languages/eo.po b/languages/eo.po
index 3f3838b..2f29425 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -10,6 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2021-06-08 13:56-0001\n"
 "PO-Revision-Date: 2021-06-13 15:39-0001\n"
 "PO-Revision-Date: 2021-07-05 15:17-0001\n"
+"PO-Revision-Date: 2021-07-18 17:16-0001\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: eo\n"
@@ -71,11 +72,11 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr ""
 
 #: config_form.php:63
-msgid "Block collapsible"
+msgid "Minimum checkbox count"
 msgstr ""
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
 msgstr ""
 
 #: config_form.php:75
@@ -94,61 +95,88 @@ msgstr ""
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:93
+#: config_form.php:95
+msgid "Block collapsible"
+msgstr ""
+
+#: config_form.php:99
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgstr ""
+
+#: config_form.php:105
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:98
+#: config_form.php:110
 msgid 
-"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to choose the facet style, "
 "Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:115
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:104
+#: config_form.php:116
 msgid "Item"
 msgstr ""
 
-#: config_form.php:105
+#: config_form.php:117
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:106
+#: config_form.php:118
+msgid "Style"
+msgstr ""
+
+#: config_form.php:119
 msgid "Sort order"
 msgstr ""
 
-#: config_form.php:107
+#: config_form.php:120
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:159
-#: config_form.php:201
-#: config_form.php:243
-#: config_form.php:285
+#: config_form.php:172
+#: config_form.php:233
+#: config_form.php:290
+#: config_form.php:347
+msgid "Dropdown"
+msgstr ""
+
+#: config_form.php:173
+#: config_form.php:234
+#: config_form.php:291
+#: config_form.php:348
+msgid "Checkbox"
+msgstr ""
+
+#: config_form.php:186
+#: config_form.php:246
+#: config_form.php:303
+#: config_form.php:360
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:160
-#: config_form.php:202
-#: config_form.php:244
-#: config_form.php:286
+#: config_form.php:187
+#: config_form.php:247
+#: config_form.php:303
+#: config_form.php:361
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:178
-#: config_form.php:182
+#: config_form.php:208
+msgid "Extra parameters"
+msgstr ""
+
+#: config_form.php:212
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:220
-#: config_form.php:224
+#: config_form.php:264
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:262
-#: config_form.php:266
+#: config_form.php:316
 msgid "Tags"
-msgstr ""
+msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index 34248112e3ab81b26d1c5ed67d3b3765c8de6b2b..e2e5c22753877f02ebf7b4ea87f6f907f6ee7abd 100644
GIT binary patch
delta 1173
zcmYMxJ7^R^7zgmVM;=}h$wL#1pc5mKlMpO~6pBGe45&E-1w}2K?9L^lvpeU`ZcHpZ
zTd`5sCxQ{wB4U-0(niomM52}=Y7<CdBZ`HE|8H+|IrjE9GdnxqW0!m5zUtS`{9T4$
zKmNV=@5|7Pv18c{TQQu#yb+#(9Z*18x3C#rg9UgUw!k~7PtxZvA?;sI=dWQqV^#JJ
zgG+eu1$Mzwj<Ex95?+P#P{Zwc#&EG4xKW^+up2%~=Zlbvcm*lYci0Ahrv8IeK%s##
zT&x4PJmRw+3`Vff3xB|K&_NeQu)B!)(<a7{1A7nm!xeZ7&)ZNoB{IK>F)XncuoEsq
z3j79Af}bGmTTA^7sYA5bh4`!$1A2i&YUL2z3WwosI01X$H&}vy;XEA2DF&`WoXJk1
zZ0ewZJ7EMV&;!^9pFxWA7E+?0VQDi4s~FG$e;|racG0{MyN|$j*oKPF!Ud@C(jKgL
z;R8~_2jNjT-X5=IhMT6Pb8*tl#yhgRnnnXtan0rUP<C5&Y&Hx8uZTc+GL(U3hfTnR
z*1W8wb}f&r@~3z>ExD5(!EHFF<skQzue`|P!ZVQ{a#Q9rLPyf_(C|sgU1cj;%t@CI
z?B$*mzD<rz_pCq7xy7NS)7es{dm=rq9>$?#<L9~a4JRmIoX;=x(||ihN1l%`&a^RB
zCdrkBBf})KrG@;j+!j9!jMjz^IKoP;1=1<T51ad|qsltcij4=N$V$eOTx#h_KQwHt
zHc;$%tto-x!gbXZWqhHrDgz!yVW_y`j_@kDqdAckzTpUHLq#dpqaxchmqG4F-bopl
zTIUQ>qK+Ay?+Wf2iw_Y<>XubgzA7t6BuB3YOZU#mAP_!+)!qmd8u+pKUZyW;prIfX
uqm}`EhI$5Zxo`o!M1Jvy!piPs#49KV9huTfB6z(3SL&oXv-G&-e)d0<eg`)I

delta 590
zcmYk&!7GDt7{Kx8-S&=+DO=iQYRCb9fI?}>WwIPxl+vtev<+<+7rV<vKU<4~3&IIY
z4xAmF6fO>0iW1`Nuza6-58mGQ_xU})-|u~%=Y37rMWpl`^pu6GlPALCu{09-{AVli
z7qJ(Au^la!h^~jwk5O#F0mngSe+-*hpTZE%;0We$U8E!@OtLKWxhakn)P%c^huA}W
zhFb6u1Nh?jgW6aF^?jRR6#aOGaZG9RHZ_QsILuMm#$oD9mB|(d9#9J}&~6j1Vi4C*
z3vQzB?>HWye(|ZZe~sL7%MiwUOyCFZ;gC;c8K00_;v@@EU#6L8q6~In5w&0iwSj$X
z!%Nf`ZyfJ1PW*(g*h`XQKBR@;)K7dt5^boC6Zo!4W7(BVaz0&LOeM1tE0|eVui0>Q
zcZ_G#xpcl5%_nndae_i^(w(r(xo6IV?W5Y8{p~iNzNm@%!?n7<Y?*3n#&`pFwML-q
F`U5%5P=Wve

diff --git a/languages/it.po b/languages/it.po
index 88ef543..2f9b513 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -21,17 +21,17 @@ msgstr ""
 msgid "Refine search"
 msgstr "Raffina la ricerca"
 
-#: FacetsFunctions.php:59
-#: FacetsFunctions.php:135
-#: FacetsFunctions.php:212
-#: FacetsFunctions.php:315
+#: FacetsFunctions.php:62
+#: FacetsFunctions.php:201
+#: FacetsFunctions.php:346
+#: FacetsFunctions.php:534
 msgid "Remove filter"
 msgstr "Rimuovi filtro"
 
-#: FacetsFunctions.php:63
-#: FacetsFunctions.php:139
-#: FacetsFunctions.php:216
-#: FacetsFunctions.php:319
+#: FacetsFunctions.php:66
+#: FacetsFunctions.php:205
+#: FacetsFunctions.php:350
+#: FacetsFunctions.php:538
 msgid "Select"
 msgstr "Seleziona"
 
@@ -75,14 +75,14 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr "Se selezionata, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
 
 #: config_form.php:63
-msgid "Block collapsible"
-msgstr "Blocco contraibile"
+msgid "Minimum checkbox count"
+msgstr "Minimo numero caselle di controllo"
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
-msgstr ""
-"Se selezionata, il blocco filtri sarà contraibile (consiglio: dal momento che utilizza meno spazio, è particolarmente "
-"utile con i temi a layout orizzontale)."
+msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
+msgstr 
+"Per tutti i campi che usano lo stile casella di controllo, numero minimo di valori da mostrare (0 significa "
+"che tutti i valori verranno mostrati)."
 
 #: config_form.php:75
 msgid "Block layout"
@@ -100,64 +100,93 @@ msgstr "Orizzontale (utile per i temi con un menu di navigazione principale supe
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr "Verticale (utile per i temi con un menu di navigazione principale laterale)"
 
-#: config_form.php:93
+#: config_form.php:95
+msgid "Block collapsible"
+msgstr "Blocco contraibile"
+
+#: config_form.php:99
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgstr ""
+"Se selezionata, il blocco filtri sarà contraibile (consiglio: dal momento che utilizza meno spazio, è particolarmente "
+"utile con i temi a layout orizzontale)."
+
+#: config_form.php:105
 msgid "Elements"
 msgstr "Elementi"
 
-#: config_form.php:101
+#: config_form.php:110
 msgid 
-"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
-"Sort order column to choose sorting order, Popularity column to show counters near names."
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to 
+"choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr 
 "Gli elementi che possono essere usati per il raffinamento della ricerca. Colonne Documento e Collezione "
-"per (dis)attivare, Ordinamento per scegliere il criterio di ordinamento, Popolarità per mostrare i "
-"contatori vicino ai nomi."
+"per (dis)attivare, Stile per scegliere lo stile del campo, Ordinamento per scegliere il criterio di ordinamento, "
+"Popolarità per mostrare i contatori vicino ai nomi."
 
-#: config_form.php:103
+#: config_form.php:115
 msgid "Element name"
 msgstr "Nome elemento"
 
-#: config_form.php:104
+#: config_form.php:116
 msgid "Item"
 msgstr "Documento"
 
-#: config_form.php:105
+#: config_form.php:117
 msgid "Collection"
 msgstr "Collezione"
 
-#: config_form.php:106
+#: config_form.php:118
+msgid "Style"
+msgstr "Stile"
+
+#: config_form.php:119
 msgid "Ordinamento"
 msgstr ""
 
-#: config_form.php:107
+#: config_form.php:120
 msgid "Popularity"
 msgstr "Popolarità"
 
-#: config_form.php:159
-#: config_form.php:201
-#: config_form.php:243
-#: config_form.php:285
+#: config_form.php:172
+#: config_form.php:233
+#: config_form.php:290
+#: config_form.php:347
+msgid "Dropdown"
+msgstr "Discesa (casella a)"
+
+#: config_form.php:173
+#: config_form.php:234
+#: config_form.php:291
+#: config_form.php:348
+msgid "Checkbox"
+msgstr "Controllo (casella di)"
+
+#: config_form.php:186
+#: config_form.php:246
+#: config_form.php:303
+#: config_form.php:360
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: config_form.php:160
-#: config_form.php:202
-#: config_form.php:244
-#: config_form.php:286
+#: config_form.php:187
+#: config_form.php:247
+#: config_form.php:303
+#: config_form.php:361
 msgid "Popularity first, then alphabetical"
 msgstr "Popolarità prima, poi alfabetico"
 
-#: config_form.php:178
-#: config_form.php:182
+#: config_form.php:208
+msgid "Extra parameters"
+msgstr "Parametri addizionali"
+
+#: config_form.php:212
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:220
-#: config_form.php:224
+#: config_form.php:264
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:262
-#: config_form.php:266
+#: config_form.php:316
 msgid "Tags"
-msgstr "Etichette"
+msgstr "Etichette"
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
index 20b8436..45c982d 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -10,6 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2021-06-08 13:56-0001\n"
 "PO-Revision-Date: 2021-06-13 15:39-0001\n"
 "PO-Revision-Date: 2021-07-05 15:17-0001\n"
+"PO-Revision-Date: 2021-07-18 17:16-0001\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -21,17 +22,17 @@ msgstr ""
 msgid "Refine search"
 msgstr ""
 
-#: FacetsFunctions.php:59
-#: FacetsFunctions.php:135
-#: FacetsFunctions.php:212
-#: FacetsFunctions.php:315
+#: FacetsFunctions.php:62
+#: FacetsFunctions.php:201
+#: FacetsFunctions.php:346
+#: FacetsFunctions.php:534
 msgid "Remove filter"
 msgstr ""
 
-#: FacetsFunctions.php:63
-#: FacetsFunctions.php:139
-#: FacetsFunctions.php:216
-#: FacetsFunctions.php:319
+#: FacetsFunctions.php:66
+#: FacetsFunctions.php:205
+#: FacetsFunctions.php:350
+#: FacetsFunctions.php:538
 msgid "Select"
 msgstr ""
 
@@ -71,11 +72,11 @@ msgid "If checked, values with just one entry will not be listed (unless there's
 msgstr ""
 
 #: config_form.php:63
-msgid "Block collapsible"
+msgid "Minimum checkbox count"
 msgstr ""
 
 #: config_form.php:67
-msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
 msgstr ""
 
 #: config_form.php:75
@@ -94,61 +95,88 @@ msgstr ""
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:93
+#: config_form.php:95
+msgid "Block collapsible"
+msgstr ""
+
+#: config_form.php:99
+msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
+msgstr ""
+
+#: config_form.php:105
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:98
+#: config_form.php:110
 msgid 
-"The elements that can be used for search refinement. Item and Collection columns to (de)activate, "
-"Sort order column to choose sorting order, Popularity column to show counters near names."
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
+"choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:103
+#: config_form.php:115
 msgid "Element name"
 msgstr ""
 
-#: config_form.php:104
+#: config_form.php:116
 msgid "Item"
 msgstr ""
 
-#: config_form.php:105
+#: config_form.php:117
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:106
+#: config_form.php:118
+msgid "Style"
+msgstr ""
+
+#: config_form.php:119
 msgid "Sort order"
 msgstr ""
 
-#: config_form.php:107
+#: config_form.php:120
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:159
-#: config_form.php:201
-#: config_form.php:243
-#: config_form.php:285
+#: config_form.php:172
+#: config_form.php:233
+#: config_form.php:290
+#: config_form.php:347
+msgid "Dropdown"
+msgstr ""
+
+#: config_form.php:173
+#: config_form.php:234
+#: config_form.php:291
+#: config_form.php:348
+msgid "Checkbox"
+msgstr ""
+
+#: config_form.php:186
+#: config_form.php:246
+#: config_form.php:303
+#: config_form.php:360
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:160
-#: config_form.php:202
-#: config_form.php:244
-#: config_form.php:286
+#: config_form.php:187
+#: config_form.php:247
+#: config_form.php:303
+#: config_form.php:361
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:178
-#: config_form.php:182
+#: config_form.php:208
+msgid "Extra parameters"
+msgstr ""
+
+#: config_form.php:212
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:220
-#: config_form.php:224
+#: config_form.php:264
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:262
-#: config_form.php:266
+#: config_form.php:316
 msgid "Tags"
-msgstr ""
+msgstr ""
\ No newline at end of file

From 6c509079b670cd4ce0827f318fba75f32d98b989 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:33:28 +0200
Subject: [PATCH 119/161] Update Readme.md

---
 Readme.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Readme.md b/Readme.md
index 3745008..895eb36 100644
--- a/Readme.md
+++ b/Readme.md
@@ -2,9 +2,9 @@
 
 ## Description
 
-Plugin for Omeka Classic. Once installed and active, allows to insert a Facets block made of option dropdown boxes containing available metadata values extracted from browsing context. Works for both Items and Collections.
+Plugin for Omeka Classic. Once installed and active, allows to insert a Faceted search refining block containing available metadata values extracted from browsing context. Works for both Items and Collections.
 
-Settings allow to choose the hook to be used, which criteria use for search refinement, whether to ignore single entries, sorting order for values, whether to show values popolarity, whether to use an horizontal or vertical layout, etc.
+Settings allow to choose the hook to be used, which criteria to use for search refinement, whether to ignore single entries, sorting order for values, whether to show values popularity, whether to use an horizontal or vertical layout, whether to make the block collapsible, etc.
 
 ## Credits
 
@@ -35,7 +35,9 @@ For **Thanks, Roy** theme, for example, best way is to change `common/header.php
 For **Berlin** theme, instead, check **Block collapsible** option, set **Horizontal** as **Block layout** and then add the custom hook in `items/browse.php` and `collections/browse.php`:
 ```php
 <?php echo item_search_filters(); ?>
+
 <?php echo get_specific_plugin_hook_output('Facets', 'public_facets', array('view' => $this)); ?>
+
 <?php echo pagination_links(); ?>
 ```
 
@@ -49,6 +51,8 @@ Similarly, one can choose to also include **Item Types**, **Collections** and **
 
 Facets block can be set up for **vertical** or **horizontal** layout, according to the theme layout; and it can be made **collapsible**, to use less vertical space (recommended for horizontal layout).
 
+Style for facets can be either **dropdown selectbox**, or **checkbox**; this last one allows to choose more values, while with the first one one value excludes other. For checkbox style, a **minimum amount of values** can be set too.
+
 Sorting order can be **alphabetical**, or **first by popularity and then alphabetical**. Popularity count can be shown, if needed.
 
 **Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').

From 0a77a1b3fd7c0b3657aca17e43a7e647745582aa Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:33:59 +0200
Subject: [PATCH 120/161] Update Readme.md

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 895eb36..e05494c 100644
--- a/Readme.md
+++ b/Readme.md
@@ -55,7 +55,7 @@ Style for facets can be either **dropdown selectbox**, or **checkbox**; this las
 
 Sorting order can be **alphabetical**, or **first by popularity and then alphabetical**. Popularity count can be shown, if needed.
 
-**Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is 'yyyy-mm-dd').
+**Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is '_yyyy-mm-dd_').
 
 ## Licence
 MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/) and [Daniele Binaghi](https://github.com/DBinaghi).

From 0c58562523a892c10a2a5bfb9d0bc47f6baafb7f Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:38:53 +0200
Subject: [PATCH 121/161] Strings updated

---
 languages/eo.mo        | Bin 607 -> 684 bytes
 languages/eo.po        |   8 ++++++++
 languages/it.mo        | Bin 4243 -> 4320 bytes
 languages/it.po        |   8 ++++++++
 languages/template.pot |   8 ++++++++
 5 files changed, 24 insertions(+)

diff --git a/languages/eo.mo b/languages/eo.mo
index bdde674e7a4ccdafaf1e4aee0da23da238aede3a..8b9b586f9c36439623bbd3265b15c1b6c7b11050 100644
GIT binary patch
delta 185
zcmcc5vWB((o)F7a1|VPqVi_Rz0dat!210>pULd;`h(UBW5QEgt1Y%AgUI3+60qLEL
z3=CU<G#?P>F+u2BAPrLA1EfLvCj)6NAiWSsGX$khj8_yc&d4uU$Vn|OW&pEt^NUh9
a)<0mB%+1d$DausHP0T6C$z*`?KuiFY$spqZ

delta 101
zcmZ3(dY>ioo)F7a1|VPoVi_Q|0dasJ210>pULZRbh(UBV5VHYsB@pjqWMF6j(tJQ{
U#RQ=}fiy@yVq&HG#x3_50V&!God5s;

diff --git a/languages/eo.po b/languages/eo.po
index 2f29425..de2bfb0 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: FacetsPlugin.php:11
+msgid "show more"
+msgstr "montri pli"
+
+#: FacetsPlugin.php:12
+msgid "show less"
+msgstr "montri malpli"
+
 #: browse.php:22
 msgid "Refine search"
 msgstr "Rafini serĉon"
diff --git a/languages/it.mo b/languages/it.mo
index e2e5c22753877f02ebf7b4ea87f6f907f6ee7abd..4549dea6a500113d8da429734d949328d3dc0be6 100644
GIT binary patch
delta 700
zcmYMxPbh<N7{Kvoj18OE{7I9H94roMrC3<46y@aRpqEyYcV4!YGFfwRa1h#2T$hW?
z&4F@o*~wBaq#a!3;7AU>kKVH0_x(K2?|pvn^ZWgF9DEJtUVP4i@EhRn=8icu6ESQ4
z^$;e>>v0QPF^@WajBY%`Ml50zUfJH-@5`w5k9J<g7LlC16KwF}2mQEKD-yw7+`$_(
zal$FWCFeY}(FJzkwVgj;Klw9iBS)Qx7n^OnQ8y4mE*atBq`!<3OfnF`DsJO4r?5!%
zAo-n3gf++qj^igb;4s@(NAZyQDC)v03{oO5=)*VEg?ynd*hP`n^{DihK>|IpFzN|R
zp-z}bJ=!H~$5lMSJa%Fmljd*;Pce%Y2G~BmWFPf=1?<BjYM(L&@d<O<=$k-S>LzK%
z0O|)q$YDs>&c|?uJceF&e1JtfVN!_kY5q`Ma0+KJi`wuWX(1JqsJWgnmg1R}Wy6$c
tX`$w_&Yw<Lo4sZ{otD2SX{F*Nk9*JEm9)~Cl+l}vuUTTphM7rO@(biwP*DH?

delta 604
zcmYMxKP*F06vy$OdabHf`X_X0#A9MGNeo0|YJ%5Qf~8DNBqCx}lSC~3CKAJwun<!l
zqeZZYK^R5K(!^jR27~XBmuTL5pL6cL@11*Y>+Y^wc}Y9_;@8Wa;~s3XOqvY+8z=P0
zBRGvIETN4rV-(jgh8x(1dx1y6{5jhCiy*(kq*T!z!4ebCn89MRG=g)uiasu2mm_g$
zlZO@B!cII4@+w*rmuQ7vF@Ya}KWGia!V;HKJRIsPOOR(Ehi^EG^PEDS)qUj0EfRas
zJr3goZZn^tZQF?7Dlw!pOk)+T@D17qAJNvm2Y#ZRkPT+2uQ-9d(2aJK1K5E>xPu;M
zv5rOjMjs1&Wf2?5H#J4uc7i4B!4<SZ2k7DnTAf?8jXt5*PS7B*4}2lb|E;n-!s>BM
hVuFrm@D$6u)X#W^KhQQjiW69<l|$Fz+E{cw`U{!1IKlt`

diff --git a/languages/it.po b/languages/it.po
index 2f9b513..6b5853c 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -17,6 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: FacetsPlugin.php:11
+msgid "show more"
+msgstr "mostra altro"
+
+#: FacetsPlugin.php:12
+msgid "show less"
+msgstr "mostra meno"
+
 #: browse.php:23
 msgid "Refine search"
 msgstr "Raffina la ricerca"
diff --git a/languages/template.pot b/languages/template.pot
index 45c982d..84bffbc 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -18,6 +18,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: FacetsPlugin.php:11
+msgid "show more"
+msgstr ""
+
+#: FacetsPlugin.php:12
+msgid "show less"
+msgstr ""
+
 #: browse.php:23
 msgid "Refine search"
 msgstr ""

From 76882fb3b0a8a069a16ebc6ffb75bf280bd6cd2e Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:43:24 +0200
Subject: [PATCH 122/161] Update browse.php

---
 views/public/facets/browse.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 22a4a6b..1f5ac31 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -4,6 +4,7 @@
 	$facetsCollapsible = (bool)get_option('facets_collapsible');
 	$facetsDirection = (string)get_option('facets_direction');
 	$checkboxMinCount = (int)get_option('facets_checkbox_minimum_amount');
+	$dateFields = array('Date', 'Date Available', 'Date Created', 'Date Accepted', 'Date Copyrighted', 'Date Submitted', 'Date Issued', 'Date Modified', 'Date Valid');
 
 	$table = get_db()->getTable('Element');
 	$select = $table->getSelect()
@@ -33,7 +34,7 @@
 				if ($recordType == 'collection') {
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
-							$isDate = in_array($element->name, array('Date'));
+							$isDate = in_array($element->name, $dateFields);
 							$facetElement = $facetsElements['elements'][$element->name];
 							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
 								$html = get_element_facet_checkboxes('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);
@@ -51,7 +52,7 @@
 				} else {	
 					foreach ($elements as $element) {
 						if (isFacetActive($recordType, $element->name, $facetsElements)) {
-							$isDate = in_array($element->name, array('Date'));
+							$isDate = in_array($element->name, $dateFields);
 							$facetElement = $facetsElements['elements'][$element->name];
 							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
 								$html = get_element_facet_checkboxes('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);

From d7b9ddb35b67a2dc6f8d4d1078900b0177c38dab Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 18 Jul 2021 17:43:51 +0200
Subject: [PATCH 123/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index fee0875..48b009e 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.4"
+version="2.5"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 88c184e932e28441e415c6247d8a51fc2c04467c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 19 Jul 2021 22:58:32 +0200
Subject: [PATCH 124/161] Rename Readme.md to README.md

---
 Readme.md => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Readme.md => README.md (100%)

diff --git a/Readme.md b/README.md
similarity index 100%
rename from Readme.md
rename to README.md

From e86634a7e501efd95288fe202e40937936ac0ada Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:35:12 +0200
Subject: [PATCH 125/161] Added new options, compacted code

---
 config_form.php | 179 +++++++++++++++---------------------------------
 1 file changed, 54 insertions(+), 125 deletions(-)

diff --git a/config_form.php b/config_form.php
index 95ffc57..ff2828b 100644
--- a/config_form.php
+++ b/config_form.php
@@ -136,14 +136,16 @@
 				<tr>
 					<td><?php echo __($element->name); ?></td>
 					<td class="boxes">
-						<?php echo $view->formCheckbox(
-							"elements[{$element->name}][item]",
-							'1', 
-							array(
-								'disableHidden' => true,
-								'checked' => isset($settings['elements'][$element->name]['item'])
-							)
-						); ?>
+						<?php 
+							echo $view->formCheckbox(
+								"elements[{$element->name}][item]",
+								'1', 
+								array(
+									'disableHidden' => true,
+									'checked' => (isset($settings['elements'][$element->name]['item']) && $settings['elements'][$element->name]['item'] == 1)
+								)
+							); 
+						?>
 					</td>
 					<td class="boxes">
 						<?php 
@@ -153,7 +155,7 @@
 									'1', 
 									array(
 										'disableHidden' => true,
-										'checked' => isset($settings['elements'][$element->name]['collection'])
+										'checked' => (isset($settings['elements'][$element->name]['collection']) && $settings['elements'][$element->name]['collection'] == 1)
 									)
 								); 
 							} else {
@@ -163,10 +165,10 @@
 					</td>
 					<td class="boxes">
 						<?php 
-							$type = (isset($settings['elements'][$element->name]['type']) ? $settings['elements'][$element->name]['type'] : '');
+							$style = (isset($settings['elements'][$element->name]['style']) ? $settings['elements'][$element->name]['style'] : '');
 							echo $view->formSelect(
-								"elements[{$element->name}][type]",
-								$type,
+								"elements[{$element->name}][style]",
+								$style,
 								array(),
 								array(
 									'dropdown' => __('Dropdown'),
@@ -196,7 +198,7 @@
 								'1', 
 								array(
 									'disableHidden' => true,
-									'checked' => isset($settings['elements'][$element->name]['popularity'])
+									'checked' => (isset($settings['elements'][$element->name]['popularity']) && $settings['elements'][$element->name]['popularity'] == 1)
 								)
 							); 
 						?>
@@ -208,78 +210,53 @@
 						<strong><?php echo __('Extra parameters'); ?></strong>
 					</th>
 				</tr>
+			<?php 
+				$extraParameters = array(
+					'item_types' => array('label' => 'Item Types', 'collection' => 0),
+					'collections' => array('label' => 'Collections', 'collection' => 0),
+					'tags' => array('label' => 'Tags', 'collection' => 0),
+					'users' => array('label' => 'Owners', 'collection' => 1),
+					'public' => array('label' => 'Public', 'collection' => 1),
+					'featured' => array('label' => 'Featured', 'collection' => 1)
+				);
+				foreach ($extraParameters as $key => $value):
+			?>
 				<tr>
-					<td><?php echo __('Item Types'); ?></td>
+					<td><?php echo __($value['label']); ?></td>
 					<td class="boxes">
 						<?php 
 							echo $view->formCheckbox(
-								"facets_item_types_active",
-								get_option('facets_item_types_active'), 
-								null, 
-								array('1', '0')
-							); 
-						?>
-					</td>
-					<td class="boxes">
-						&nbsp
-					</td>
-					<td class="boxes">
-						<?php 
-							echo $view->formSelect(
-								"facets_item_types_style",
-								get_option('facets_item_types_style'),
-								array(),
-								array(
-									'dropdown' => __('Dropdown'),
-									'checkbox' => __('Checkbox')
-								)
-							); 
-						?>
-					</td>
-					<td class="boxes">
-						<?php 
-							echo $view->formSelect(
-								'facets_item_types_sort',
-								get_option('facets_item_types_sort'),
-								array(),
+								"{$key}[item]",
+								'1', 
 								array(
-									'alpha' => __('Alphabetical'),
-									'count_alpha' => __('Popularity first, then alphabetical')
+									'disableHidden' => true,
+									'checked' => (isset($settings[$key]['item']) && $settings[$key]['item'] == 1)
 								)
 							); 
 						?>
 					</td>
 					<td class="boxes">
 						<?php 
-							echo $view->formCheckbox(
-								'facets_item_types_popularity', 
-								get_option('facets_item_types_popularity'), 
-								null, 
-								array('1', '0')
-							); 
-						?>
-					</td>
-				</tr>				
-				<tr>
-					<td><?php echo __('Collections'); ?></td>
-					<td class="boxes">
-						<?php 
-							echo $view->formCheckbox(
-								"facets_collections_active",
-								get_option('facets_collections_active'), 
-								null, 
-								array('1', '0')
-							); 
+							if ($value['collection']) {
+								echo $view->formCheckbox(
+									"{$key}[collection]",
+									'1', 
+									array(
+										'disableHidden' => true,
+										'checked' => isset($settings[$key]['collection'])
+									)
+								); 
+							} else {
+								echo "&nbsp;";
+							}
 						?>
 					</td>
-					<td class="boxes">
-						&nbsp
-					</td>
 					<td class="boxes">
 						<?php 
+							$style = (isset($settings[$key]['style']) ? $settings[$key]['style'] : '');
 							echo $view->formSelect(
-								"facets_collections_style",
-								get_option('facets_collections_style'),
+								"{$key}[style]",
+								$style,
 								array(),
 								array(
 									'dropdown' => __('Dropdown'),
@@ -290,9 +267,10 @@
 					</td>
 					<td class="boxes">
 						<?php 
+							$sort = (isset($settings[$key]['sort']) ? $settings[$key]['sort'] : '');
 							echo $view->formSelect(
-								'facets_collections_sort',
-								get_option('facets_collections_sort'),
+								"{$key}[sort]",
+								$sort,
 								array(),
 								array(
 									'alpha' => __('Alphabetical'),
@@ -304,66 +282,17 @@
 					<td class="boxes">
 						<?php 
 							echo $view->formCheckbox(
-								'facets_collections_popularity', 
-								get_option('facets_collections_popularity'), 
-								null, 
-								array('1', '0')
-							); 
-						?>
-					</td>
-				</tr>				
-				<tr>
-					<td><?php echo __('Tags'); ?></td>
-					<td class="boxes">
-						<?php 
-							echo $view->formCheckbox(
-								"facets_tags_active",
-								get_option('facets_tags_active'), 
-								null, 
-								array('1', '0')
-							); 
-						?>
-					</td>
-					<td class="boxes">
-						&nbsp
-					</td>
-					<td class="boxes">
-						<?php 
-							echo $view->formSelect(
-								"facets_tags_style",
-								get_option('facets_tags_style'),
-								array(),
-								array(
-									'dropdown' => __('Dropdown'),
-									'checkbox' => __('Checkbox')
-								)
-							); 
-						?>
-					</td>
-					<td class="boxes">
-						<?php 
-							echo $view->formSelect(
-								'facets_tags_sort',
-								get_option('facets_tags_sort'),
-								array(),
+								"{$key}[popularity]", 
+								'1', 
 								array(
-									'alpha' => __('Alphabetical'),
-									'count_alpha' => __('Popularity first, then alphabetical')
+									'disableHidden' => true,
+									'checked' => (isset($settings[$key]['popularity']) && $settings[$key]['popularity'] == 1)
 								)
 							); 
 						?>
 					</td>
-					<td class="boxes">
-						<?php 
-							echo $view->formCheckbox(
-								'facets_tags_popularity', 
-								get_option('facets_tags_popularity'), 
-								null, 
-								array('1', '0')
-							); 
-						?>
-					</td>
 				</tr>
+			<?php endforeach; ?>
 			</tbody>
 		</table>
 	</div>

From 44780ffc752e95de85f65eb16bf8967f7f6477c1 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:36:06 +0200
Subject: [PATCH 126/161] Added upgrade hook, compacted code

---
 FacetsPlugin.php | 121 +++++++++++++++++++++++++++--------------------
 1 file changed, 71 insertions(+), 50 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 969d901..6a3070c 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -8,8 +8,6 @@
 
 define('FACETS_PLUGIN_DIR', dirname(__FILE__));
 define('FACETS_MINIMUM_AMOUNT', 5);
-define('FACETS_SHOW_MORE', __('show more'));
-define('FACETS_SHOW_LESS', __('show less'));
 
 require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
 
@@ -18,6 +16,7 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 	protected $_hooks = array(
 		'install',
 		'uninstall',
+		'upgrade',
 		'initialize',
 		'config_form',
 		'config',
@@ -41,22 +40,15 @@ public function hookInstall()
 		set_option('facets_checkbox_minimum_amount', FACETS_MINIMUM_AMOUNT);
 
 		$defaults = array(
-			'elements' => array('item', 'collection', 'type', 'sort', 'popularity')
+			'elements' => array('item', 'collection', 'style', 'sort', 'popularity'),
+			'item_types' => array('item', 'style', 'sort', 'popularity'),
+			'collections' => array('item', 'style', 'sort', 'popularity'),
+			'tags' => array('item', 'style', 'sort', 'popularity'),
+			'users' => array('item', 'collection', 'style', 'sort', 'popularity'),
+			'public' => array('item', 'collection', 'style', 'sort', 'popularity'),
+			'featured' => array('item', 'collection', 'style', 'sort', 'popularity')			
 		);
-		set_option('facets_elements', json_encode($defaults));
-
-		set_option('facets_item_types_active', 0);
-		set_option('facets_item_types_style', '');
-		set_option('facets_item_types_sort', '');
-		set_option('facets_item_types_popularity', 0);
-		set_option('facets_collections_active', 1);
-		set_option('facets_collections_style', '');
-		set_option('facets_collections_sort', 'count_alpha');
-		set_option('facets_collections_popularity', 1);
-		set_option('facets_tags_active', 0);
-		set_option('facets_tags_style', '');
-		set_option('facets_tags_sort', '');
-		set_option('facets_tags_popularity', 0);
+		set_option('facets_parameters', json_encode($defaults));
 	}
 
 	/**
@@ -70,19 +62,48 @@ public function hookUninstall()
 		delete_option('facets_direction');
 		delete_option('facets_collapsible');
 		delete_option('facets_checkbox_minimum_amount');
-		delete_option('facets_elements');
-		delete_option('facets_item_types_active');
-		delete_option('facets_item_types_style');
-		delete_option('facets_item_types_sort');
-		delete_option('facets_item_types_popularity');
-		delete_option('facets_collections_active');
-		delete_option('facets_collections_style');
-		delete_option('facets_collections_sort');
-		delete_option('facets_collections_popularity');
-		delete_option('facets_tags_active');
-		delete_option('facets_tags_style');
-		delete_option('facets_tags_sort');
-		delete_option('facets_tags_popularity');
+		delete_option('facets_parameters');
+	}
+
+	public function hookUpgrade()
+	{
+        $oldVersion = $args['old_version'];
+        $newVersion = $args['new_version'];
+
+        if (version_compare($oldVersion, '2.5', '<')) {
+			$parameters = json_decode(str_replace('type', 'style', get_option('facets_elements')), true);
+			
+			$parameters['item_types']['item'] = get_option('facets_item_types_active');
+			$parameters['item_types']['style'] = get_option('facets_item_types_style');
+			$parameters['item_types']['sort'] = get_option('facets_item_types_sort');
+			$parameters['item_types']['popularity'] = get_option('facets_item_types_popularity');
+			$parameters['collections']['item'] = get_option('facets_collections_active');
+			$parameters['collections']['style'] = get_option('facets_collections_style');
+			$parameters['collections']['sort'] = get_option('facets_collections_sort');
+			$parameters['collections']['popularity'] = get_option('facets_collections_popularity');
+			$parameters['tags']['item'] = get_option('facets_tags_active');
+			$parameters['tags']['style'] = get_option('facets_tags_style');
+			$parameters['tags']['sort'] = get_option('facets_tags_sort');
+			$parameters['tags']['popularity'] = get_option('facets_tags_popularity');
+			$parameters['users'] = array('item', 'collection', 'style', 'sort', 'popularity');
+			$parameters['public'] = array('item', 'collection', 'style', 'sort', 'popularity');
+			$parameters['featured'] = array('item', 'collection', 'style', 'sort', 'popularity');
+			set_option('facets_parameters', json_encode($parameters));
+
+			delete_option('facets_elements');
+			delete_option('facets_item_types_active');
+			delete_option('facets_item_types_style');
+			delete_option('facets_item_types_sort');
+			delete_option('facets_item_types_popularity');
+			delete_option('facets_collections_active');
+			delete_option('facets_collections_style');
+			delete_option('facets_collections_sort');
+			delete_option('facets_collections_popularity');
+			delete_option('facets_tags_active');
+			delete_option('facets_tags_style');
+			delete_option('facets_tags_sort');
+			delete_option('facets_tags_popularity');
+		}
 	}
 
 	/**
@@ -94,7 +115,7 @@ public function hookInitialize()
 
 		get_view()->addHelperPath(dirname(__FILE__) . '/views/helpers', 'Facets_View_Helper_');
 
-		$settings = json_decode(get_option('facets_elements'), true);
+		$settings = json_decode(get_option('facets_parameters'), true);
 		$this->_settings = $settings;
 	}
 
@@ -130,22 +151,15 @@ public function hookConfig($args)
 		set_option('facets_checkbox_minimum_amount', $post['facets_checkbox_minimum_amount']);
 
 		$settings = array(
-			'elements' => isset($post['elements']) ? $post['elements'] : array()
+			'elements' => isset($post['elements']) ? $post['elements'] : array(),
+			'item_types' => isset($post['item_types']) ? $post['item_types'] : array(),
+			'collections' => isset($post['collections']) ? $post['collections'] : array(),
+			'tags' => isset($post['tags']) ? $post['tags'] : array(),
+			'users' => isset($post['users']) ? $post['users'] : array(),
+			'public' => isset($post['public']) ? $post['public'] : array(),
+			'featured' => isset($post['featured']) ? $post['featured'] : array()			
 		);
-		set_option('facets_elements', json_encode($settings));
-
-		set_option('facets_item_types_active', $post['facets_item_types_active']);
-		set_option('facets_item_types_style', $post['facets_item_types_style']);
-		set_option('facets_item_types_sort', $post['facets_item_types_sort']);
-		set_option('facets_item_types_popularity', $post['facets_item_types_popularity']);
-		set_option('facets_collections_active', $post['facets_collections_active']);
-		set_option('facets_collections_style', $post['facets_collections_style']);
-		set_option('facets_collections_sort', $post['facets_collections_sort']);
-		set_option('facets_collections_popularity', $post['facets_collections_popularity']);
-		set_option('facets_tags_active', $post['facets_tags_active']);
-		set_option('facets_tags_style', $post['facets_tags_style']);
-		set_option('facets_tags_sort', $post['facets_tags_sort']);
-		set_option('facets_tags_popularity', $post['facets_tags_popularity']);
+		set_option('facets_parameters', json_encode($settings));
 	}
 
 	/**
@@ -261,8 +275,8 @@ public function hookPublicHead($args)
 		
 		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
 			$language = array(
-				'ShowMore' => FACETS_SHOW_MORE,
-				'ShowLess' => FACETS_SHOW_LESS
+				'ShowMore' => __('show more'),
+				'ShowLess' => __('show less')
 			);
 			$language = json_encode($language);
 			queue_js_string("facetsLanguage = {language: $language};");
@@ -306,7 +320,11 @@ public function showFacets($args)
 				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''), 
 				'collection' => (isset($_GET['collection']) ? $_GET['collection'] : ''), 
 				'type' => (isset($_GET['type']) ? $_GET['type'] : ''),
-				'tags' => (isset($_GET['tags']) ? $_GET['tags'] : '')
+				'tags' => (isset($_GET['tags']) ? $_GET['tags'] : ''),
+				'user' => (isset($_GET['user']) ? $_GET['user'] : ''),
+				'public' => (isset($_GET['public']) ? $_GET['public'] : ''),
+				'featured' => (isset($_GET['featured']) ? $_GET['featured'] : '')
+
 			);
 
 			if (recordTypeActive('item', $settings['elements']) && count(get_records('item', $params, null)) > 0) {
@@ -317,7 +335,10 @@ public function showFacets($args)
 			}
 		} elseif ($controller == 'collections' && $action == 'browse') {
 			$params = array(
-				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : '')
+				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''),
+				'user' => (isset($_GET['user']) ? $_GET['user'] : ''),
+				'public' => (isset($_GET['public']) ? $_GET['public'] : ''),
+				'featured' => (isset($_GET['featured']) ? $_GET['featured'] : '')
 			);
 			if (recordTypeActive('collection', $settings['elements']) && count(get_records('collection', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(

From 00ed1f2d5880cffd9a1eda0f8a5b52d398b1f5ff Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:36:54 +0200
Subject: [PATCH 127/161] Added new options, compacted code

---
 views/public/facets/browse.php | 139 ++++++++++++++++++---------------
 1 file changed, 74 insertions(+), 65 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 1f5ac31..ecb9f36 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,5 +1,5 @@
 <?php
-	$facetsElements = json_decode(get_option('facets_elements'), true);
+	$facetParameters = json_decode(get_option('facets_parameters'), true);
 	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
 	$facetsCollapsible = (bool)get_option('facets_collapsible');
 	$facetsDirection = (string)get_option('facets_direction');
@@ -31,84 +31,93 @@
 		
 		<form action="index.html" method="post" <?php echo ($facetsDirection == 'horizontal' ? 'class="flex"': 'class=""'); ?>>
 			<?php
-				if ($recordType == 'collection') {
-					foreach ($elements as $element) {
-						if (isFacetActive($recordType, $element->name, $facetsElements)) {
-							$isDate = in_array($element->name, $dateFields);
-							$facetElement = $facetsElements['elements'][$element->name];
-							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
-								$html = get_element_facet_checkboxes('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);
-							} else {
-								$html = get_element_facet_select('collection', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''));
-							}
-							if ($html != '') {
-								echo "<div id=\"facets-field-" . $element->id . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
-								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo $html . "\n";
-								echo "</div>\n";
-							}
-						}
-					}
-				} else {	
-					foreach ($elements as $element) {
-						if (isFacetActive($recordType, $element->name, $facetsElements)) {
-							$isDate = in_array($element->name, $dateFields);
-							$facetElement = $facetsElements['elements'][$element->name];
-							if (isset($facetElement['type']) && $facetElement['type'] == 'checkbox') {
-								$html = get_element_facet_checkboxes('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''), $checkboxMinCount);
-							} else {
-								$html = get_element_facet_select('item', $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetElement['sort']) ? $facetElement['sort'] : ''), (isset($facetElement['popularity']) ? $facetElement['popularity'] : ''));
-							}
-							if ($html != '') {
-								echo "<div id=\"facets-field-" . $element->id . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
-								echo "<label for=\"\">" . html_escape(__($element->name)) . "</label>\n";
-								echo $html . "\n";
-								echo "</div>\n";
-							}								
+				// Elements
+				foreach ($elements as $element) {
+					if (isFacetActive($recordType, $element->name, $facetParameters)) {
+						$isDate = in_array($element->name, $dateFields);
+						$facetParameter = $facetParameters['elements'][$element->name];
+						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+							$html = getFacetCheckboxesForElement($recordType, $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+						} else {
+							$html = getFacetSelectForElement($recordType, $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
+
+						if ($html != '') printHtml($html, $element->id, $facetsDirection, $element->name);
 					}
+				}
 
-					if ((bool)get_option('facets_item_types_active')) {
-						if (get_option('facets_item_types_style') == 'checkbox') {
-							$html = get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'), $checkboxMinCount);
+				if ($recordType == 'item') {
+					// Collections (only for items)
+					if (isFacetActive($recordType, null, $facetParameters, 'item_types')) {
+						$facetParameter = $facetParameters['item_types'];
+						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+							$html = getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
 						} else {
-							$html = get_item_types_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_item_types_sort'), get_option('facets_item_types_popularity'));
-						}
-						if ($html != '') {
-							echo "<div id=\"facets-field-item-type\" class=\"facets-container-" . $facetsDirection . "\">\n";
-							echo "<label for=\"\">" . html_escape(__('Item Type')) . "</label>\n";
-							echo $html . "\n";
-							echo "</div>\n";
+							$html = getFacetSelectForItemType($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
+
+						if ($html != '') printHtml($html, 'item-type', $facetsDirection, 'Item Type');
 					}
 
-					if ((bool)get_option('facets_collections_active')) {
-						if (get_option('facets_collections_style') == 'checkbox') {
-							$html = get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'), $checkboxMinCount);
+					// Item Type (only for items)
+					if (isFacetActive($recordType, null, $facetParameters, 'collections')) {
+						$facetParameter = $facetParameters['collections'];
+						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+							$html = getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
 						} else {
-							$html = get_collections_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_collections_sort'), get_option('facets_collections_popularity'));
-						}
-						if ($html != '') {
-							echo "<div id=\"facets-field-collection\" class=\"facets-container-" . $facetsDirection . "\">\n";
-							echo "<label for=\"\">" . html_escape(__('Collection')) . "</label>\n";
-							echo $html . "\n";
-							echo "</div>\n";
+							$html = getFacetSelectForCollection($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
+
+						if ($html != '') printHtml($html, 'collection', $facetsDirection, 'Collection');
 					}
 
-					if ((bool)get_option('facets_tags_active')) {
-						if (get_option('facets_tags_style') == 'checkbox') {
-							$html = get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'), $checkboxMinCount);
+					// Tags (only for items)
+					if (isFacetActive($recordType, null, $facetParameters, 'tags')) {
+						$facetParameter = $facetParameters['tags'];
+						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+							$html = getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
 						} else {
-							$html = get_tags_facet_select($subsetSQL, $hideSingleEntries, get_option('facets_tags_sort'), get_option('facets_tags_popularity'));
-						}
-						if ($html != '') {
-							echo "<div id=\"facets-field-tag\" class=\"facets-container-" . $facetsDirection . "\">\n";
-							echo "<label for=\"\">" . html_escape(__('Tags')) . "</label>\n";
-							echo $html . "\n";
-							echo "</div>\n";
+							$html = getFacetSelectForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
+
+						if ($html != '') printHtml($html, 'tags', $facetsDirection, 'Tag');
+					}
+				}
+				
+				// Users
+				if (isFacetActive($recordType, null, $facetParameters, 'users')) {
+					$facetParameter = $facetParameters['users'];
+					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+						$html = getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+					} else {
+						$html = getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+					}
+
+					if ($html != '') printHtml($html, 'user', $facetsDirection, 'Owner');
+				}
+				
+				// Public
+				if (isFacetActive($recordType, null, $facetParameters, 'public')) {
+					$facetParameter = $facetParameters['public'];
+					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'public', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+					} else {
+						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'public', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 					}
+
+					if ($html != '') printHtml($html, 'public', $facetsDirection, 'Public');
+				}
+				
+				// Featured
+				if (isFacetActive($recordType, null, $facetParameters, 'featured')) {
+					$facetParameter = $facetParameters['featured'];
+					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
+						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'featured', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+					} else {
+						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'featured', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+					}
+
+					if ($html != '') printHtml($html, 'featured', $facetsDirection, 'Featured');
 				}
 			?>
 		</form>

From b8ab4a47808d79b6c78a1f730720b60f5071cc2c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:37:41 +0200
Subject: [PATCH 128/161] Added new options

---
 helpers/FacetsFunctions.php | 403 +++++++++++++++++++++++++++++++++---
 1 file changed, 376 insertions(+), 27 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index f5b76a7..8c73a08 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -4,12 +4,300 @@
 	 */
 
 	/**
-	 * Return list of objects associated to collection.
+	 * Return list of objects associated to extra parameters (public, featured).
+	 *
+	 * @param subsetSQL
+	 * @return objects
+	 */
+	function getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder) {
+		// Create Where clause
+		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
+
+		// Define Order By clause
+		if ($sortOrder == 'count_alpha') {
+			$orderBy = 'count DESC, ' . $extraType . ' DESC';
+		} else {
+			$orderBy = $extraType . ' DESC';
+		}
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable($recordType);
+		// Build the select query.
+		$subQuery = $table->getSelect();
+		$subQuery->where($whereSubset);
+		
+		$select = "SELECT `" . $extraType . "`, COUNT(id) AS count FROM (" . $subQuery . ") foo GROUP BY `" . $extraType . "` ORDER BY " . $orderBy;
+
+		return $table->fetchObjects($select);
+	}
+
+	/**
+	 * Return HTML Select associated with Array of facets extra parameter values.
+	 *
+	 * @param recordType
+	 * @param subsetSQL
+	 * @param extraType
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($extras = getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder)) {
+			// Build array
+			$facetExtras = buildExtrasArray($extras, $extraType);
+
+			// Stores data for selected extra, if any
+			$selectedExtra = getSelectedExtra($facetExtras, $extraType);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetExtras, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetExtras = array_filter($facetExtras, "isNotSingleExtra");
+			}			
+
+			$addOptions = false;
+			// Build first part of the select tag
+			if (isset($selectedExtra)) {
+				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($extraType, null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . __(getExtraName($extraType, $selectedExtra)) . "</option>";
+			} elseif (count($facetExtras) > 0) {
+				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"" . $extraType . "\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			// Build additional part of the select tag (if needed)
+			if ($addOptions) {
+				foreach ($facetExtras as $value => $count) {
+					$html .= "<option value=\"" . $value . "\" data-url=\"" . getFieldUrl($extraType, $value) . "\">" . __(getExtraName($extraType, $value)) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Return HTML Checkboxes associated with Array of facets extra parametervalues.
+	 *
+	 * @param recordType
+	 * @param subsetSQL
+	 * @param extraType
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @param limitCheckboxes
+	 * @return html
+	 */
+	function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($extras = getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder)) {
+			// Build array
+			$facetExtras = buildExtrasArray($extras, $extraType);
+
+			// Stores data for selected extra, if any
+			$selectedExtra = getSelectedExtra($facetExtras, $extraType);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetExtras, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetExtras = array_filter($facetExtras, "isNotSingleExtra");
+			}			
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if (isset($selectedExtra)) {
+				$url = getFieldUrl($extraType, null, $selectedExtra);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape(__(getExtraName($extraType, $selectedExtra))) . "</b></div>";
+				$countCheckboxes++;
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetExtras as $value => $count) {
+				if (!isset($selectedExtra) || $value <> $selectedExtra) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-extras\">";
+						$hidingSeparator = true;
+					}
+
+					$url = getFieldUrl($extraType, $value);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $value . "\" data-url=\"" . $url . "\">" . html_escape(__(getExtraName($extraType, $value))) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-extras\" class=\"facet-visibility-toggle\" data-element-id=\"extras\">" . __('show more') . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+	
+	/**
+	 * Return list of objects associated to extra parameters (user, public, featured).
+	 *
+	 * @param subsetSQL
+	 * @return objects
+	 */
+	function getObjectsForUser($recordType, $subsetSQL, $sortOrder) {
+		// Create Where clause
+		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
+
+		// Define Order By clause
+		if ($sortOrder == 'count_alpha') {
+			$orderBy = array('count DESC', 'name ASC');
+		} else {
+			$orderBy = array('name ASC');
+		}
+
+		// Get the database.
+		$db = get_db();
+		// Get the table.
+		$table = $db->getTable('User');
+		// Build the select query.
+		$select = $table->getSelect();
+		$select->columns('COUNT(users.id) AS count');
+		if ($recordType == 'item') {
+			$select->joinInner(array('items' => $db->Item), 'users.id = items.owner_id', array());
+		} else {
+			$select->joinInner(array('collections' => $db->Collection), 'users.id = collections.owner_id', array());
+		}
+		$select->where($whereSubset);
+		$select->group('users.id');
+		$select->order($orderBy);
+
+		return $table->fetchObjects($select);
+	}
+
+	/**
+	 * Return HTML Select associated with Array of facets extra parameter values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @return html.
+	 */
+	function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($users = getObjectsForUser($recordType, $subsetSQL, $sortOrder)) {
+			// Build array
+			$facetUsers = buildUsersArray($users);
+			
+			// Stores data for selected user, if any
+			$selectedUser = getSelectedUser($facetUsers);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetUsers, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetUsers = array_filter($facetUsers, "isNotSingleExtra");
+			}			
+
+			$addOptions = false;
+			// Build first part of the select tag
+			if (isset($selectedUser)) {
+				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('user', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . $selectedUser['name'] . "</option>";
+			} elseif (count($facetUsers) > 0) {
+				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"user\">";
+				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
+				$addOptions = true;
+			}
+
+			// Build additional part of the select tag (if needed)
+			if ($addOptions) {
+				foreach ($facetUsers as $user) {
+					$html .= "<option value=\"" . $user['id'] . "\" data-url=\"" . getFieldUrl('user', $user['id']) . "\">" . $user['name'] . ($showPopularity ? " (" . $user['count'] . ")" : "") . "</option>";
+				}
+			}
+			$html .= "</select></div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+
+	/**
+	 * Return HTML Checkboxes associated with Array of facets values.
+	 *
+	 * @param subsetSQL
+	 * @param hideSingleEntries
+	 * @param sortOrder
+	 * @param showPopularity
+	 * @param limitCheckboxes
+	 * @return html
+	 */
+	function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($users = getObjectsForUser($recordType, $subsetSQL, $sortOrder)) {
+			// Build array
+			$facetUsers = buildUsersArray($users);
+			
+			// Store data for selected user, if any
+			$selectedUser = getSelectedUser($facetUsers);
+
+			// Remove single entries if required
+			if ($hideSingleEntries && count(array_filter($facetUsers, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
+				$facetUsers = array_filter($facetUsers, "isNotSingleExtra");
+			}			
+
+			$countCheckboxes = 0;
+			$html = '<div>';
+			// Build first part of the checkboxes tag
+			if (isset($selectedUser)) {
+				$url = getFieldUrl('user', null, $selectedUser);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedUser['name']) . "</b></div>";
+				$countCheckboxes++;
+			}
+
+			$hidingSeparator = false;
+			// Build additional part of the select tag (if needed)
+			foreach ($facetUsers as $user) {
+				if ($user != $selectedUser) {
+					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+						// Add link to show other values
+						$html .= "<div class=\"hidden\" id=\"facet-extra-values-users\">";
+						$hidingSeparator = true;
+					}
+					
+					$url = getFieldUrl('user', $user['id']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $user['name'] . "\" data-url=\"" . $url . "\">" . html_escape($user['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $user['count'] . ")</span>" : "") . "</div>";
+					$countCheckboxes++;
+				}
+			}
+			
+			if ($hidingSeparator) {
+				$html .= "</div>";
+				$html .= "<a id=\"facet-extra-link-users\" class=\"facet-visibility-toggle\" data-element-id=\"users\">" . __('show more') . "</a>";
+			}
+
+			$html .= "</div>";
+		} else {
+			$html = false;
+		}
+
+		return $html;
+	}
+	
+	/**
+	 * Return list of objects associated to tag.
 	 *
 	 * @param subsetSQL
 	 * @return objects
 	 */
-	function get_objects_for_tags($subsetSQL, $sortOrder) {
+	function getObjectsForTag($subsetSQL, $sortOrder) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -42,8 +330,8 @@ function get_objects_for_tags($subsetSQL, $sortOrder) {
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
-		if ($tags = get_objects_for_tags($subsetSQL, $sortOrder)) {
+	function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($tags = getObjectsForTag($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetTags = buildTagsArray($tags);
 			
@@ -90,8 +378,8 @@ function get_tags_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrde
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
-		if ($tags = get_objects_for_tags($subsetSQL, $sortOrder)) {
+	function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($tags = getObjectsForTag($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetTags = buildTagsArray($tags);
 			
@@ -134,7 +422,7 @@ function get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sort
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-tags\" class=\"facet-visibility-toggle\" data-element-id=\"tags\">" . FACETS_SHOW_MORE . "</a>";
+				$html .= "<a id=\"facet-extra-link-tags\" class=\"facet-visibility-toggle\" data-element-id=\"tags\">" . __('show more') . "</a>";
 			}
 
 			$html .= "</div>";
@@ -151,7 +439,7 @@ function get_tags_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sort
 	 * @param subsetSQL
 	 * @return objects
 	 */
-	function get_objects_for_collection($subsetSQL) {
+	function getObjectsForCollection($subsetSQL) {
 		// Create Where clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 		
@@ -178,8 +466,8 @@ function get_objects_for_collection($subsetSQL) {
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
-		if ($collections = get_objects_for_collection($subsetSQL, $sortOrder)) {
+	function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($collections = getObjectsForCollection($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetCollections = buildCollectionsArray($collections);
 			
@@ -230,8 +518,8 @@ function get_collections_facet_select($subsetSQL, $hideSingleEntries = false, $s
 	 * @param limitCheckboxes
 	 * @return html
 	 */
-	function get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
-		if ($collections = get_objects_for_collection($subsetSQL, $sortOrder)) {
+	function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($collections = getObjectsForCollection($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetCollections = buildCollectionsArray($collections);
 			
@@ -273,7 +561,7 @@ function get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries = false
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-collections\" class=\"facet-visibility-toggle\" data-element-id=\"collections\">" . FACETS_SHOW_MORE . "</a>";
+				$html .= "<a id=\"facet-extra-link-collections\" class=\"facet-visibility-toggle\" data-element-id=\"collections\">" . __('show more') . "</a>";
 			}
 
 			$html .= "</div>";
@@ -291,7 +579,7 @@ function get_collections_facet_checkboxes($subsetSQL, $hideSingleEntries = false
 	 * @param sortOrder
 	 * @return objects
 	 */
-	function get_objects_for_item_type($subsetSQL, $sortOrder) {
+	function getObjectsForItemType($subsetSQL, $sortOrder) {
 		// Create Where Subset clause
 		$whereSubset = createWhereSubsetClause('item', $subsetSQL);
 
@@ -326,8 +614,8 @@ function get_objects_for_item_type($subsetSQL, $sortOrder) {
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
-		if ($itemTypes = get_objects_for_item_type($subsetSQL, $sortOrder)) {
+	function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+		if ($itemTypes = getObjectsForItemType($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetItemTypes = buildItemTypesArray($itemTypes);
 					
@@ -374,8 +662,8 @@ function get_item_types_facet_select($subsetSQL, $hideSingleEntries = false, $so
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
-		if ($itemTypes = get_objects_for_item_type($subsetSQL, $sortOrder)) {
+	function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+		if ($itemTypes = getObjectsForItemType($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetItemTypes = buildItemTypesArray($itemTypes);
 					
@@ -414,7 +702,7 @@ function get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries = false,
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-item-types\" class=\"facet-visibility-toggle\" data-element-id=\"item-types\">" . FACETS_SHOW_MORE . "</a>";
+				$html .= "<a id=\"facet-extra-link-item-types\" class=\"facet-visibility-toggle\" data-element-id=\"item-types\">" . __('show more') . "</a>";
 			}
 
 			$html .= "</div>";
@@ -435,7 +723,7 @@ function get_item_types_facet_checkboxes($subsetSQL, $hideSingleEntries = false,
 	 * @param sortOrder
 	 * @return objects
 	 */
-	function get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder) {
+	function getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder) {
 		// Create Where clauses
 		$whereRecordType = createWhereRecordTypeClause($recordType);
 		$whereSubset = createWhereSubsetClause($recordType, $subsetSQL);
@@ -497,9 +785,9 @@ function get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $
 	 * @param showPopularity
 	 * @return html
 	 */
-	function get_element_facet_select($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Build array
-		if ($elements = get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
+		if ($elements = getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
 			$facetElement = array();
 			foreach ($elements as $element) {
 				if ($isDate) {
@@ -567,9 +855,9 @@ function get_element_facet_select($recordType, $subsetSQL, $elementId = 50, $isD
 	 * @param limitCheckboxes
 	 * @return html
 	 */
-	function get_element_facet_checkboxes($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
 		// Build array
-		if ($elements = get_objects_for_element($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
+		if ($elements = getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
 			$facetElement = array();
 			foreach ($elements as $element) {
 				if ($isDate) {
@@ -625,7 +913,7 @@ function get_element_facet_checkboxes($recordType, $subsetSQL, $elementId = 50,
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-" . $elementId . "\" class=\"facet-visibility-toggle\" data-element-id=\"" . $elementId . "\">" . FACETS_SHOW_MORE . "</a>";
+				$html .= "<a id=\"facet-extra-link-" . $elementId . "\" class=\"facet-visibility-toggle\" data-element-id=\"" . $elementId . "\">" . __('show more') . "</a>";
 			}
 
 			$html .= "</div>";
@@ -778,8 +1066,12 @@ function getTagUrl($value = null)
 		return 'browse?' . http_build_query($params);
 	}
 
-	function isFacetActive($recordType, $element_name, $settings) {
-		if (isset($settings['elements'][$element_name][$recordType])) {
+	function isFacetActive($recordType, $element_name, $settings, $extra_name = null) {
+		if ($extra_name != '') {
+			if (isset($settings[$extra_name][$recordType])) {
+				return ((bool)$settings[$extra_name][$recordType]);
+			}
+		} elseif (isset($settings['elements'][$element_name][$recordType])) {
 			return ((bool)$settings['elements'][$element_name][$recordType]);
 		}
 		return false;
@@ -868,4 +1160,61 @@ function buildTagsArray($tags) {
 		}
 		return $facetTags;
 	}
+		
+	function buildUsersArray($users) {
+		$facetUsers = array();
+		foreach ($users as $user) {
+			$facetUsers[$user->id]['id'] = $user->id;
+			$facetUsers[$user->id]['name'] = $user->name;
+			$facetUsers[$user->id]['count'] = $user->count;
+		}
+		return $facetUsers;
+	}
+		
+	function getSelectedUser($users) {
+		if (isset($_GET['user'])) {
+			$user_id = $_GET['user'];
+			if (array_key_exists($user_id, $users)) {
+				return $users[$user_id];
+			}
+		}
+	}
+
+	function buildExtrasArray($extras, $extraType) {
+		$facetExtras = array();
+		foreach ($extras as $extra) {
+			if ($extra->{$extraType}) {
+				$facetExtras[1] = $extra->count;
+			} else {
+				$facetExtras[0] = $extra->count;
+			}
+		}
+		return $facetExtras;
+	}
+			
+	function getSelectedExtra($extras, $extraType) {
+		if (isset($_GET[$extraType])) {
+			$extra = $_GET[$extraType];
+			if (array_key_exists($extra, $extras)) {
+				return $extra;				
+			}
+		}
+	}
+	
+	function getExtraName($extraType, $value) {
+		if ($value == 0) {
+			return "Not " . ucfirst($extraType);
+		} else {
+			return ucfirst($extraType);
+		}
+	}
+	
+	function printHtml($html, $key, $facetsDirection, $label) {
+		if ($html != '') {
+			echo "<div id=\"facets-field-" . $key . "\" class=\"facets-container-" . $facetsDirection . "\">\n";
+			echo "<label for=\"\">" . html_escape(__($label)) . "</label>\n";
+			echo $html . "\n";
+			echo "</div>\n";
+		}
+	}
 ?>

From 167fc7ef98037f2e9225dd77b29725162dec6471 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:38:26 +0200
Subject: [PATCH 129/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 48b009e..8a055f7 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.5"
+version="2.6"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 05c4b855656c3b71aa4a72d94790c8ff9dcf8520 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Tue, 20 Jul 2021 09:47:34 +0200
Subject: [PATCH 130/161] Updated strings

---
 languages/eo.po        |  48 ++++++++++++++++++++++-------------------
 languages/it.mo        | Bin 4320 -> 4425 bytes
 languages/it.po        |  48 ++++++++++++++++++++++-------------------
 languages/template.pot |  44 ++++++++++++++++++++-----------------
 4 files changed, 76 insertions(+), 64 deletions(-)

diff --git a/languages/eo.po b/languages/eo.po
index de2bfb0..c041a3b 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -117,8 +117,8 @@ msgstr ""
 
 #: config_form.php:110
 msgid 
-"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to choose the facet style, "
-"Sort order column to choose sorting order, Popularity column to show counters near names."
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
+"choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
 #: config_form.php:115
@@ -145,46 +145,50 @@ msgstr ""
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:172
-#: config_form.php:233
-#: config_form.php:290
-#: config_form.php:347
+#: config_form.php:174
+#: config_form.php:262
 msgid "Dropdown"
 msgstr ""
 
-#: config_form.php:173
-#: config_form.php:234
-#: config_form.php:291
-#: config_form.php:348
+#: config_form.php:175
+#: config_form.php:263
 msgid "Checkbox"
 msgstr ""
 
-#: config_form.php:186
-#: config_form.php:246
-#: config_form.php:303
-#: config_form.php:360
+#: config_form.php:188
+#: config_form.php:276
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:187
-#: config_form.php:247
-#: config_form.php:303
-#: config_form.php:361
+#: config_form.php:189
+#: config_form.php:277
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:208
+#: config_form.php:210
 msgid "Extra parameters"
 msgstr ""
 
-#: config_form.php:212
+#: config_form.php:225
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:264
+#: config_form.php:225
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:316
+#: config_form.php:225
 msgid "Tags"
+msgstr ""
+
+#: config_form.php:225
+msgid "Owners"
+msgstr ""
+
+#: config_form.php:225
+msgid "Public"
+msgstr ""
+
+#: config_form.php:225
+msgid "Featured"
 msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index 4549dea6a500113d8da429734d949328d3dc0be6..8d3284f457f85700b04beae357f6440b90bea79f 100644
GIT binary patch
delta 757
zcmYMyJxE(o6u|M5m>1i8SWT%8Dn^B(MYM~hMWHwp{J@XJMY_cJiYbybPopBmC+JW|
zeRWehIEX@_@<vA|aZm@5BG^K+C<qQBf))H9ePFon{_Z_F+<V^P{jJ`qu}@-wCE-`c
zQ^E7mr#q2l|DzF>E9`@~fhD+!8sEkzxQ`+HjbY4tUU>iiN6j}19`a*YEMiN!7ihpN
z3C;K%*RU10a2l_11SbL_49PR;g{N4Gm#77XjfZ#)YuQ(##@kQ}XvZk_-)oB`y@V_>
zWRgiQn8x=wi~n#NlXPc|)9TrWd2MQvW^BQC_!M)VHZG7qk6LIsQz5>@7&c;*`=yPA
zzCkZC<dbI>wUu8{JMs;+@@3>q*}xa*qUP=3A|7HH4ioIb8T^5Jn86Hf&_e&9tp}g7
zsKHy*gW}wxHefZrMZItU8IokuH^^cU&Y>RYAWf1LZ@-G2?0;gEPF&+U2A_$%BL1sb
zs_qXy=1b@zkVn1vHD4IDNNb7n+3ysZiLsnz4!Jk}BVVw0B5hiu&OzYKqH*qvyXVID
sK)53v|1h2!GSgEDcP7;B4_TQnR>~YpSSe>W(q#1I1_wvntH@cw9Y8@`5C8xG

delta 680
zcmYMxJxD@P6u|MLKGQ6v>}yB@iv}f!z!FL-K?o|G+M^^WdVSKAk=WW0^>U0_#U-$<
zp`alGr$T5c!oejP8jFVh2OcEvz280eo%_zY*T??%aQ-c56oua)cZfUf&`88|{@coM
zowy12upJAi^A>vX5`9?07QD8-v)@-y^J{io$2O6?d@$JN#V>Z?hD#)ghj@UuXySw+
z!X;%MTIdS9@y3pyaDey~wUEOt;>Un(2z3Kd<dR_?2K6PuV3LU>)^Q)RoWcUx5#oD~
z2tCLrj^h_LV~lO92|OV`h1%FNlcdNS2C;$K$Tw=k9+EV#Po=&@80eA3QBPnBb-_I9
z(Jo;ZuHh*bum?L?l))jqz#ML3FWaY<9HD-%i2YbXty9G?zF=Mp{V>o@y#xX5Mg2e&
zISh&0@fgk!r_s-jkFkX3EQ&He%^#`_@8B%vPzydFCFB_;Wp1r3E-mk_W*1FKS!L&8
gWz<!3SV8xQm2o#JBTZ*UrRJM+S}}jDlJz%Se|eEfaR2}S

diff --git a/languages/it.po b/languages/it.po
index 6b5853c..72676cc 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -124,7 +124,7 @@ msgstr "Elementi"
 
 #: config_form.php:110
 msgid 
-"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to 
+"The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
 "choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr 
 "Gli elementi che possono essere usati per il raffinamento della ricerca. Colonne Documento e Collezione "
@@ -155,46 +155,50 @@ msgstr ""
 msgid "Popularity"
 msgstr "Popolarità"
 
-#: config_form.php:172
-#: config_form.php:233
-#: config_form.php:290
-#: config_form.php:347
+#: config_form.php:174
+#: config_form.php:262
 msgid "Dropdown"
 msgstr "Discesa (casella a)"
 
-#: config_form.php:173
-#: config_form.php:234
-#: config_form.php:291
-#: config_form.php:348
+#: config_form.php:175
+#: config_form.php:263
 msgid "Checkbox"
 msgstr "Controllo (casella di)"
 
-#: config_form.php:186
-#: config_form.php:246
-#: config_form.php:303
-#: config_form.php:360
+#: config_form.php:188
+#: config_form.php:276
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: config_form.php:187
-#: config_form.php:247
-#: config_form.php:303
-#: config_form.php:361
+#: config_form.php:189
+#: config_form.php:277
 msgid "Popularity first, then alphabetical"
 msgstr "Popolarità prima, poi alfabetico"
 
-#: config_form.php:208
+#: config_form.php:210
 msgid "Extra parameters"
 msgstr "Parametri addizionali"
 
-#: config_form.php:212
+#: config_form.php:225
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:264
+#: config_form.php:225
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:316
+#: config_form.php:225
 msgid "Tags"
-msgstr "Etichette"
\ No newline at end of file
+msgstr "Etichette"
+
+#: config_form.php:225
+msgid "Owners"
+msgstr "Proprietari"
+
+#: config_form.php:225
+msgid "Public"
+msgstr "Pubblico"
+
+#: config_form.php:225
+msgid "Featured"
+msgstr "In Evidenza"
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
index 84bffbc..ec3ecdb 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -145,46 +145,50 @@ msgstr ""
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:172
-#: config_form.php:233
-#: config_form.php:290
-#: config_form.php:347
+#: config_form.php:174
+#: config_form.php:262
 msgid "Dropdown"
 msgstr ""
 
-#: config_form.php:173
-#: config_form.php:234
-#: config_form.php:291
-#: config_form.php:348
+#: config_form.php:175
+#: config_form.php:263
 msgid "Checkbox"
 msgstr ""
 
-#: config_form.php:186
-#: config_form.php:246
-#: config_form.php:303
-#: config_form.php:360
+#: config_form.php:188
+#: config_form.php:276
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:187
-#: config_form.php:247
-#: config_form.php:303
-#: config_form.php:361
+#: config_form.php:189
+#: config_form.php:277
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:208
+#: config_form.php:210
 msgid "Extra parameters"
 msgstr ""
 
-#: config_form.php:212
+#: config_form.php:225
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:264
+#: config_form.php:225
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:316
+#: config_form.php:225
 msgid "Tags"
+msgstr ""
+
+#: config_form.php:225
+msgid "Owners"
+msgstr ""
+
+#: config_form.php:225
+msgid "Public"
+msgstr ""
+
+#: config_form.php:225
+msgid "Featured"
 msgstr ""
\ No newline at end of file

From 723a4d5ceb9740aa0794b04edd4502ce590b82b5 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:40:30 +0200
Subject: [PATCH 131/161] Changed way to build $params array

---
 FacetsPlugin.php | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 6a3070c..a01fefe 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -314,19 +314,16 @@ public function showFacets($args)
 		$request = Zend_Controller_Front::getInstance()->getRequest();
 		$controller = $request->getControllerName();
 		$action = $request->getActionName();
+		$params = array();
 		
 		if ($controller == 'items' && $action == 'browse') {
-			$params = array(
-				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''), 
-				'collection' => (isset($_GET['collection']) ? $_GET['collection'] : ''), 
-				'type' => (isset($_GET['type']) ? $_GET['type'] : ''),
-				'tags' => (isset($_GET['tags']) ? $_GET['tags'] : ''),
-				'user' => (isset($_GET['user']) ? $_GET['user'] : ''),
-				'public' => (isset($_GET['public']) ? $_GET['public'] : ''),
-				'featured' => (isset($_GET['featured']) ? $_GET['featured'] : '')
-
-			);
-
+			if (isset($_GET['advanced'])) $params['advanced'] = $_GET['advanced'];
+			if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
+			if (isset($_GET['type'])) $params['type'] = $_GET['type'];
+			if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
+			if (isset($_GET['user'])) $params['user'] = $_GET['user'];
+			if (isset($_GET['public'])) $params['public'] = $_GET['public'];
+			if (isset($_GET['featured'])) $params['featured'] = $_GET['featured'];
 			if (recordTypeActive('item', $settings['elements']) && count(get_records('item', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
 					'params' => $params,
@@ -334,12 +331,10 @@ public function showFacets($args)
 				));
 			}
 		} elseif ($controller == 'collections' && $action == 'browse') {
-			$params = array(
-				'advanced' => (isset($_GET['advanced']) ? $_GET['advanced'] : ''),
-				'user' => (isset($_GET['user']) ? $_GET['user'] : ''),
-				'public' => (isset($_GET['public']) ? $_GET['public'] : ''),
-				'featured' => (isset($_GET['featured']) ? $_GET['featured'] : '')
-			);
+			if (isset($_GET['advanced'])) $params['advanced'] = $_GET['advanced'];
+			if (isset($_GET['user'])) $params['user'] = $_GET['user'];
+			if (isset($_GET['public'])) $params['public'] = $_GET['public'];
+			if (isset($_GET['featured'])) $params['featured'] = $_GET['featured'];
 			if (recordTypeActive('collection', $settings['elements']) && count(get_records('collection', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
 					'params' => $params,

From 8d5dc5563b9b7e2b617fc9958cda8cef3cd31b89 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 3 Sep 2021 09:24:46 +0200
Subject: [PATCH 132/161] Corrected typo

---
 config_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_form.php b/config_form.php
index ff2828b..08ef5bf 100644
--- a/config_form.php
+++ b/config_form.php
@@ -215,7 +215,7 @@
 					'item_types' => array('label' => 'Item Types', 'collection' => 0),
 					'collections' => array('label' => 'Collections', 'collection' => 0),
 					'tags' => array('label' => 'Tags', 'collection' => 0),
-					'users' => array('label' => 'Owners', 'collection' => 1),
+					'users' => array('label' => 'Owner', 'collection' => 1),
 					'public' => array('label' => 'Public', 'collection' => 1),
 					'featured' => array('label' => 'Featured', 'collection' => 1)
 				);

From ca6536752368d475e369e4b008f8a4cc5fb7eaa8 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 3 Sep 2021 09:27:57 +0200
Subject: [PATCH 133/161] Vertically centered table cells of first column

---
 config_form.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config_form.php b/config_form.php
index 08ef5bf..c6ac8cf 100644
--- a/config_form.php
+++ b/config_form.php
@@ -2,9 +2,11 @@
 	$view = get_view();
 ?>
 <style type = "text/css">
+	.boxes, .boxes-left {
+		vertical-align: middle;
+	}
 	.boxes {
 		text-align: center;
-		vertical-align: middle;
 	}
 	.field select {
 		margin-bottom: 0;
@@ -134,7 +136,7 @@
 				</tr>
 				<?php 	endif; ?>
 				<tr>
-					<td><?php echo __($element->name); ?></td>
+					<td class="boxes-left"><?php echo __($element->name); ?></td>
 					<td class="boxes">
 						<?php 
 							echo $view->formCheckbox(
@@ -222,7 +224,7 @@
 				foreach ($extraParameters as $key => $value):
 			?>
 				<tr>
-					<td><?php echo __($value['label']); ?></td>
+					<td class="boxes-left"><?php echo __($value['label']); ?></td>
 					<td class="boxes">
 						<?php 
 							echo $view->formCheckbox(

From 618357380a7f212f094a2322dfadeecf09bf014c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 3 Sep 2021 09:31:27 +0200
Subject: [PATCH 134/161] Corrected typos

---
 config_form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config_form.php b/config_form.php
index c6ac8cf..ab7e0a7 100644
--- a/config_form.php
+++ b/config_form.php
@@ -214,8 +214,8 @@
 				</tr>
 			<?php 
 				$extraParameters = array(
-					'item_types' => array('label' => 'Item Types', 'collection' => 0),
-					'collections' => array('label' => 'Collections', 'collection' => 0),
+					'item_types' => array('label' => 'Item Type', 'collection' => 0),
+					'collections' => array('label' => 'Collection', 'collection' => 0),
 					'tags' => array('label' => 'Tags', 'collection' => 0),
 					'users' => array('label' => 'Owner', 'collection' => 1),
 					'public' => array('label' => 'Public', 'collection' => 1),

From f5170f2b5415a4efde6c4f1ced12d6bd65e44176 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 3 Sep 2021 09:34:31 +0200
Subject: [PATCH 135/161] Corrected typo

---
 config_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_form.php b/config_form.php
index ab7e0a7..13a0b90 100644
--- a/config_form.php
+++ b/config_form.php
@@ -216,7 +216,7 @@
 				$extraParameters = array(
 					'item_types' => array('label' => 'Item Type', 'collection' => 0),
 					'collections' => array('label' => 'Collection', 'collection' => 0),
-					'tags' => array('label' => 'Tags', 'collection' => 0),
+					'tags' => array('label' => 'Tag', 'collection' => 0),
 					'users' => array('label' => 'Owner', 'collection' => 1),
 					'public' => array('label' => 'Public', 'collection' => 1),
 					'featured' => array('label' => 'Featured', 'collection' => 1)

From 567990abc05b88e96d281d7c2d798f0edf249b68 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Fri, 3 Sep 2021 09:35:20 +0200
Subject: [PATCH 136/161] Corrected typos

---
 views/public/facets/browse.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index ecb9f36..23ba531 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -71,7 +71,7 @@
 						if ($html != '') printHtml($html, 'collection', $facetsDirection, 'Collection');
 					}
 
-					// Tags (only for items)
+					// Tag (only for items)
 					if (isFacetActive($recordType, null, $facetParameters, 'tags')) {
 						$facetParameter = $facetParameters['tags'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
@@ -84,7 +84,7 @@
 					}
 				}
 				
-				// Users
+				// Owner
 				if (isFacetActive($recordType, null, $facetParameters, 'users')) {
 					$facetParameter = $facetParameters['users'];
 					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {

From a92d822feccd18d00fbd49aa071118dcf2f6feef Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 29 Sep 2021 22:05:28 +0200
Subject: [PATCH 137/161] Added search parameter to items search

Search of existing items was ignoring the search parameter (advanced search)
---
 FacetsPlugin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index a01fefe..3170a55 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -324,6 +324,7 @@ public function showFacets($args)
 			if (isset($_GET['user'])) $params['user'] = $_GET['user'];
 			if (isset($_GET['public'])) $params['public'] = $_GET['public'];
 			if (isset($_GET['featured'])) $params['featured'] = $_GET['featured'];
+			if (isset($_GET['search'])) $params['search'] = $_GET['search'];
 			if (recordTypeActive('item', $settings['elements']) && count(get_records('item', $params, null)) > 0) {
 				echo get_view()->partial('facets/browse.php', array(
 					'params' => $params,

From 9360a0e530b881ab66ec0bf774d1fdb0a0e8f2d9 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 29 Sep 2021 22:08:54 +0200
Subject: [PATCH 138/161] Fixed bug, fixed search parameters

Fixed bug with browsing items or collections when "browse" subfolder not in URL.
Fixed bug with parameters.
Added functions to optimize code.
---
 helpers/FacetsFunctions.php | 107 ++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 54 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 8c73a08..0e0d513 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -61,7 +61,7 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 			// Build first part of the select tag
 			if (isset($selectedExtra)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($extraType, null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, $extraType, null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . __(getExtraName($extraType, $selectedExtra)) . "</option>";
 			} elseif (count($facetExtras) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"" . $extraType . "\">";
@@ -72,7 +72,7 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetExtras as $value => $count) {
-					$html .= "<option value=\"" . $value . "\" data-url=\"" . getFieldUrl($extraType, $value) . "\">" . __(getExtraName($extraType, $value)) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
+					$html .= "<option value=\"" . $value . "\" data-url=\"" . getFieldUrl($recordType, $extraType, $value) . "\">" . __(getExtraName($extraType, $value)) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -112,7 +112,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedExtra)) {
-				$url = getFieldUrl($extraType, null, $selectedExtra);
+				$url = getFieldUrl($recordType, $extraType, null, $selectedExtra);
 				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape(__(getExtraName($extraType, $selectedExtra))) . "</b></div>";
 				$countCheckboxes++;
 			}
@@ -127,7 +127,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 						$hidingSeparator = true;
 					}
 
-					$url = getFieldUrl($extraType, $value);
+					$url = getFieldUrl($recordType, $extraType, $value);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $value . "\" data-url=\"" . $url . "\">" . html_escape(__(getExtraName($extraType, $value))) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
 					$countCheckboxes++;
 				}
@@ -208,7 +208,7 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 			// Build first part of the select tag
 			if (isset($selectedUser)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('user', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'user', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedUser['name'] . "</option>";
 			} elseif (count($facetUsers) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"user\">";
@@ -219,7 +219,7 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetUsers as $user) {
-					$html .= "<option value=\"" . $user['id'] . "\" data-url=\"" . getFieldUrl('user', $user['id']) . "\">" . $user['name'] . ($showPopularity ? " (" . $user['count'] . ")" : "") . "</option>";
+					$html .= "<option value=\"" . $user['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'user', $user['id']) . "\">" . $user['name'] . ($showPopularity ? " (" . $user['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -257,7 +257,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedUser)) {
-				$url = getFieldUrl('user', null, $selectedUser);
+				$url = getFieldUrl($recordType, 'user', null, $selectedUser);
 				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedUser['name']) . "</b></div>";
 				$countCheckboxes++;
 			}
@@ -272,7 +272,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 						$hidingSeparator = true;
 					}
 					
-					$url = getFieldUrl('user', $user['id']);
+					$url = getFieldUrl($recordType, 'user', $user['id']);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $user['name'] . "\" data-url=\"" . $url . "\">" . html_escape($user['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $user['count'] . ")</span>" : "") . "</div>";
 					$countCheckboxes++;
 				}
@@ -347,7 +347,7 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 			// Build first part of the select tag
 			if ($selectedTagName != '') {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('tags', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'tags', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedTagName . "</option>";
 			} elseif (count($facetTags) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"tag\">";
@@ -358,7 +358,7 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetTags as $tag) {
-					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl('tags', $tag['name']) . "\">" . $tag['name'] . ($showPopularity ? " (" . $tag['count'] . ")" : "") . "</option>";
+					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'tags', $tag['name']) . "\">" . $tag['name'] . ($showPopularity ? " (" . $tag['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -486,7 +486,7 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 			// Build first part of the select tag
 			if (isset($selectedCollection)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"collection\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('collection', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'collection', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedCollection['name'] . "</option>";
 			} elseif (count($facetCollections) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"collection\">";
@@ -497,7 +497,7 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetCollections as $collection) {
-					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl('collection', $collection['id']) . "\">" . $collection['name'] . ($showPopularity ? " (" . $collection['count'] . ")" : "") . "</option>";
+					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'collection', $collection['id']) . "\">" . $collection['name'] . ($showPopularity ? " (" . $collection['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -538,7 +538,7 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedCollection)) {
-				$url = getFieldUrl('collection', null, $selectedCollection);
+				$url = getFieldUrl($recordType, 'collection', null, $selectedCollection);
 				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedCollection['name']) . "</b></div>";
 				$countCheckboxes++;
 			}
@@ -553,7 +553,7 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 						$hidingSeparator = true;
 					}
 					
-					$url = getFieldUrl('collection', $collection['id']);
+					$url = getFieldUrl($recordType, 'collection', $collection['id']);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $collection['name'] . "\" data-url=\"" . $url . "\">" . html_escape($collection['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $collection['count'] . ")</span>" : "") . "</div>";
 					$countCheckboxes++;
 				}
@@ -631,7 +631,7 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 			// Build first part of the select tag
 			if (!empty($selectedItemType)) {
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"type\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl('type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedItemType['name'] . "</option>";
 			} elseif (count($facetItemTypes) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"type\">";
@@ -642,7 +642,7 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetItemTypes as $itemType) {
-					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl('type', $itemType['id']) . "\">" . $itemType['name'] . ($showPopularity ? " (" . $itemType['count'] . ")" : "") . "</option>";
+					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'type', $itemType['id']) . "\">" . $itemType['name'] . ($showPopularity ? " (" . $itemType['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -679,7 +679,7 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedItemType)) {
-				$url = getFieldUrl('type', null, $selectedItemType);
+				$url = getFieldUrl($recordType, 'type', null, $selectedItemType);
 				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedItemType['name']) . "</b></div>";
 				$countCheckboxes++;
 			}
@@ -694,7 +694,7 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 						$hidingSeparator = true;
 					}
 					
-					$url = getFieldUrl('type', $itemType['id']);
+					$url = getFieldUrl($recordType, 'type', $itemType['id']);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $itemType['name'] . "\" data-url=\"" . $url . "\">" . html_escape($itemType['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $itemType['count'] . ")</span>" : "") . "</div>";
 					$countCheckboxes++;
 				}
@@ -818,7 +818,7 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 			// Build first part of the select tag
 			if (isset($term)){
 				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $elementId . "\">";
-				$url = getElementFieldUrl($element_id, null, $isDate);
+				$url = getElementFieldUrl($recordType, $element_id, null, $isDate);
 				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">$term</option>";
 			} elseif (count($facetElement) > 0) {
@@ -830,7 +830,7 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetElement as $name => $count) {
-					$url = getElementFieldUrl($element_id, $name, $isDate);
+					$url = getElementFieldUrl($recordType, $element_id, $name, $isDate);
 					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
 			}
@@ -889,7 +889,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 			// Build first part of the checkboxes tag
 			if (!empty($selectedTerms)) {
 				foreach ($selectedTerms as $term){
-					$url = getElementFieldUrl($element_id, null, $isDate, $term);
+					$url = getElementFieldUrl($recordType, $element_id, null, $isDate, $term);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($term) . "</b></div>";
 					$countCheckboxes++;
 				}
@@ -905,7 +905,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 						$hidingSeparator = true;
 					}
 					
-					$url = getElementFieldUrl($element_id, $name, $isDate);
+					$url = getElementFieldUrl($recordType, $element_id, $name, $isDate);
 					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $name . "\" data-url=\"" . $url . "\">" . html_escape($name) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
 					$countCheckboxes++;
 				}
@@ -932,7 +932,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 	 * @param string $isDate 
 	 * @return string The new URL.
 	 */
-	function getElementFieldUrl($field_id, $value = null, $isDate = false, $oldValue = null)
+	function getElementFieldUrl($recordType, $field_id, $value = null, $isDate = false, $oldValue = null)
 	{
 		// Get the current facets.
 		if (!empty($_GET['advanced'])) {
@@ -965,18 +965,13 @@ function getElementFieldUrl($field_id, $value = null, $isDate = false, $oldValue
 				$search[] = array('element_id'=>$field_id, 'type'=>'is exactly', 'terms'=>$value);
 			}
 		}
+
+		// set previous parameters
 		$params['advanced'] = $search;
-		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
-		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
-		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
-		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
-		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
-		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
-		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
-		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+		$params = setPreviousParameters($params);
 
-		// Rebuild the route.
-		return 'browse?' . http_build_query($params);
+		// return rebuilt route
+		return getRebuiltUrl($recordType, $params);
 	}
 
 	/**
@@ -986,7 +981,7 @@ function getElementFieldUrl($field_id, $value = null, $isDate = false, $oldValue
 	 * @param string $value The Element value.
 	 * @return string The new URL.
 	 */
-	function getFieldUrl($filter, $value = null, $oldValue = null)
+	function getFieldUrl($recordType, $filter, $value = null, $oldValue = null)
 	{
 		// Get the current facets.
 		if (!empty($_GET['advanced'])) {
@@ -994,16 +989,10 @@ function getFieldUrl($filter, $value = null, $oldValue = null)
 		} else {
 			$search = array();
 		}
+
 		// set previous parameters
 		$params['advanced'] = $search;
-		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
-		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
-		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
-		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
-		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
-		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
-		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
-		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+		$params = setPreviousParameters($params);
 
 		// set(unset) current
 		if (!is_null($value)){
@@ -1012,8 +1001,8 @@ function getFieldUrl($filter, $value = null, $oldValue = null)
 			unset($params[$filter]);
 		}
 
-		// Rebuild the route.
-		return 'browse?' . http_build_query($params);
+		// return rebuilt route
+		return getRebuiltUrl($recordType, $params);
 	}
 	
 	/**
@@ -1031,16 +1020,10 @@ function getTagUrl($value = null)
 		} else {
 			$search = array();
 		}
+
 		// set previous parameters
 		$params['advanced'] = $search;
-		if (isset($_GET['origin'])) $params['origin'] = $_GET['origin'];
-		if (isset($_GET['origin-title'])) $params['origin-title'] = $_GET['origin-title'];
-		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
-		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
-		if (isset($_GET['tag_id'])) $params['tag_id'] = $_GET['tag_id'];
-		if (isset($_GET['tag'])) $params['tag'] = $_GET['tag'];
-		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
-		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+		$params = setPreviousParameters($params);
 
 		// set(unset) current
 		if (!is_null($value)) {
@@ -1062,8 +1045,8 @@ function getTagUrl($value = null)
 			unset($params['tags']);
 		}
 
-		// Rebuild the route.
-		return 'browse?' . http_build_query($params);
+		// return rebuilt route
+		return getRebuiltUrl($recordType, $params);
 	}
 
 	function isFacetActive($recordType, $element_name, $settings, $extra_name = null) {
@@ -1217,4 +1200,20 @@ function printHtml($html, $key, $facetsDirection, $label) {
 			echo "</div>\n";
 		}
 	}
+	
+	function getRebuiltUrl($recordType, $params) {
+		return url($recordType . 's/browse', $params);
+	}
+	
+	function setPreviousParameters($params) {
+		if (isset($_GET['collection'])) $params['collection'] = $_GET['collection'];
+		if (isset($_GET['type'])) $params['type'] = $_GET['type'];
+		if (isset($_GET['tags'])) $params['tags'] = $_GET['tags'];
+		if (isset($_GET['user'])) $params['user'] = $_GET['user'];
+		if (isset($_GET['public'])) $params['public'] = $_GET['public'];
+		if (isset($_GET['featured'])) $params['featured'] = $_GET['featured'];
+		if (isset($_GET['search'])) $params['search'] = $_GET['search'];
+		
+		return $params;
+	}
 ?>

From 4a92066f0b918aab6d4b48ad43af824cc2e384a2 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 29 Sep 2021 22:09:35 +0200
Subject: [PATCH 139/161] Updated version

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 8a055f7..2bebe75 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.6"
+version="2.7"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From e5c5945075b5678e0caa6c69dda8c03ecea9ea8c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Wed, 29 Sep 2021 22:12:01 +0200
Subject: [PATCH 140/161] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index e05494c..7d48cc2 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,8 @@ For **Berlin** theme, instead, check **Block collapsible** option, set **Horizon
 <?php echo pagination_links(); ?>
 ```
 
+Background and foreground colors can be changed in `facets.css` file (`views/public/css` folder).
+
 ## Plugin configuration
 
 The elements used for search refinement can be selected in the configuration page; best practice suggestion is to activate only elements that are displayed in the browse page, and that are offering some kind of data aggregation (a unique id would not offer any really useful refinement).

From 4fd818bd794c67e368917c9094c7b41a57a3b79d Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 3 Oct 2021 21:30:53 +0200
Subject: [PATCH 141/161] Added additional control on array $elements

---
 helpers/FacetsFunctions.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 0e0d513..2afc06b 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -1081,9 +1081,12 @@ function createWhereSubsetClause($recordType, $sql) {
 	}
 	
 	function recordTypeActive($recordType, $elements) {
-		foreach ($elements as $element) {
-			if (array_key_exists($recordType, $element)) return true;
+		if (isset($elements)) {
+			foreach ($elements as $element) {
+				if (array_key_exists($recordType, $element)) return true;
+			}
 		}
+		
 		return false;
 	}
 	

From 421300c32fae244790e308d5fcd858102444efc4 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 3 Oct 2021 21:33:53 +0200
Subject: [PATCH 142/161] Added information about date fields

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7d48cc2..b0a9f21 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ Style for facets can be either **dropdown selectbox**, or **checkbox**; this las
 
 Sorting order can be **alphabetical**, or **first by popularity and then alphabetical**. Popularity count can be shown, if needed.
 
-**Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is '_yyyy-mm-dd_').
+**Date** element filter's behaviour is a bit different: dates are ordered decrescently, and only year is displayed; consequently, the matching will be with the beginning of the date (assuming the format is '_yyyy-mm-dd_'). By default, the following are considered date fields: '**Date**', '**Date Available**', '**Date Created**', '**Date Accepted**', '**Date Copyrighted**', '**Date Submitted**', '**Date Issued**', '**Date Modified**', '**Date Valid**' (the list can be changed in browse.php file).
 
 ## Licence
 MIT Licence, please credit AR2L [AR2L Hauts de France](http://www.ar2l-hdf.fr/) and [Daniele Binaghi](https://github.com/DBinaghi).

From 2c532e1a03d2ae43e8568f75d6cb3865d34ac528 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sun, 3 Oct 2021 21:34:30 +0200
Subject: [PATCH 143/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 2bebe75..7e4a23d 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.7"
+version="2.7.1"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 3caafe8cfa1a5a62c105e5e1638fdc32ae1ff1d3 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Mon, 4 Oct 2021 11:06:09 +0200
Subject: [PATCH 144/161] Update browse.php

---
 views/public/facets/browse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 23ba531..281768c 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -80,7 +80,7 @@
 							$html = getFacetSelectForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
 
-						if ($html != '') printHtml($html, 'tags', $facetsDirection, 'Tag');
+						if ($html != '') printHtml($html, 'tags', $facetsDirection, 'Tags');
 					}
 				}
 				

From ed44f5360382c26638fbd791386c2d2d063e2fb0 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 08:06:10 +0100
Subject: [PATCH 145/161] Corrected typo

---
 config_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_form.php b/config_form.php
index 13a0b90..ab7e0a7 100644
--- a/config_form.php
+++ b/config_form.php
@@ -216,7 +216,7 @@
 				$extraParameters = array(
 					'item_types' => array('label' => 'Item Type', 'collection' => 0),
 					'collections' => array('label' => 'Collection', 'collection' => 0),
-					'tags' => array('label' => 'Tag', 'collection' => 0),
+					'tags' => array('label' => 'Tags', 'collection' => 0),
 					'users' => array('label' => 'Owner', 'collection' => 1),
 					'public' => array('label' => 'Public', 'collection' => 1),
 					'featured' => array('label' => 'Featured', 'collection' => 1)

From 0a1979afda19972b5d047db961a4b3c0524d66e6 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 08:30:52 +0100
Subject: [PATCH 146/161] Hardcoded record type for functions limited to Items

---
 views/public/facets/browse.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index 281768c..ef5a885 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -47,8 +47,8 @@
 				}
 
 				if ($recordType == 'item') {
-					// Collections (only for items)
-					if (isFacetActive($recordType, null, $facetParameters, 'item_types')) {
+					// Collection (only for items)
+					if (isFacetActive('item', null, $facetParameters, 'item_types')) {
 						$facetParameter = $facetParameters['item_types'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
 							$html = getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
@@ -60,7 +60,7 @@
 					}
 
 					// Item Type (only for items)
-					if (isFacetActive($recordType, null, $facetParameters, 'collections')) {
+					if (isFacetActive('item', null, $facetParameters, 'collections')) {
 						$facetParameter = $facetParameters['collections'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
 							$html = getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
@@ -71,8 +71,8 @@
 						if ($html != '') printHtml($html, 'collection', $facetsDirection, 'Collection');
 					}
 
-					// Tag (only for items)
-					if (isFacetActive($recordType, null, $facetParameters, 'tags')) {
+					// Tags (only for items)
+					if (isFacetActive('item', null, $facetParameters, 'tags')) {
 						$facetParameter = $facetParameters['tags'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
 							$html = getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);

From 306237d1040cfc5597e33293b1636d896a6e8999 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 10:51:04 +0100
Subject: [PATCH 147/161] Added style for checkbox labels

---
 views/public/css/facets.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index f74ea92..e2216fe 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -135,6 +135,10 @@
 	font-weight: normal!important;
 }
 
+.facet-checkbox label {
+	font-weight: normal;
+}
+
 .facet-checkbox-count {
 	float: right;
 	color: #545759;

From 7338fff405a2c93534ddddca92aaef41aa45f369 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 10:54:32 +0100
Subject: [PATCH 148/161] Fixed extras issue, improved logic for tags, removed
 useless function

---
 helpers/FacetsFunctions.php | 137 ++++++++++++++++--------------------
 1 file changed, 60 insertions(+), 77 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index 2afc06b..b4c5606 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -60,8 +60,9 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($selectedExtra)) {
+				$url = getFieldUrl($recordType, $extraType, null);
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, $extraType, null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . __(getExtraName($extraType, $selectedExtra)) . "</option>";
 			} elseif (count($facetExtras) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"" . $extraType . "\">";
@@ -72,7 +73,8 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetExtras as $value => $count) {
-					$html .= "<option value=\"" . $value . "\" data-url=\"" . getFieldUrl($recordType, $extraType, $value) . "\">" . __(getExtraName($extraType, $value)) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
+					$url = getFieldUrl($recordType, $extraType, $value);
+					$html .= "<option value=\"" . $value . "\" data-url=\"" . $url . "\">" . __(getExtraName($extraType, $value)) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -113,7 +115,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 			// Build first part of the checkboxes tag
 			if (isset($selectedExtra)) {
 				$url = getFieldUrl($recordType, $extraType, null, $selectedExtra);
-				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape(__(getExtraName($extraType, $selectedExtra))) . "</b></div>";
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . html_escape(__(getExtraName($extraType, $selectedExtra))) . "</strong></label></div>";
 				$countCheckboxes++;
 			}
 
@@ -128,7 +130,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 					}
 
 					$url = getFieldUrl($recordType, $extraType, $value);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $value . "\" data-url=\"" . $url . "\">" . html_escape(__(getExtraName($extraType, $value))) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $value . "\" data-url=\"" . $url . "\"><label>" . html_escape(__(getExtraName($extraType, $value))) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -207,9 +209,10 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($selectedUser)) {
+				$url = getFieldUrl($recordType, 'user', null);
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'user', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
-				$html .= "<option selected value=\"\">" . $selectedUser['name'] . "</option>";
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . trim($selectedUser['name']) . "</option>";
 			} elseif (count($facetUsers) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"user\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
@@ -219,7 +222,8 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetUsers as $user) {
-					$html .= "<option value=\"" . $user['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'user', $user['id']) . "\">" . $user['name'] . ($showPopularity ? " (" . $user['count'] . ")" : "") . "</option>";
+					$url = getFieldUrl($recordType, 'user', $user['id']);
+					$html .= "<option value=\"" . $user['id'] . "\" data-url=\"" . $url . "\">" . trim($user['name']) . ($showPopularity ? " (" . $user['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -258,7 +262,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 			// Build first part of the checkboxes tag
 			if (isset($selectedUser)) {
 				$url = getFieldUrl($recordType, 'user', null, $selectedUser);
-				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedUser['name']) . "</b></div>";
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . trim(html_escape($selectedUser['name'])) . "</strong></label></div>";
 				$countCheckboxes++;
 			}
 
@@ -273,7 +277,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 					}
 					
 					$url = getFieldUrl($recordType, 'user', $user['id']);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $user['name'] . "\" data-url=\"" . $url . "\">" . html_escape($user['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $user['count'] . ")</span>" : "") . "</div>";
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . trim($user['name']) . "\" data-url=\"" . $url . "\"><label>" . trim(html_escape($user['name'])) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $user['count'] . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -346,8 +350,9 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 			$addOptions = false;
 			// Build first part of the select tag
 			if ($selectedTagName != '') {
+				$url = getFieldUrl('item', 'tags', null);
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"tag\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'tags', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
 				$html .= "<option selected value=\"\">" . $selectedTagName . "</option>";
 			} elseif (count($facetTags) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"tag\">";
@@ -358,7 +363,8 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetTags as $tag) {
-					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'tags', $tag['name']) . "\">" . $tag['name'] . ($showPopularity ? " (" . $tag['count'] . ")" : "") . "</option>";
+					$url = getFieldUrl('item', 'tags', $tag['name']);
+					$html .= "<option value=\"" . $tag['id'] . "\" data-url=\"" . $url . "\">" . trim($tag['name']) . ($showPopularity ? " (" . $tag['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -398,8 +404,8 @@ function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortO
 			if ($selectedTags != '') {
 				$selectedTagNames = explode(option('tag_delimiter'), $selectedTags);
 				foreach ($selectedTagNames as $selectedTagName) {
-					$url = getTagUrl($selectedTagName);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedTagName) . "</b></div>";
+					$url = getFieldUrl('item', 'tags', null, $selectedTagName);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . trim(html_escape($selectedTagName)) . "</strong></label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -414,8 +420,8 @@ function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortO
 						$hidingSeparator = true;
 					}
 					
-					$url = getTagUrl($tag['name']);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $tag['name'] . "\" data-url=\"" . $url . "\">" . html_escape($tag['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $tag['count'] . ")</span>" : "") . "</div>";
+					$url = getFieldUrl('item', 'tags', $tag['name']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . trim($tag['name']) . "\" data-url=\"" . $url . "\"><label>" . trim(html_escape($tag['name'])) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $tag['count'] . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -485,9 +491,10 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($selectedCollection)) {
+				$url = getFieldUrl('item', 'collection', null);
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"collection\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'collection', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
-				$html .= "<option selected value=\"\">" . $selectedCollection['name'] . "</option>";
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . trim($selectedCollection['name']) . "</option>";
 			} elseif (count($facetCollections) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"collection\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
@@ -497,7 +504,8 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetCollections as $collection) {
-					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'collection', $collection['id']) . "\">" . $collection['name'] . ($showPopularity ? " (" . $collection['count'] . ")" : "") . "</option>";
+					$url = getFieldUrl('item', 'collection', $collection['id']);
+					$html .= "<option value=\"" . $collection['id'] . "\" data-url=\"" . $url . "\">" . trim($collection['name']) . ($showPopularity ? " (" . $collection['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -538,8 +546,8 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedCollection)) {
-				$url = getFieldUrl($recordType, 'collection', null, $selectedCollection);
-				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedCollection['name']) . "</b></div>";
+				$url = getFieldUrl('item', 'collection', null);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . trim(html_escape($selectedCollection['name'])) . "</strong></label></div>";
 				$countCheckboxes++;
 			}
 
@@ -553,8 +561,8 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 						$hidingSeparator = true;
 					}
 					
-					$url = getFieldUrl($recordType, 'collection', $collection['id']);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $collection['name'] . "\" data-url=\"" . $url . "\">" . html_escape($collection['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $collection['count'] . ")</span>" : "") . "</div>";
+					$url = getFieldUrl('item', 'collection', $collection['id']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . trim($collection['name']) . "\" data-url=\"" . $url . "\"><label>" . trim(html_escape($collection['name'])) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $collection['count'] . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -630,9 +638,10 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 			$addOptions = false;
 			// Build first part of the select tag
 			if (!empty($selectedItemType)) {
+				$url = getFieldUrl('item', 'type', null);
 				$html  = "<div class=\"select-cross\"><select class=\"facet-selected\" name=\"type\">";
-				$html .= "<option value=\"\" data-url=\"" . getFieldUrl($recordType, 'type', null) . "\"> " . html_escape(__('Remove filter')) . "...</option>";
-				$html .= "<option selected value=\"\">" . $selectedItemType['name'] . "</option>";
+				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
+				$html .= "<option selected value=\"\">" . trim($selectedItemType['name']) . "</option>";
 			} elseif (count($facetItemTypes) > 0) {
 				$html  = "<div class=\"select-arrow\"><select class=\"facet\" name=\"type\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
@@ -642,7 +651,8 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 			// Build additional part of the select tag (if needed)
 			if ($addOptions) {
 				foreach ($facetItemTypes as $itemType) {
-					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . getFieldUrl($recordType, 'type', $itemType['id']) . "\">" . $itemType['name'] . ($showPopularity ? " (" . $itemType['count'] . ")" : "") . "</option>";
+					$url = getFieldUrl('item', 'type', $itemType['id']);
+					$html .= "<option value=\"" . $itemType['id'] . "\" data-url=\"" . $url . "\">" . trim($itemType['name']) . ($showPopularity ? " (" . $itemType['count'] . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -679,8 +689,8 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 			$html = '<div>';
 			// Build first part of the checkboxes tag
 			if (isset($selectedItemType)) {
-				$url = getFieldUrl($recordType, 'type', null, $selectedItemType);
-				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($selectedItemType['name']) . "</b></div>";
+				$url = getFieldUrl('item', 'type', null);
+				$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . trim(html_escape($selectedItemType['name'])) . "</strong></label></div>";
 				$countCheckboxes++;
 			}
 
@@ -694,8 +704,8 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 						$hidingSeparator = true;
 					}
 					
-					$url = getFieldUrl($recordType, 'type', $itemType['id']);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $itemType['name'] . "\" data-url=\"" . $url . "\">" . html_escape($itemType['name']) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $itemType['count'] . ")</span>" : "") . "</div>";
+					$url = getFieldUrl('item', 'type', $itemType['id']);
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . trim($itemType['name']) . "\" data-url=\"" . $url . "\"><label>" . trim(html_escape($itemType['name'])) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $itemType['count'] . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -820,7 +830,7 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 				$html =	"<div class=\"select-cross\"><select id=\"" . $element_id . "\" class=\"facet-selected\" name=\"" . $elementId . "\">";
 				$url = getElementFieldUrl($recordType, $element_id, null, $isDate);
 				$html .= "<option value=\"\" data-url=\"" . $url . "\"> " . html_escape(__('Remove filter')) . "...</option>";
-				$html .= "<option selected value=\"\">$term</option>";
+				$html .= "<option selected value=\"\">" . trim($term) . "</option>";
 			} elseif (count($facetElement) > 0) {
 				$html =	"<div class=\"select-arrow\"><select id=\"" . $element_id . "\" class=\"facet\" name=\"" . $elementId . "\">";
 				$html .= "<option value=\"\">" . html_escape(__('Select')) . "...</option>";
@@ -831,7 +841,7 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 			if ($addOptions) {
 				foreach ($facetElement as $name => $count) {
 					$url = getElementFieldUrl($recordType, $element_id, $name, $isDate);
-					$html .= "<option value=\"" . $name . "\" data-url=\"" . $url . "\">" . $name . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
+					$html .= "<option value=\"" . trim($name) . "\" data-url=\"" . $url . "\">" . trim($name) . ($showPopularity ? " (" . $count . ")" : "") . "</option>";
 				}
 			}
 			$html .= "</select></div>";
@@ -855,7 +865,7 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 	 * @param limitCheckboxes
 	 * @return html
 	 */
-	function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
 		// Build array
 		if ($elements = getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
 			$facetElement = array();
@@ -890,7 +900,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 			if (!empty($selectedTerms)) {
 				foreach ($selectedTerms as $term){
 					$url = getElementFieldUrl($recordType, $element_id, null, $isDate, $term);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><b>" . html_escape($term) . "</b></div>";
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"\" data-url=\"" . $url . "\" checked><label><strong>" . trim(html_escape($term)) . "</strong></label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -906,7 +916,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 					}
 					
 					$url = getElementFieldUrl($recordType, $element_id, $name, $isDate);
-					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . $name . "\" data-url=\"" . $url . "\">" . html_escape($name) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</div>";
+					$html .= "<div class=\"facet-checkbox\"><input type=\"checkbox\" value=\"" . trim($name) . "\" data-url=\"" . $url . "\"><label>" . trim(html_escape($name)) . ($showPopularity ? "<span class=\"facet-checkbox-count\"> (" . $count . ")</span>" : "") . "</label></div>";
 					$countCheckboxes++;
 				}
 			}
@@ -930,6 +940,7 @@ function getFacetCheckboxesForelement($recordType, $subsetSQL, $elementId = 50,
 	 * @param string $field_id The Element id.
 	 * @param string $value The Element value.
 	 * @param string $isDate 
+	 * @param string $oldValue The Element old value.
 	 * @return string The new URL.
 	 */
 	function getElementFieldUrl($recordType, $field_id, $value = null, $isDate = false, $oldValue = null)
@@ -979,6 +990,7 @@ function getElementFieldUrl($recordType, $field_id, $value = null, $isDate = fal
 	 *
 	 * @param string $filter The filter field name (tags|tag_id|type|collection).
 	 * @param string $value The Element value.
+	 * @param string $oldValue The Element old value.
 	 * @return string The new URL.
 	 */
 	function getFieldUrl($recordType, $filter, $value = null, $oldValue = null)
@@ -996,53 +1008,24 @@ function getFieldUrl($recordType, $filter, $value = null, $oldValue = null)
 
 		// set(unset) current
 		if (!is_null($value)){
-			$params[$filter] = $value;
-		} else {
-			unset($params[$filter]);
-		}
-
-		// return rebuilt route
-		return getRebuiltUrl($recordType, $params);
-	}
-	
-	/**
-	 * Add a Tag Field to Search to the current URL.
-	 *
-	 * @param string $filter The filter field name (tags|tag_id|type|collection).
-	 * @param string $value The Element value.
-	 * @return string The new URL.
-	 */
-	function getTagUrl($value = null)
-	{
-		// Get the current facets.
-		if (!empty($_GET['advanced'])) {
-			$search = $_GET['advanced'];
+			if ($filter != 'tags' || empty($params[$filter])) {
+				$params[$filter] = $value;
+			} else {
+				$tags = explode(option('tag_delimiter'), $params[$filter]);
+				array_push($tags, $value);
+				$params[$filter] = implode(option('tag_delimiter'), $tags);
+			}
 		} else {
-			$search = array();
-		}
-
-		// set previous parameters
-		$params['advanced'] = $search;
-		$params = setPreviousParameters($params);
-
-		// set(unset) current
-		if (!is_null($value)) {
-			if (isset($params['tags'])) {
-				$tags = explode(option('tag_delimiter'), $params['tags']);
-				if (in_array($value, $tags)) {
-					$tagToRemove = array($value);
-					$tags = array_diff($tags, $tagToRemove);
-				} else {
-					$tags[] = $value;
+			if ($filter == 'tags' && $oldValue != '') {
+				if (!empty($params[$filter])) {
+					$tags = explode(option('tag_delimiter'), $params[$filter]);
+					$tags = array_diff($tags, array($oldValue));
+					$params[$filter] = implode(option('tag_delimiter'), $tags);
 				}
-				$params['tags'] = implode(option('tag_delimiter'), $tags);
-		
-				if (empty($params['tags'])) unset($params['tags']);
+				if (empty($params[$filter])) unset($params[$filter]);
 			} else {
-				$params['tags'] = $value;
+				unset($params[$filter]);
 			}
-		} else {
-			unset($params['tags']);
 		}
 
 		// return rebuilt route

From 813e91101a315d7d5bb3b7b4cdfe10db89a04257 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 10:55:37 +0100
Subject: [PATCH 149/161] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b0a9f21..74922f9 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ For **Berlin** theme, instead, check **Block collapsible** option, set **Horizon
 <?php echo pagination_links(); ?>
 ```
 
-Background and foreground colors can be changed in `facets.css` file (`views/public/css` folder).
+Background and foreground colors, as well as other parameters, can be customized in `facets.css` file (`views/public/css` folder).
 
 ## Plugin configuration
 

From 4b1c43848e14394a09c33f2a2dacf21f91176c85 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 10:56:36 +0100
Subject: [PATCH 150/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 7e4a23d..1670e1d 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.7.1"
+version="2.8"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 262c5b0301f885b958b32cb7242c72710528c2be Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 11:22:19 +0100
Subject: [PATCH 151/161] Corrected typo

---
 FacetsPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index 3170a55..c620ce3 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -65,7 +65,7 @@ public function hookUninstall()
 		delete_option('facets_parameters');
 	}
 
-	public function hookUpgrade()
+	public function hookUpgrade($args)
 	{
         $oldVersion = $args['old_version'];
         $newVersion = $args['new_version'];

From 952d5fde980e4b5e31cc7e0e3d385ca4abd632aa Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 11 Dec 2021 11:22:40 +0100
Subject: [PATCH 152/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 1670e1d..53a5e15 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.8"
+version="2.8.1"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From 7efd3cb354c11dc8a32ecdc2f51c95cd99a52382 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 09:52:00 +0200
Subject: [PATCH 153/161] Fixed layout glitch

---
 config_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_form.php b/config_form.php
index ab7e0a7..758df87 100644
--- a/config_form.php
+++ b/config_form.php
@@ -107,7 +107,7 @@
 <h2><?php echo __('Elements'); ?></h2>
 
 <div class="field">
-	<div class="inputs seven columns alpha">
+	<div class="inputs seven columns omega">
 		<p class="explanation">
 			<?php echo __('The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names.'); ?>
 		</p>

From a59e6aec7fbf91a9e11c9222d08739c587930cb7 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:25:22 +0200
Subject: [PATCH 154/161] Modified some properties, moved constansts

---
 FacetsPlugin.php | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/FacetsPlugin.php b/FacetsPlugin.php
index c620ce3..3c72de2 100644
--- a/FacetsPlugin.php
+++ b/FacetsPlugin.php
@@ -1,13 +1,17 @@
 <?php
 /**
  * @copyright Jean-Baptiste HEREN, 2018
- * @copyright Daniele BINAGHI, 2021
+ * @copyright Daniele BINAGHI, 2021-2022
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * @package FacetsPlugin
  */
 
 define('FACETS_PLUGIN_DIR', dirname(__FILE__));
-define('FACETS_MINIMUM_AMOUNT', 5);
+
+define('FACETS_LANGUAGE', array(
+	'ShowMore' => __('show all'),
+	'ShowLess' => __('show less')
+));
 
 require_once FACETS_PLUGIN_DIR . '/helpers/FacetsFunctions.php';
 
@@ -33,11 +37,10 @@ class FacetsPlugin extends Omeka_Plugin_AbstractPlugin
 	public function hookInstall()
 	{
 		set_option('facets_public_hook', 'default');
-		set_option('facets_description', '');
-		set_option('facets_hide_single_entries', 0);
+		set_option('facets_description', 0);
 		set_option('facets_direction', 'vertical');
 		set_option('facets_collapsible', 0);
-		set_option('facets_checkbox_minimum_amount', FACETS_MINIMUM_AMOUNT);
+		set_option('facets_count', 0);
 
 		$defaults = array(
 			'elements' => array('item', 'collection', 'style', 'sort', 'popularity'),
@@ -58,10 +61,9 @@ public function hookUninstall()
 	{
 		delete_option('facets_public_hook');
 		delete_option('facets_description');
-		delete_option('facets_hide_single_entries');
 		delete_option('facets_direction');
 		delete_option('facets_collapsible');
-		delete_option('facets_checkbox_minimum_amount');
+		delete_option('facets_count');
 		delete_option('facets_parameters');
 	}
 
@@ -103,6 +105,11 @@ public function hookUpgrade($args)
 			delete_option('facets_tags_style');
 			delete_option('facets_tags_sort');
 			delete_option('facets_tags_popularity');
+		} elseif (version_compare($oldVersion, '2.9', '<')) {
+			set_option('facets_description', (get_option('facets_description') != '' ? 1 : 0));
+			set_option('facets_count', 0);
+			delete_option('facets_checkbox_minimum_amount');
+			delete_option('facets_hide_single_entries');
 		}
 	}
 
@@ -148,7 +155,7 @@ public function hookConfig($args)
 		set_option('facets_hide_single_entries', $post['facets_hide_single_entries']);
 		set_option('facets_direction', $post['facets_direction']);
 		set_option('facets_collapsible', $post['facets_collapsible']);
-		set_option('facets_checkbox_minimum_amount', $post['facets_checkbox_minimum_amount']);
+		set_option('facets_count', $post['facets_count']);
 
 		$settings = array(
 			'elements' => isset($post['elements']) ? $post['elements'] : array(),
@@ -274,11 +281,7 @@ public function hookPublicHead($args)
 		$action = $request->getActionName();
 		
 		if (($action == 'browse' && ($controller == 'items' || $controller == 'collections')) || ($controller == 'search' && $action == 'index')) {
-			$language = array(
-				'ShowMore' => __('show more'),
-				'ShowLess' => __('show less')
-			);
-			$language = json_encode($language);
+			$language = json_encode(FACETS_LANGUAGE);
 			queue_js_string("facetsLanguage = {language: $language};");
 			queue_js_file('facets');
 			queue_css_file('facets');

From 488b1339d8dac73463a4f2e42fbf9032ce96dc19 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:26:02 +0200
Subject: [PATCH 155/161] Modified layout

---
 views/public/css/facets.css | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/views/public/css/facets.css b/views/public/css/facets.css
index e2216fe..dac6cba 100644
--- a/views/public/css/facets.css
+++ b/views/public/css/facets.css
@@ -47,8 +47,8 @@
 	clear: both;
 }
 
-.facets-container-vertical:not(:last-child), .facets-container-horizontal:not(:last-child) {
-	margin-bottom: 20px;
+.facets-container-vertical, .facets-container-horizontal:not(:last-child) {
+	margin-bottom: 10px;
 }
 
 .facets-container-horizontal {
@@ -99,7 +99,6 @@
 }
 
 #facets-container form label {
-	margin-bottom: 8px;
 	color: #545759;
 }
 
@@ -126,9 +125,11 @@
 }
 
 .facet-visibility-toggle {
-	float: right;
+	float: left;
 	cursor: pointer;
-	line-height: 90%;
+	font-size: 80%;
+	line-height: 100%;
+	margin-bottom: 20px;
 }
 
 .facet-visibility-toggle:hover {
@@ -137,11 +138,19 @@
 
 .facet-checkbox label {
 	font-weight: normal;
+	vertical-align: middle;
+}
+
+.facet-checkbox input[type=checkbox] {
+	margin-right: .2em;
+	vertical-align: middle;
+	position: inherit;
 }
 
 .facet-checkbox-count {
 	float: right;
 	color: #545759;
+	margin-left: .5em;
 }
 
 .hidden {

From 2851450cf9028ac23ed1b090f510d255f75a0696 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:26:59 +0200
Subject: [PATCH 156/161] Removed property, modified property

---
 helpers/FacetsFunctions.php | 136 ++++++++----------------------------
 1 file changed, 28 insertions(+), 108 deletions(-)

diff --git a/helpers/FacetsFunctions.php b/helpers/FacetsFunctions.php
index b4c5606..45a9c49 100644
--- a/helpers/FacetsFunctions.php
+++ b/helpers/FacetsFunctions.php
@@ -39,12 +39,11 @@ function getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder) {
 	 * @param recordType
 	 * @param subsetSQL
 	 * @param extraType
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $sortOrder = 'count_alpha', $showPopularity = false) {
 		if ($extras = getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder)) {
 			// Build array
 			$facetExtras = buildExtrasArray($extras, $extraType);
@@ -52,11 +51,6 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 			// Stores data for selected extra, if any
 			$selectedExtra = getSelectedExtra($facetExtras, $extraType);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetExtras, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetExtras = array_filter($facetExtras, "isNotSingleExtra");
-			}			
-
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($selectedExtra)) {
@@ -91,13 +85,12 @@ function getFacetSelectForExtra($recordType, $subsetSQL, $extraType, $hideSingle
 	 * @param recordType
 	 * @param subsetSQL
 	 * @param extraType
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @param limitCheckboxes
+	 * @param facetsMaxCount
 	 * @return html
 	 */
-	function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		if ($extras = getObjectsForExtra($recordType, $subsetSQL, $extraType, $sortOrder)) {
 			// Build array
 			$facetExtras = buildExtrasArray($extras, $extraType);
@@ -105,11 +98,6 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 			// Stores data for selected extra, if any
 			$selectedExtra = getSelectedExtra($facetExtras, $extraType);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetExtras, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetExtras = array_filter($facetExtras, "isNotSingleExtra");
-			}			
-
 			$countCheckboxes = 0;
 			$html = '<div>';
 			// Build first part of the checkboxes tag
@@ -123,7 +111,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 			// Build additional part of the select tag (if needed)
 			foreach ($facetExtras as $value => $count) {
 				if (!isset($selectedExtra) || $value <> $selectedExtra) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-extras\">";
 						$hidingSeparator = true;
@@ -137,7 +125,7 @@ function getFacetCheckboxesForExtra($recordType, $subsetSQL, $extraType, $hideSi
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-extras\" class=\"facet-visibility-toggle\" data-element-id=\"extras\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-extras\" class=\"facet-visibility-toggle\" data-element-id=\"extras\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -188,12 +176,11 @@ function getObjectsForUser($recordType, $subsetSQL, $sortOrder) {
 	 * Return HTML Select associated with Array of facets extra parameter values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForUser($recordType, $subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false) {
 		if ($users = getObjectsForUser($recordType, $subsetSQL, $sortOrder)) {
 			// Build array
 			$facetUsers = buildUsersArray($users);
@@ -201,11 +188,6 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 			// Stores data for selected user, if any
 			$selectedUser = getSelectedUser($facetUsers);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetUsers, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetUsers = array_filter($facetUsers, "isNotSingleExtra");
-			}			
-
 			$addOptions = false;
 			// Build first part of the select tag
 			if (isset($selectedUser)) {
@@ -238,13 +220,12 @@ function getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries = fal
 	 * Return HTML Checkboxes associated with Array of facets values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @param limitCheckboxes
+	 * @param facetsMaxCount
 	 * @return html
 	 */
-	function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForUser($recordType, $subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		if ($users = getObjectsForUser($recordType, $subsetSQL, $sortOrder)) {
 			// Build array
 			$facetUsers = buildUsersArray($users);
@@ -252,11 +233,6 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 			// Store data for selected user, if any
 			$selectedUser = getSelectedUser($facetUsers);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetUsers, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetUsers = array_filter($facetUsers, "isNotSingleExtra");
-			}			
-
 			$countCheckboxes = 0;
 			$html = '<div>';
 			// Build first part of the checkboxes tag
@@ -270,7 +246,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 			// Build additional part of the select tag (if needed)
 			foreach ($facetUsers as $user) {
 				if ($user != $selectedUser) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-users\">";
 						$hidingSeparator = true;
@@ -284,7 +260,7 @@ function getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries =
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-users\" class=\"facet-visibility-toggle\" data-element-id=\"users\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-users\" class=\"facet-visibility-toggle\" data-element-id=\"users\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -329,12 +305,11 @@ function getObjectsForTag($subsetSQL, $sortOrder) {
 	 * Return HTML Select associated with Array of facets tag values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForTag($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false) {
 		if ($tags = getObjectsForTag($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetTags = buildTagsArray($tags);
@@ -342,11 +317,6 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 			// Stores data for selected tag, if any
 			$selectedTagName = (isset($_GET['tags']) ? $_GET['tags'] : '');
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetTags, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetTags = array_filter($facetTags, "isNotSingleExtra");
-			}			
-
 			$addOptions = false;
 			// Build first part of the select tag
 			if ($selectedTagName != '') {
@@ -379,12 +349,11 @@ function getFacetSelectForTag($subsetSQL, $hideSingleEntries = false, $sortOrder
 	 * Return HTML Checkboxes associated with Array of facets tag values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForTag($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		if ($tags = getObjectsForTag($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetTags = buildTagsArray($tags);
@@ -393,11 +362,6 @@ function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortO
 			$selectedTags = (isset($_GET['tags']) ? $_GET['tags'] : '');
 			$selectedTagNames = explode(option('tag_delimiter'), $selectedTags);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetTags, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetTags = array_filter($facetTags, "isNotSingleExtra");
-			}			
-
 			$countCheckboxes = 0;
 			$html = '<div>';
 			// Build first part of the checkboxes tag
@@ -414,7 +378,7 @@ function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortO
 			// Build additional part of the select tag (if needed)
 			foreach ($facetTags as $tag) {
 				if (!in_array($tag['name'], $selectedTagNames)) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-tags\">";
 						$hidingSeparator = true;
@@ -428,7 +392,7 @@ function getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries = false, $sortO
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-tags\" class=\"facet-visibility-toggle\" data-element-id=\"tags\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-tags\" class=\"facet-visibility-toggle\" data-element-id=\"tags\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -467,12 +431,11 @@ function getObjectsForCollection($subsetSQL) {
 	 * Return HTML Select associated with Array of facets collection values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForCollection($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false) {
 		if ($collections = getObjectsForCollection($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetCollections = buildCollectionsArray($collections);
@@ -480,11 +443,6 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 			// Store data for selected collection, if any
 			$selectedCollection = getSelectedCollection($facetCollections);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetCollections, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetCollections = array_filter($facetCollections, "isNotSingleExtra");
-			}			
-
 			// Sort array (have to do it now instead than in select because of the way we get the Collection name)
 			$facetCollections = sortCollections($facetCollections, $sortOrder);
 
@@ -520,13 +478,12 @@ function getFacetSelectForCollection($subsetSQL, $hideSingleEntries = false, $so
 	 * Return HTML Checkboxes associated with Array of facets values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @param limitCheckboxes
+	 * @param facetsMaxCount
 	 * @return html
 	 */
-	function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForCollection($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		if ($collections = getObjectsForCollection($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetCollections = buildCollectionsArray($collections);
@@ -534,11 +491,6 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 			// Store data for selected collection, if any
 			$selectedCollection = getSelectedCollection($facetCollections);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetCollections, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetCollections = array_filter($facetCollections, "isNotSingleExtra");
-			}			
-
 			// Sort array (have to do it now instead than in select because of the way we get the Collection's name)
 			$facetCollections = sortCollections($facetCollections, $sortOrder);
 
@@ -555,7 +507,7 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 			// Build additional part of the select tag (if needed)
 			foreach ($facetCollections as $collection) {
 				if ($collection != $selectedCollection) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-collections\">";
 						$hidingSeparator = true;
@@ -569,7 +521,7 @@ function getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries = false,
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-collections\" class=\"facet-visibility-toggle\" data-element-id=\"collections\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-collections\" class=\"facet-visibility-toggle\" data-element-id=\"collections\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -617,12 +569,11 @@ function getObjectsForItemType($subsetSQL, $sortOrder) {
 	 * Return HTML Select associated with Array of facets item type values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForItemType($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false) {
 		if ($itemTypes = getObjectsForItemType($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetItemTypes = buildItemTypesArray($itemTypes);
@@ -630,11 +581,6 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 			// Store data for selected item type, if any
 			$selectedItemType = getSelectedItemType($facetItemTypes);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleExtra");
-			}			
-
 			$addOptions = false;
 			// Build first part of the select tag
 			if (!empty($selectedItemType)) {
@@ -667,12 +613,11 @@ function getFacetSelectForItemType($subsetSQL, $hideSingleEntries = false, $sort
 	 * Return HTML Checkboxes associated with Array of facets item type values.
 	 *
 	 * @param subsetSQL
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html.
 	 */
-	function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForItemType($subsetSQL, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		if ($itemTypes = getObjectsForItemType($subsetSQL, $sortOrder)) {
 			// Build array
 			$facetItemTypes = buildItemTypesArray($itemTypes);
@@ -680,11 +625,6 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 			// Store data for selected item type, if any
 			$selectedItemType = getSelectedItemType($facetItemTypes);
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetItemTypes, 'isNotSingleExtra')) > FACETS_MINIMUM_AMOUNT) {
-				$facetItemTypes = array_filter($facetItemTypes, "isNotSingleExtra");
-			}			
-
 			$countCheckboxes = 0;
 			$html = '<div>';
 			// Build first part of the checkboxes tag
@@ -698,7 +638,7 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 			// Build additional part of the select tag (if needed)
 			foreach ($facetItemTypes as $itemType) {
 				if ($itemType != $selectedItemType) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-item-types\">";
 						$hidingSeparator = true;
@@ -712,7 +652,7 @@ function getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries = false, $
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-item-types\" class=\"facet-visibility-toggle\" data-element-id=\"item-types\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-item-types\" class=\"facet-visibility-toggle\" data-element-id=\"item-types\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -790,12 +730,11 @@ function getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sor
 	 * @param subsetSQL
 	 * @param elementId
 	 * @param isDate
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
 	 * @return html
 	 */
-	function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false) {
+	function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $sortOrder = 'count_alpha', $showPopularity = false) {
 		// Build array
 		if ($elements = getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
 			$facetElement = array();
@@ -808,11 +747,6 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 			}
 			$element_id = $element->element_id;
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetElement, 'isNotSingleElement')) > FACETS_MINIMUM_AMOUNT) {
-				$facetElement = array_filter($facetElement, "isNotSingleElement");
-			}			
-
 			// Get current parameters to check if one is selected
 			if (!empty($_GET['advanced'])) {
 				$search = $_GET['advanced'];
@@ -859,13 +793,12 @@ function getFacetSelectForElement($recordType, $subsetSQL, $elementId = 50, $isD
 	 * @param subsetSQL
 	 * @param elementId
 	 * @param isDate
-	 * @param hideSingleEntries
 	 * @param sortOrder
 	 * @param showPopularity
-	 * @param limitCheckboxes
+	 * @param facetsMaxCount
 	 * @return html
 	 */
-	function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $hideSingleEntries = false, $sortOrder = 'count_alpha', $showPopularity = false, $limitCheckboxes = 0) {
+	function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50, $isDate = false, $sortOrder = 'count_alpha', $showPopularity = false, $facetsMaxCount = 0) {
 		// Build array
 		if ($elements = getObjectsForElement($recordType, $subsetSQL, $elementId, $isDate, $sortOrder)) {
 			$facetElement = array();
@@ -878,11 +811,6 @@ function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50,
 			}
 			$element_id = $element->element_id;
 
-			// Remove single entries if required
-			if ($hideSingleEntries && count(array_filter($facetElement, 'isNotSingleElement')) > FACETS_MINIMUM_AMOUNT) {
-				$facetElement = array_filter($facetElement, "isNotSingleElement");
-			}			
-
 			$selectedTerms = array();
 			// Get current parameters to check if one or more are selected
 			if (!empty($_GET['advanced'])) {
@@ -909,7 +837,7 @@ function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50,
 			// Build additional part of the select tag (if needed)
 			foreach ($facetElement as $name => $count) {
 				if (!in_array($name, $selectedTerms)) {
-					if ($limitCheckboxes != 0 && $countCheckboxes >= $limitCheckboxes && !$hidingSeparator) {
+					if ($facetsMaxCount != 0 && $countCheckboxes >= $facetsMaxCount && !$hidingSeparator) {
 						// Add link to show other values
 						$html .= "<div class=\"hidden\" id=\"facet-extra-values-" . $elementId . "\">";
 						$hidingSeparator = true;
@@ -923,7 +851,7 @@ function getFacetCheckboxesForElement($recordType, $subsetSQL, $elementId = 50,
 			
 			if ($hidingSeparator) {
 				$html .= "</div>";
-				$html .= "<a id=\"facet-extra-link-" . $elementId . "\" class=\"facet-visibility-toggle\" data-element-id=\"" . $elementId . "\">" . __('show more') . "</a>";
+				$html .= "<a id=\"facet-extra-link-" . $elementId . "\" class=\"facet-visibility-toggle\" data-element-id=\"" . $elementId . "\">" . FACETS_LANGUAGE['ShowMore'] . "</a>";
 			}
 
 			$html .= "</div>";
@@ -1043,14 +971,6 @@ function isFacetActive($recordType, $element_name, $settings, $extra_name = null
 		return false;
 	}
 	
-	function isNotSingleElement($count) {
-		if ($count > 1) return $count;
-	}
-
-	function isNotSingleExtra($element) {
-		if ($element['count'] > 1) return $element;
-	}
-	
 	function createWhereRecordTypeClause($recordType) {
 		return 'element_texts.record_type = \'' . ucfirst($recordType) . '\'';
 	}

From c660dc09b5192d6c54eed89107209df393c69262 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:28:07 +0200
Subject: [PATCH 157/161] Removed property

---
 views/public/facets/browse.php | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/views/public/facets/browse.php b/views/public/facets/browse.php
index ef5a885..f9521df 100644
--- a/views/public/facets/browse.php
+++ b/views/public/facets/browse.php
@@ -1,9 +1,8 @@
 <?php
 	$facetParameters = json_decode(get_option('facets_parameters'), true);
-	$hideSingleEntries = (bool)get_option('facets_hide_single_entries');
 	$facetsCollapsible = (bool)get_option('facets_collapsible');
 	$facetsDirection = (string)get_option('facets_direction');
-	$checkboxMinCount = (int)get_option('facets_checkbox_minimum_amount');
+	$facetsCount = (int)get_option('facets_count');
 	$dateFields = array('Date', 'Date Available', 'Date Created', 'Date Accepted', 'Date Copyrighted', 'Date Submitted', 'Date Issued', 'Date Modified', 'Date Valid');
 
 	$table = get_db()->getTable('Element');
@@ -24,8 +23,8 @@
 	<button id="facets-title" <?php if ($facetsCollapsible) echo "class=\"facets-collapsed\""; ?>><?php echo html_escape(__('Refine search')) ?></button>
 	<div id="facets-body">
 		<?php 
-			if ($description = get_option('facets_description')) {
-				echo "<p class=\"description\">" . $description . "</p>\n";
+			if (get_option('facets_description') == 1) {
+				echo "<p class=\"description\">" . __("Select values for one or more Elements to narrow down your search.") . "</p>\n";
 			}
 		?>
 		
@@ -37,9 +36,9 @@
 						$isDate = in_array($element->name, $dateFields);
 						$facetParameter = $facetParameters['elements'][$element->name];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-							$html = getFacetCheckboxesForElement($recordType, $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+							$html = getFacetCheckboxesForElement($recordType, $subsetSQL, $element->id, $isDate, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 						} else {
-							$html = getFacetSelectForElement($recordType, $subsetSQL, $element->id, $isDate, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+							$html = getFacetSelectForElement($recordType, $subsetSQL, $element->id, $isDate, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
 
 						if ($html != '') printHtml($html, $element->id, $facetsDirection, $element->name);
@@ -51,9 +50,9 @@
 					if (isFacetActive('item', null, $facetParameters, 'item_types')) {
 						$facetParameter = $facetParameters['item_types'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-							$html = getFacetCheckboxesForItemType($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+							$html = getFacetCheckboxesForItemType($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 						} else {
-							$html = getFacetSelectForItemType($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+							$html = getFacetSelectForItemType($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
 
 						if ($html != '') printHtml($html, 'item-type', $facetsDirection, 'Item Type');
@@ -63,9 +62,9 @@
 					if (isFacetActive('item', null, $facetParameters, 'collections')) {
 						$facetParameter = $facetParameters['collections'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-							$html = getFacetCheckboxesForCollection($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+							$html = getFacetCheckboxesForCollection($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 						} else {
-							$html = getFacetSelectForCollection($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+							$html = getFacetSelectForCollection($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
 
 						if ($html != '') printHtml($html, 'collection', $facetsDirection, 'Collection');
@@ -75,9 +74,9 @@
 					if (isFacetActive('item', null, $facetParameters, 'tags')) {
 						$facetParameter = $facetParameters['tags'];
 						if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-							$html = getFacetCheckboxesForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+							$html = getFacetCheckboxesForTag($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 						} else {
-							$html = getFacetSelectForTag($subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+							$html = getFacetSelectForTag($subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 						}
 
 						if ($html != '') printHtml($html, 'tags', $facetsDirection, 'Tags');
@@ -88,9 +87,9 @@
 				if (isFacetActive($recordType, null, $facetParameters, 'users')) {
 					$facetParameter = $facetParameters['users'];
 					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-						$html = getFacetCheckboxesForUser($recordType, $subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+						$html = getFacetCheckboxesForUser($recordType, $subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 					} else {
-						$html = getFacetSelectForUser($recordType, $subsetSQL, $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+						$html = getFacetSelectForUser($recordType, $subsetSQL, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 					}
 
 					if ($html != '') printHtml($html, 'user', $facetsDirection, 'Owner');
@@ -100,9 +99,9 @@
 				if (isFacetActive($recordType, null, $facetParameters, 'public')) {
 					$facetParameter = $facetParameters['public'];
 					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'public', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'public', (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 					} else {
-						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'public', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'public', (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 					}
 
 					if ($html != '') printHtml($html, 'public', $facetsDirection, 'Public');
@@ -112,9 +111,9 @@
 				if (isFacetActive($recordType, null, $facetParameters, 'featured')) {
 					$facetParameter = $facetParameters['featured'];
 					if (isset($facetParameter['style']) && $facetParameter['style'] == 'checkbox') {
-						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'featured', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $checkboxMinCount);
+						$html = getFacetCheckboxesForExtra($recordType, $subsetSQL, 'featured', (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''), $facetsCount);
 					} else {
-						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'featured', $hideSingleEntries, (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
+						$html = getFacetSelectForExtra($recordType, $subsetSQL, 'featured', (isset($facetParameter['sort']) ? $facetParameter['sort'] : ''), (isset($facetParameter['popularity']) ? $facetParameter['popularity'] : ''));
 					}
 
 					if ($html != '') printHtml($html, 'featured', $facetsDirection, 'Featured');

From d67656cd57c7aa89cd2643fdfb5626bb0e40cb03 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:29:38 +0200
Subject: [PATCH 158/161] Remove property, modified strings

---
 config_form.php | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/config_form.php b/config_form.php
index 758df87..c678327 100644
--- a/config_form.php
+++ b/config_form.php
@@ -17,7 +17,7 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_public_hook', __('Public hooks')); ?>
+		<?php echo $view->formLabel('facets_public_hook', __('Public Hooks')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
@@ -42,39 +42,27 @@
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('Text to be used as additional description (tip: keep it short).'); ?>
+			<?php echo __('If checked, a short description will be shown above all values.'); ?>
 		</p>
-		<?php echo $view->formText('facets_description', get_option('facets_description')); ?>
+		<?php echo $view->formCheckbox('facets_description', get_option('facets_description'), null, array('1', '0')); ?>
     </div>
 </div>
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_hide_single_entries', __('Hide single entries')); ?>
+		<?php echo $view->formLabel('facets_count', __('Facet Count')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
-			<?php echo __('If checked, values with just one entry will not be listed (unless there\'s less than %s entries in the list).', FACETS_MINIMUM_AMOUNT); ?>
+			<?php echo __('For all checkbox style fields, the maximum amount of values to be displayed (0 means all values will be displayed).'); ?>
 		</p>
-		<?php echo $view->formCheckbox('facets_hide_single_entries', get_option('facets_hide_single_entries'), null, array('1', '0')); ?>
+		<?php echo $view->formText('facets_count', get_option('facets_count')); ?>
     </div>
 </div>
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_checkbox_minimum_amount', __('Minimum checkbox count')); ?>
-	</div>
-	<div class="inputs five columns omega">
-		<p class="explanation">
-			<?php echo __('For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed).', FACETS_MINIMUM_AMOUNT); ?>
-		</p>
-		<?php echo $view->formText('facets_checkbox_minimum_amount', get_option('facets_checkbox_minimum_amount')); ?>
-    </div>
-</div>
-
-<div class="field">
-	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_direction', __('Block layout')); ?>
+		<?php echo $view->formLabel('facets_direction', __('Block Layout')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
@@ -94,7 +82,7 @@
 
 <div class="field">
 	<div class="two columns alpha">
-		<?php echo $view->formLabel('facets_collapsible', __('Block collapsible')); ?>
+		<?php echo $view->formLabel('facets_collapsible', __('Collapsible Block')); ?>
 	</div>
 	<div class="inputs five columns omega">
 		<p class="explanation">
@@ -114,11 +102,11 @@
 		<table id="facets_elements-table">
 			<thead>
 				<tr>
-					<th class="boxes"><?php echo __('Element name'); ?></th>
+					<th class="boxes"><?php echo __('Element Name'); ?></th>
 					<th class="boxes"><?php echo __('Item'); ?></th>
 					<th class="boxes"><?php echo __('Collection'); ?></th>
 					<th class="boxes"><?php echo __('Style'); ?></th>
-					<th class="boxes"><?php echo __('Sort order'); ?></th>
+					<th class="boxes"><?php echo __('Sort Order'); ?></th>
 					<th class="boxes"><?php echo __('Popularity'); ?></th>
 				</tr>
 			</thead>

From 0aec6aa68b458d202122a7d5343b52e9f30b558c Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:31:07 +0200
Subject: [PATCH 159/161] Updated strings

---
 languages/eo.mo        | Bin 684 -> 729 bytes
 languages/eo.po        | 135 ++++++++++++++++++++---------------------
 languages/it.mo        | Bin 4425 -> 4182 bytes
 languages/it.po        | 121 ++++++++++++++++++------------------
 languages/template.pot | 109 ++++++++++++++++-----------------
 5 files changed, 178 insertions(+), 187 deletions(-)

diff --git a/languages/eo.mo b/languages/eo.mo
index 8b9b586f9c36439623bbd3265b15c1b6c7b11050..1f4c4f0660401e278ba76c6d57969c2676292ef7 100644
GIT binary patch
delta 304
zcmZ3(dXu&Oo)F7a1|VPuVi_O~0dat!2SR~qZXmlCh<Sl{CJ?g$@p2$$2I6%<%mKuk
zfS41AcLVV?Mh1qXQ2rby1_nMLdl`@h>DvmVLHhOpX)Xo^SB3*X2FT#kK$^iNwK%yb
zv!En1KaU|OH7zqQRiQXFu_!r%AviTBHMxW#v^bTaI3vGYAu%Th!pKQ2F5bAAg>iB^
zqbRSDu7QQFfr)~lft88j<c*9DoUX+MsYQu-CHa$CnKEqyiZY9{i!zh)8G;glre^|8
lFFMi*w9GXpHM^vgA+#!=AvZs-q$pFNASV;X%uUPz@c`YyMN$9&

delta 281
zcmcb~x`ws>o)F7a1|VPqVi_Rz0dat!210>pULd;`h(UBW5QEgt1Y%AgUI3+60qLEL
z3=CU<G#?P>F+u2BAPrLA1EfLvCj)6NAiWSsGX$lYq-Ex%Dio(C7A0o@xw-jesS0VC
zIVGt@48f^6smUb_#TohK3OT98#Sm6*eo^YiBP@)QKQLN}_&EBxhdR2uD%kk=IOJsN
z<rk&fO*UrAv<pfEnwtqUx9CV`ejbBceo<z6CfML2AlEe~HM^vgAvZs-q$pD%H!-Im
JClkg4F#*%dLID5(

diff --git a/languages/eo.po b/languages/eo.po
index c041a3b..5e51c00 100644
--- a/languages/eo.po
+++ b/languages/eo.po
@@ -11,184 +11,181 @@ msgstr ""
 "PO-Revision-Date: 2021-06-13 15:39-0001\n"
 "PO-Revision-Date: 2021-07-05 15:17-0001\n"
 "PO-Revision-Date: 2021-07-18 17:16-0001\n"
+"PO-Revision-Date: 2022-08-04 10:41-0001\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Esperanto\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: FacetsPlugin.php:11
-msgid "show more"
+#: FacetsPlugin.php:280
+msgid "show all"
 msgstr "montri pli"
 
-#: FacetsPlugin.php:12
+#: FacetsPlugin.php:281
 msgid "show less"
 msgstr "montri malpli"
 
-#: browse.php:22
+#: browse.php:23
 msgid "Refine search"
 msgstr "Rafini serĉon"
 
-#: FacetsFunctions.php:59
-#: FacetsFunctions.php:135
-#: FacetsFunctions.php:212
-#: FacetsFunctions.php:315
+#: browse.php:27
+msgid "Select values for one or more Elements to narrow down your search."
+msgstr ""
+
+#: FacetsFunctions.php:62
+#: FacetsFunctions.php:201
+#: FacetsFunctions.php:346
+#: FacetsFunctions.php:534
 msgid "Remove filter"
-msgstr "Forigi filtron"
+msgstr ""
 
-#: FacetsFunctions.php:63
-#: FacetsFunctions.php:139
-#: FacetsFunctions.php:216
-#: FacetsFunctions.php:319
+#: FacetsFunctions.php:66
+#: FacetsFunctions.php:205
+#: FacetsFunctions.php:350
+#: FacetsFunctions.php:538
 msgid "Select"
 msgstr "Elektu"
 
-#: config_form.php:14
+#: config_form.php:16
 msgid "Use"
-msgstr ""
+msgstr "Uzo"
 
-#: config_form.php:18
-msgid "Public hooks"
+#: config_form.php:20
+msgid "Public Hooks"
 msgstr ""
 
-#: config_form.php:22
+#: config_form.php:24
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
 "own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 
-#: config_form.php:35
+#: config_form.php:37
 msgid "Aspect"
 msgstr ""
 
-#: config_form.php:39
+#: config_form.php:41
 msgid "Description"
-msgstr ""
-
-#: config_form.php:43
-msgid "Text to be used as additional description (tip: keep it short)."
-msgstr ""
+msgstr "Priskribo"
 
-#: config_form.php:51
-msgid "Hide single entries"
+#: config_form.php:45
+msgid "If checked, a short description will be shown above all values."
 msgstr ""
 
-#: config_form.php:55
-msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
+#: config_form.php:53
+msgid "Facet Count"
 msgstr ""
 
-#: config_form.php:63
-msgid "Minimum checkbox count"
+#: config_form.php:57
+msgid "For all checkbox style fields, the maximum amount of values to be displayed (0 means all values will be displayed)."
 msgstr ""
 
-#: config_form.php:67
-msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
+#: config_form.php:65
+msgid "Block Layout"
 msgstr ""
 
-#: config_form.php:75
-msgid "Block layout"
-msgstr ""
-
-#: config_form.php:79
+#: config_form.php:69
 msgid "The layout direction of the facets block."
 msgstr ""
 
-#: config_form.php:86
+#: config_form.php:76
 msgid "Horizontal (useful for themes with top main navigation menu)"
 msgstr ""
 
-#: config_form.php:87
+#: config_form.php:77
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:95
-msgid "Block collapsible"
+#: config_form.php:85
+msgid "Collapsible Block"
 msgstr ""
 
-#: config_form.php:99
+#: config_form.php:89
 msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
-#: config_form.php:105
+#: config_form.php:95
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:110
+#: config_form.php:100
 msgid 
 "The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
 "choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:115
-msgid "Element name"
+#: config_form.php:105
+msgid "Element Name"
 msgstr ""
 
-#: config_form.php:116
+#: config_form.php:106
 msgid "Item"
 msgstr ""
 
-#: config_form.php:117
+#: config_form.php:107
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:118
+#: config_form.php:108
 msgid "Style"
 msgstr ""
 
-#: config_form.php:119
-msgid "Sort order"
+#: config_form.php:109
+msgid "Sort Order"
 msgstr ""
 
-#: config_form.php:120
+#: config_form.php:110
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:174
-#: config_form.php:262
+#: config_form.php:164
+#: config_form.php:252
 msgid "Dropdown"
 msgstr ""
 
-#: config_form.php:175
-#: config_form.php:263
+#: config_form.php:165
+#: config_form.php:253
 msgid "Checkbox"
 msgstr ""
 
-#: config_form.php:188
-#: config_form.php:276
+#: config_form.php:178
+#: config_form.php:266
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:189
-#: config_form.php:277
+#: config_form.php:179
+#: config_form.php:267
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:210
+#: config_form.php:200
 msgid "Extra parameters"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Tags"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Owners"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Public"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Featured"
 msgstr ""
\ No newline at end of file
diff --git a/languages/it.mo b/languages/it.mo
index 8d3284f457f85700b04beae357f6440b90bea79f..6178947974d0e7022cbcd5accbb5f2a82ebbe88e 100644
GIT binary patch
delta 1155
zcmYMyOGwl~90%}m*G<=TU0q*2%tj;1NYgS1O?qfjh9=}8I#jc}lm79)|FQpn)<^g#
z=+L1~Ll-aQA)yE(Jt%<$dC5c3A)-TM^bVrvAQD~r{&b^dcRw@#ncrh(cd_ynAA1|k
zyvgv|j!zjrT^TfE?7Hv2xftHSd>tHzG@pRka0(W{S(pPCVF<oV`wr5+?~vk_({rDn
zv3$nHSO^0OD1)?d2lQYaJOJ;&gYZ2Zg_W6%;ms!SMFl4zHTEz)pMzU5Ur0ay0;%v1
z7>0k+1_Kl~##ku^l&Boy&8qN)J#07p0PA5Kx3V5psxTkUVhp{oN!SSQL2CRn48osq
z8vB1k%6lIVF=Vrl8h8v#;4>ISefALp+PIR|hY8(C7#6|}kOHeA6>5aVumw`0Gm!RQ
zga(el4p@MP?eILj1*afNunt@Y<vk6@DA2}$9E26{Dx^Y_kP1J5Q8*9t;0s8JmLSD_
zgLHGt>F0l77&j0=@LgDlpq*HskF4eW3Qu7EE5ahHzfBYV36!WU-;Db<SJ+}mr8H~q
zk@4P`8f4ANwnd+3#caus*ec#@Ui<cCbeKH<mIe`*nm4PIqgksII_1g)YgH~6w$0<|
z1l-d@2)$rQJK^o(x<~S)7&OA)P&i;=Urh3Z<@KSgOjOmFNB*|Gf_pv6)jT1+xNG%k
zOF8`CUaSl_T*OqrTrJZt?3DCs%!>bt`IH$kp+HN<G1D2SDxwT0-Gp@6De8cAiEeM^
zNnp+wMth9%a9etwxt9IL6a|aJd#Y>qSJ&3_y4r^NI&(Hy8fg&@y2i0BM|AgCW;DpN
zj%#6C!ZFjqVRJZVTa>OOu6SHI+7(vJvZawZiIR5Vc~(+!CzX^gmW3y6EIrNX^kc<r
z40V{xp>s_sNAQ>{ahA2SUcyl&@0YH-aGNKUhnyO>q553G1=lI9EpBm~S-Dn?c^;ZD
rOS$EShetNyr06m!9j$O)w84&Q3%`NZa%Lrb$RDL(#ny6i>{IM7oe1mY

delta 1483
zcmZ9KL1<h>7{@1@P2*;hHr=WP)6%aM<3`p{(1OOGT{Ug0+wGwngreZ&y-9Z3c{96j
z<~2zvT|p1(NgcekD0nCqgi0@h&`U1%AbL>{MGxlEn+MSxRQ%7&lY-0a{N8-;d*Ao}
zzHh##J4XgT*UBF<{Ob50!2i{uaANFg=^n@Ncn#-W;0<su_&FHto8W!mx8NA~16T#O
z3jS8S{|gNMBf~rXHE@!#0h=le4X_V~W8gmUIyeu030?uWK?Sar8N*^**h0d);Dg}r
zU=Uax*|FEahjBg#2740>0v5pua4F}2v8Zt9gIH`GTS#yPd=7jQ{1w~;BXs9FqRrr3
zMcL5Aj)BjBPlFXOD>wk(hyOcZ5ITiz6r2WY;4C<S{H%$GP{A1xi>(ywgQ1m|!O)Sn
z!Jzyqh?wjK_yBkd41RaO55Vuh{a_cyHuwhk5%>*gK!Y{}p}&BG5cn=0j(~rIArK);
zU;{i1J_Uw^=RhnLVG9-X!QJ3nU<l|zG>Kg+&YyrU;rtmmflh3LpMtygF!mViHz(Pl
zJn)aW2`|I21%|{&al@d6&F}T^mJU`UqZIF1xvYf$xHRRzE*%}x{-4sJCk1y|Dq?oR
zq{Nk?6)99~DYH_qlIseJx+1!;Y}U!T4J8_sNbO%4o~y^w_7vX`@ysk+l(C@jg%TvR
zOQo=E(WLT{(azr-o$_A|Py5-j8?5Yv6LEtsa+L{7YtnV;d}bXPz4P$~Y!IT2qh&!#
zS|?(vXIcqsgQ8SCYN<GIO^?|BQj*lU;_wMXopK_{H|lKkAn3Hz`(%<O_bQ4^7W9=D
zhPwWb^317FAnWi|%Q|A+kuyO+W|5v-;&CjUG@2`lg^g0#3n!{O*_)#aLi9*FvR#uR
z_pK*Jz9{Vu8W}8Wl$ccb?a`keYH{lx@1$H?#hpp#=)_X1MeXM41%IGI_qUqulS|E$
z3pC$q9anPJq^r;R7b=%)&npu}h9dMc<#JhKjJGS({?AI}`(tNH7|G^Xdw-i-c*HXF
z7TwP$VwCig)z|&)>U)E;7?M!pQmDf52L0a=J=b(mq|m1g!Ba=vNvd;71Pr(dxknTt
za~N_f(qRNeMlEp9@|kf=;6)Q<@NtH9WX~x7+W4Nsn1W0UX}m}gl0y(K4T9vg;hOsM
z<AZZ&9ZF;iP9mps7>cl%M$9n{p5jiL1mEOS2*rqeIC)u!RYxQ%SCuq#lyL2Y7O4uo
YOP#@J$`i+jYe6|nj72wb>s@Ntzc+YXcK`qY

diff --git a/languages/it.po b/languages/it.po
index 72676cc..6cc833e 100644
--- a/languages/it.po
+++ b/languages/it.po
@@ -10,18 +10,19 @@ msgstr ""
 "POT-Creation-Date: 2021-06-08 13:56-0001\n"
 "PO-Revision-Date: 2021-06-13 15:39-0001\n"
 "PO-Revision-Date: 2021-07-05 15:17-0001\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2022-08-04 10:41-0001\n"
+"Last-Translator: Daniele Binaghi <EMAIL@ADDRESS>\n"
+"Language-Team: Italian\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: FacetsPlugin.php:11
-msgid "show more"
-msgstr "mostra altro"
+#: FacetsPlugin.php:280
+msgid "show all"
+msgstr "mostra tutto"
 
-#: FacetsPlugin.php:12
+#: FacetsPlugin.php:281
 msgid "show less"
 msgstr "mostra meno"
 
@@ -29,6 +30,10 @@ msgstr "mostra meno"
 msgid "Refine search"
 msgstr "Raffina la ricerca"
 
+#: browse.php:27
+msgid "Select values for one or more Elements to narrow down your search."
+msgstr ""
+
 #: FacetsFunctions.php:62
 #: FacetsFunctions.php:201
 #: FacetsFunctions.php:346
@@ -43,15 +48,15 @@ msgstr "Rimuovi filtro"
 msgid "Select"
 msgstr "Seleziona"
 
-#: config_form.php:14
+#: config_form.php:16
 msgid "Use"
 msgstr "Utilizzo"
 
-#: config_form.php:18
-msgid "Public hooks"
+#: config_form.php:20
+msgid "Public Hooks"
 msgstr "Hook pubblici"
 
-#: config_form.php:22
+#: config_form.php:24
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
@@ -62,67 +67,59 @@ msgstr ""
 "quello proprio del plugin (<code>public_facets</code>), che deve essere codificato nelle giuste pagine del tema "
 "ma può essere usato ovunque lo si ritenga opportuno."
 
-#: config_form.php:35
+#: config_form.php:37
 msgid "Aspect"
 msgstr "Aspetto"
 
-#: config_form.php:39
+#: config_form.php:41
 msgid "Description"
 msgstr "Descrizione"
 
-#: config_form.php:43
-msgid "Text to be used as additional description (tip: keep it short)."
-msgstr "Testo da usare come descrizione addizionale (consiglio: mantenerlo corto)."
-
-#: config_form.php:51
-msgid "Hide single entries"
-msgstr "Nascondi valori singoli"
+#: config_form.php:45
+msgid "If checked, a short description will be shown above all values."
+msgstr "Se selezionata, una breve descrizione verrà mostrata sopra a tutti i valori."
 
-#: config_form.php:55
-msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
-msgstr "Se selezionata, i valori singoli non verranno elencati (a meno che non ci siano meno di %s valori nella lista)."
+#: config_form.php:53
+msgid "Facet Count"
+msgstr "Massimo numero caselle"
 
-#: config_form.php:63
-msgid "Minimum checkbox count"
-msgstr "Minimo numero caselle di controllo"
-
-#: config_form.php:67
-msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
+#: config_form.php:57
+msgid "For all checkbox style fields, the maximum amount of values to be displayed (0 means all values will be displayed)."
 msgstr 
-"Per tutti i campi che usano lo stile casella di controllo, numero minimo di valori da mostrare (0 significa "
+"Per tutti i campi che usano lo stile casella di controllo, numero massimo di valori da mostrare (0 significa "
 "che tutti i valori verranno mostrati)."
 
-#: config_form.php:75
+#: config_form.php:65
 msgid "Block layout"
 msgstr "Layout blocco"
 
-#: config_form.php:79
+#: config_form.php:69
 msgid "The layout direction of the facets block."
 msgstr "La direzione del layout del blocco filtri."
 
-#: config_form.php:86
+#: config_form.php:76
 msgid "Horizontal (useful for themes with top main navigation menu)"
 msgstr "Orizzontale (utile per i temi con un menu di navigazione principale superiore)"
 
-#: config_form.php:87
+#: config_form.php:77
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr "Verticale (utile per i temi con un menu di navigazione principale laterale)"
 
-#: config_form.php:95
-msgid "Block collapsible"
+#: config_form.php:85
+msgid "Collapsible Block"
 msgstr "Blocco contraibile"
 
-#: config_form.php:99
+#: config_form.php:89
 msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 "Se selezionata, il blocco filtri sarà contraibile (consiglio: dal momento che utilizza meno spazio, è particolarmente "
 "utile con i temi a layout orizzontale)."
 
-#: config_form.php:105
+#: config_form.php:95
 msgid "Elements"
 msgstr "Elementi"
 
-#: config_form.php:110
+#: config_form.php:100
 msgid 
 "The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
 "choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
@@ -131,74 +128,74 @@ msgstr
 "per (dis)attivare, Stile per scegliere lo stile del campo, Ordinamento per scegliere il criterio di ordinamento, "
 "Popolarità per mostrare i contatori vicino ai nomi."
 
-#: config_form.php:115
-msgid "Element name"
+#: config_form.php:105
+msgid "Element Name"
 msgstr "Nome elemento"
 
-#: config_form.php:116
+#: config_form.php:106
 msgid "Item"
 msgstr "Documento"
 
-#: config_form.php:117
+#: config_form.php:107
 msgid "Collection"
 msgstr "Collezione"
 
-#: config_form.php:118
+#: config_form.php:108
 msgid "Style"
 msgstr "Stile"
 
-#: config_form.php:119
-msgid "Ordinamento"
-msgstr ""
+#: config_form.php:109
+msgid "Sort Order"
+msgstr "Ordinamento"
 
-#: config_form.php:120
+#: config_form.php:110
 msgid "Popularity"
 msgstr "Popolarità"
 
-#: config_form.php:174
-#: config_form.php:262
+#: config_form.php:164
+#: config_form.php:252
 msgid "Dropdown"
 msgstr "Discesa (casella a)"
 
-#: config_form.php:175
-#: config_form.php:263
+#: config_form.php:165
+#: config_form.php:253
 msgid "Checkbox"
 msgstr "Controllo (casella di)"
 
-#: config_form.php:188
-#: config_form.php:276
+#: config_form.php:178
+#: config_form.php:266
 msgid "Alphabetical"
 msgstr "Alfabetico"
 
-#: config_form.php:189
-#: config_form.php:277
+#: config_form.php:179
+#: config_form.php:267
 msgid "Popularity first, then alphabetical"
 msgstr "Popolarità prima, poi alfabetico"
 
-#: config_form.php:210
+#: config_form.php:200
 msgid "Extra parameters"
 msgstr "Parametri addizionali"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Item Types"
 msgstr "Tipologie documento"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Collections"
 msgstr "Collezioni"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Tags"
 msgstr "Etichette"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Owners"
 msgstr "Proprietari"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Public"
 msgstr "Pubblico"
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Featured"
 msgstr "In Evidenza"
\ No newline at end of file
diff --git a/languages/template.pot b/languages/template.pot
index ec3ecdb..c91e972 100644
--- a/languages/template.pot
+++ b/languages/template.pot
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2021-06-13 15:39-0001\n"
 "PO-Revision-Date: 2021-07-05 15:17-0001\n"
 "PO-Revision-Date: 2021-07-18 17:16-0001\n"
+"PO-Revision-Date: 2022-08-04 10:41-0001\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,11 +19,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: FacetsPlugin.php:11
-msgid "show more"
+#: FacetsPlugin.php:280
+msgid "show all"
 msgstr ""
 
-#: FacetsPlugin.php:12
+#: FacetsPlugin.php:281
 msgid "show less"
 msgstr ""
 
@@ -30,6 +31,10 @@ msgstr ""
 msgid "Refine search"
 msgstr ""
 
+#: browse.php:27
+msgid "Select values for one or more Elements to narrow down your search."
+msgstr ""
+
 #: FacetsFunctions.php:62
 #: FacetsFunctions.php:201
 #: FacetsFunctions.php:346
@@ -44,151 +49,143 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: config_form.php:14
+#: config_form.php:16
 msgid "Use"
 msgstr ""
 
-#: config_form.php:18
-msgid "Public hooks"
+#: config_form.php:20
+msgid "Public Hooks"
 msgstr ""
 
-#: config_form.php:22
+#: config_form.php:24
 msgid ""
 "The hooks you want to use: Omeka's default <code>public_items_browse</code> and <code>public_collections_browse</code>, "
 "already coded into every page (so no changes are needed), normally showing up at the end of the page; or the plugin's "
 "own <code>public_facets</code>, that has to be coded into relevant theme pages but can be used wherever deemed right."
 msgstr ""
 
-#: config_form.php:35
+#: config_form.php:37
 msgid "Aspect"
 msgstr ""
 
-#: config_form.php:39
+#: config_form.php:41
 msgid "Description"
 msgstr ""
 
-#: config_form.php:43
-msgid "Text to be used as additional description (tip: keep it short)."
-msgstr ""
-
-#: config_form.php:51
-msgid "Hide single entries"
-msgstr ""
-
-#: config_form.php:55
-msgid "If checked, values with just one entry will not be listed (unless there's less than %s entries in the list)."
+#: config_form.php:45
+msgid "If checked, a short description will be shown above all values."
 msgstr ""
 
-#: config_form.php:63
-msgid "Minimum checkbox count"
+#: config_form.php:53
+msgid "Facet Count"
 msgstr ""
 
-#: config_form.php:67
-msgid "For all fields using the checkbox style, minimum amount of values to be displayed (0 means all values displayed)."
+#: config_form.php:57
+msgid "For all checkbox style fields, the maximum amount of values to be displayed (0 means all values will be displayed)."
 msgstr ""
 
-#: config_form.php:75
-msgid "Block layout"
+#: config_form.php:65
+msgid "Block Layout"
 msgstr ""
 
-#: config_form.php:79
+#: config_form.php:69
 msgid "The layout direction of the facets block."
 msgstr ""
 
-#: config_form.php:86
+#: config_form.php:76
 msgid "Horizontal (useful for themes with top main navigation menu)"
 msgstr ""
 
-#: config_form.php:87
+#: config_form.php:77
 msgid "Vertical (useful for themes with side main navigation menu)"
 msgstr ""
 
-#: config_form.php:95
-msgid "Block collapsible"
+#: config_form.php:85
+msgid "Collapsible Block"
 msgstr ""
 
-#: config_form.php:99
+#: config_form.php:89
 msgid "If checked, facets block will be collapsible (tip: as it saves space, it's particularly useful with horizontal theme layouts)."
 msgstr ""
 
-#: config_form.php:105
+#: config_form.php:95
 msgid "Elements"
 msgstr ""
 
-#: config_form.php:110
+#: config_form.php:100
 msgid 
 "The elements that can be used for search refinement. Item and Collection columns to (de)activate, Style column to "
 "choose the facet style, Sort order column to choose sorting order, Popularity column to show counters near names."
 msgstr ""
 
-#: config_form.php:115
-msgid "Element name"
+#: config_form.php:105
+msgid "Element Name"
 msgstr ""
 
-#: config_form.php:116
+#: config_form.php:106
 msgid "Item"
 msgstr ""
 
-#: config_form.php:117
+#: config_form.php:107
 msgid "Collection"
 msgstr ""
 
-#: config_form.php:118
+#: config_form.php:108
 msgid "Style"
 msgstr ""
 
-#: config_form.php:119
-msgid "Sort order"
+#: config_form.php:109
+msgid "Sort Order"
 msgstr ""
 
-#: config_form.php:120
+#: config_form.php:110
 msgid "Popularity"
 msgstr ""
 
-#: config_form.php:174
-#: config_form.php:262
+#: config_form.php:164
+#: config_form.php:252
 msgid "Dropdown"
 msgstr ""
 
-#: config_form.php:175
-#: config_form.php:263
+#: config_form.php:165
+#: config_form.php:253
 msgid "Checkbox"
 msgstr ""
 
-#: config_form.php:188
-#: config_form.php:276
+#: config_form.php:178
+#: config_form.php:266
 msgid "Alphabetical"
 msgstr ""
 
-#: config_form.php:189
-#: config_form.php:277
+#: config_form.php:179
+#: config_form.php:267
 msgid "Popularity first, then alphabetical"
 msgstr ""
 
-#: config_form.php:210
+#: config_form.php:200
 msgid "Extra parameters"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Item Types"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Collections"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Tags"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Owners"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Public"
 msgstr ""
 
-#: config_form.php:225
+#: config_form.php:215
 msgid "Featured"
 msgstr ""
\ No newline at end of file

From 1de13d082c4bd1bbf4922c444aaf7cce4e6e3561 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Thu, 4 Aug 2022 14:31:34 +0200
Subject: [PATCH 160/161] Update plugin.ini

---
 plugin.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin.ini b/plugin.ini
index 53a5e15..df2ea7d 100644
--- a/plugin.ini
+++ b/plugin.ini
@@ -5,6 +5,6 @@ description="Adds a faceted navigation block to narrow down Items and Collection
 license="GPLv3"
 link="https://github.com/DBinaghi/plugin-Facets"
 support_link="https://github.com/DBinaghi/plugin-Facets/issues"
-version="2.8.1"
+version="2.9"
 omeka_minimum_version="2.6.1"
 omeka_target_version="2.6.1"

From ce05d0c5961f1907fa58b88d89b4aa5f551b5160 Mon Sep 17 00:00:00 2001
From: DBinaghi <39097246+DBinaghi@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:46:24 +0200
Subject: [PATCH 161/161] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74922f9..6beefc8 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Then install it like any other Omeka plugin.
 
 ## (optional) Theme customization
 
-Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_items_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used; in such a case, the use of [get_specific_plugin_hook_output](http://omeka.readthedocs.io/en/latest/Reference/libraries/globals/get_specific_plugin_hook_output.html) function is suggested. 
+Facets will appear by default in the **Items browse** and **Collections browse** pages, where the `public_items_browse` and `public_collections_browse` hooks are set. It is possible to use instead a custom `public_facets` hook, that can be positioned wherever needed (`YOUR_THEME/items/browse.php` or `YOUR_THEME/common/header.php`, f.i.) according to the theme used; in such a case, the use of [get_specific_plugin_hook_output](http://omeka.readthedocs.io/en/latest/Reference/libraries/globals/get_specific_plugin_hook_output.html) function is suggested. 
 
 For **Thanks, Roy** theme, for example, best way is to change `common/header.php` code using the custom hook, while unchecking **Block collapsible** option and setting **Vertical** as **Block layout**:
 ```php