From 645224a303c5672b318b62ff294302a9e82abe06 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Mon, 3 Oct 2022 21:50:40 +0200
Subject: Improved: Remove <li> as separator (#4597)

* templates

* themes

* fix

* fix

* fixes

* fix
---
 app/layout/nav_menu.phtml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index ee15cfe61..e8c4170c9 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -50,16 +50,17 @@
 					</li>
 				<?php endforeach; ?>
 
-				<?php if (count(FreshRSS_Context::$user_conf->queries) > 0) { ?>
-				<li class="separator"></li>
-				<?php } ?>
-
 				<?php
-					$url_query = Minz_Request::currentRequest();;
+					$classSeparator = '';
+					if (count(FreshRSS_Context::$user_conf->queries) > 0) {
+						$classSeparator = ' separator';
+					}
+
+					$url_query = Minz_Request::currentRequest();
 					$url_query['c'] = 'configure';
 					$url_query['a'] = 'bookmarkQuery';
 				?>
-				<li class="item"><a href="<?= Minz_Url::display($url_query) ?>"><?= _i('bookmark-add') ?> <?= _t('index.menu.bookmark_query') ?></a></li>
+				<li class="item<?= $classSeparator ?>"><a href="<?= Minz_Url::display($url_query) ?>"><?= _i('bookmark-add') ?> <?= _t('index.menu.bookmark_query') ?></a></li>
 			</ul>
 			<a class="dropdown-close" href="#close">❌</a>
 		</div>
@@ -112,7 +113,6 @@
 						formaction="<?= Minz_Url::display($mark_read_url) ?>"
 						type="submit"><?= $string_mark ?></button>
 				</li>
-				<li class="separator"></li>
 <?php
 	$today = @strtotime('today');
 	$mark_before_today = $mark_read_url;
@@ -121,7 +121,7 @@
 	$mark_before_one_week['params']['idMax'] = ($today - 604800) . '000000';
 	$mark_unread_enabled = FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ) or !FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ);
 ?>
-				<li class="item">
+				<li class="item separator">
 					<button class="as-link <?= $confirm ?>"
 						form="mark-read-menu"
 						formaction="<?= Minz_Url::display($mark_before_today) ?>"
@@ -133,8 +133,7 @@
 						formaction="<?= Minz_Url::display($mark_before_one_week) ?>"
 						type="submit"><?= _t('index.menu.before_one_week') ?></button>
 				</li>
-				<li class="separator"></li>
-				<li class="item">
+				<li class="item separator">
 					<button class="as-link <?= $mark_unread_enabled ? $confirm : '" disabled="disabled' ?>"
 						form="mark-read-menu"
 						formaction="<?= Minz_Url::display($mark_unread_url) ?>"
-- 
cgit v1.2.3