chore: tag filtering is now in line with tags display

Author: jdalsem

languages/en.php

@@ -29,7 +29,6 @@
 	'questions:menu:filter:todo' => "Todo",
 	'questions:menu:filter:todo_group' => "Group Todo",
 	'questions:menu:filter:experts' => "Experts",
-	'questions:menu:filter:tags' => "Tags: %s",
 
 	'river:object:question:create' => '%s asked question %s',
 	'river:object:question:comment' => '%s commented on the question %s',
@@ -39,6 +38,8 @@
 	'questions' => 'Questions',
 	'questions:marked:correct' => 'Correct answer provided',
 
+	'questions:filter_by_tag' => 'Filter by tag',
+	
 	'questions:everyone' => 'All Questions',
 	'questions:add' => 'Add a Question',
 	'questions:todo' => 'Todo',

languages/nl.php

@@ -12,6 +12,7 @@
   'collection:object:answer' => 'Antwoorden',
   'questions:marked:correct' => 'Juiste antwoord is gegeven',
   'widget:questions:edit:group' => 'Beperk de vragen tot de opgegeven groep',
+  'questions:filter_by_tag' => 'Verfijn met tags',
   'questions:menu:filter:tags' => 'Tags: %s',
   'questions:notification:auto_close:subject' => 'De vraag \'%s\' is gesloten vanwege inactiviteit',
   'questions:notification:auto_close:summary' => 'De vraag \'%s\' is gesloten vanwege inactiviteit',

views/default/css/questions/site.css

@@ -9,13 +9,9 @@
 		display: inline-block;
 	}
 
-	li {
-		border: 1px solid $(border-color-strong);
-	    padding: 0 .5rem;
-	    border-radius: 4px;
-	    
-	    a {
-	    	text-decoration: none;
+	li.elgg-tag {
+		a {
+	    	line-height: inherit;
 	    }
 	}	    
 }

views/default/questions/filter.php

@@ -25,14 +25,6 @@
 	return $qb->compare("{$main_alias}.entity_guid", 'in', $subquery->getSQL());
 };
 
-$menu_options = [
-	'class' => ['elgg-menu-hz'],
-];
-
-$content_options = [
-	'class' => ['questions-tags-filter'],
-];
-
 $items = [];
 foreach ($tags as $tag) {
 	$new_tags = $tags;
@@ -71,24 +63,17 @@
 	}
 }
 
-if (empty($tags) && !empty($items)) {
-	// add show filter
-	$content_options['class'][] = 'hidden';
-	
-	elgg_register_menu_item('filter:questions', [
-		'name' => 'show_tags',
-		'icon' => 'filter',
-		'text' => elgg_echo('filter'),
-		'href' => false,
-		'priority' => 9999,
-		'data-toggle-selector' => '.questions-tags-filter',
-		'rel' => 'toggle',
-	]);
+if (empty($items)) {
+	return;
 }
 
-$menu_options['items'] = $items;
-
-$content = elgg_format_element('strong', [], elgg_echo('filter') . ': ');
-$content .= elgg_view_menu('questions_tags', $menu_options);
+$content = elgg_format_element('strong', [], elgg_echo('questions:filter_by_tag') . ': ');
+$content .= elgg_view_menu('questions_tags', [
+	'class' => ['elgg-menu-hz'],
+	'items' => $items,
+	'item_class' => 'elgg-tag',
+]);
 
-echo elgg_format_element('div', $content_options, $content);
+echo elgg_format_element('div', [
+	'class' => ['questions-tags-filter', 'elgg-tags'],
+], $content);