Merge pull request #357 from aledeg/filters

Modification des filtres

4 files changed, 26 insertions, 15 deletions

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 566304353..1fabac996 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -130,45 +130,37 @@
 
 			<?php
 				$url_state = $url;
-				if ($this->state !== 'all') {
-					$url_state['params']['state'] = 'all';
+				$url_state['params']['state'] = 'all';
 			?>
-			<li class="item">
+			<li class="item <?php if ($this->state == 'all') echo "selected"?>">
 				<a class="print_all" href="<?php echo Minz_Url::display ($url_state); ?>">
 					<?php echo Minz_Translate::t ('show_all_articles'); ?>
 				</a>
 			</li>
 			<?php
-				}
-				if ($this->state !== 'not_read') {
-					$url_state['params']['state'] = 'not_read';
+				$url_state['params']['state'] = 'not_read';
 			?>
-			<li class="item">
+			<li class="item <?php if ($this->state == 'not_read') echo "selected"?>">
 				<a class="print_non_read" href="<?php echo Minz_Url::display ($url_state); ?>">
 					<?php echo Minz_Translate::t ('show_not_reads'); ?>
 				</a>
 			</li>
 			<?php
-				}
-				if ($this->state !== 'read') {
 					$url_state['params']['state'] = 'read';
 			?>
-			<li class="item">
+			<li class="item <?php if ($this->state == 'read') echo "selected"?>">
 				<a class="print_read" href="<?php echo Minz_Url::display ($url_state); ?>">
 					<?php echo Minz_Translate::t ('show_read'); ?>
 				</a>
 			</li>
 			<?php
-				}
-				if ($this->state != 'favorite') {
 					$url_state['params']['state'] = 'favorite';
 			?>
-			<li class="item">
-				<a class="print_read" href="<?php echo Minz_Url::display ($url_state); ?>">
+			<li class="item <?php if ($this->state == 'favorite') echo "selected"?>">
+				<a class="print_favorite" href="<?php echo Minz_Url::display ($url_state); ?>">
 					<?php echo Minz_Translate::t ('show_favorite'); ?>
 				</a>
 			</li>
-			<?php } ?>
 
 			<li class="separator"></li>
 
diff --git a/p/themes/default/global.css b/p/themes/default/global.css
index 2cc195f90..d3a5cc68c 100644
--- a/p/themes/default/global.css
+++ b/p/themes/default/global.css
@@ -398,6 +398,12 @@ input, select, textarea {
 			font-size: 90%;
 			line-height: 30px;
 		}
+		.dropdown-menu .item.selected{
+			background: #0062be;
+		}
+		.dropdown-menu .item.selected a{
+			color: #fff;
+		}
 			.dropdown-menu .item > * {
 				display: block;
 				padding: 0 25px;
diff --git a/p/themes/default_dark/global.css b/p/themes/default_dark/global.css
index 40694045a..a9c83d9de 100644
--- a/p/themes/default_dark/global.css
+++ b/p/themes/default_dark/global.css
@@ -386,6 +386,12 @@ input, select, textarea {
 			font-size: 90%;
 			line-height: 30px;
 		}
+		.dropdown-menu .item.selected{
+			background: #26303f;
+		}
+		.dropdown-menu .item.selected a{
+			color: #888;
+		}
 			.dropdown-menu .item > * {
 				display: block;
 				padding: 0 25px;
diff --git a/p/themes/flat-design/global.css b/p/themes/flat-design/global.css
index c24a9f481..7686b3662 100644
--- a/p/themes/flat-design/global.css
+++ b/p/themes/flat-design/global.css
@@ -387,6 +387,13 @@ input, select, textarea {
 			font-size: 90%;
 			line-height: 30px;
 		}
+		.dropdown-menu .item.selected{
+			background: #2980b9;
+		}
+		.dropdown-menu .item.selected a{
+			background: #2980b9;
+			color: #fff;
+		}
 			.dropdown-menu .item > * {
 				display: block;
 				padding: 0 25px;