From 4135cf1ce8eeecf82da3678938d8d01acabc6c76 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 13 Jan 2025 11:24:11 +0100
Subject: [PATCH] Bug 38714: usermenu.inc [opac]

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../bootstrap/en/includes/usermenu.inc        | 116 +++---------------
 1 file changed, 20 insertions(+), 96 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 828e1398f7..03db2086a7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -3,176 +3,100 @@
 [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && loggedinusername ) %]
     <div id="menu">
         <ul>
-            [% IF ( userview ) %]
-                <li class="active">
-            [% ELSE %]
-                <li>
-            [% END %]
+            <li [% IF userview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-user.pl">Summary</a></li>
             [% IF ( OPACFinesTab ) %]
-                [% IF ( accountview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF accountview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-account.pl">Charges</a></li>
             [% END %]
 
-            [% IF ( userupdateview ) %]
-                <li class="active">
-            [% ELSE %]
-                <li>
-            [% END %]
+            <li [% IF userupdateview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-memberentry.pl">Personal details</a></li>
 
             [% IF Koha.Preference('PrivacyPolicyConsent') || KohaPlugins.feature_enabled('patron_consent_type') %]
-                [% IF consentview %]<li class="active">[% ELSE %]<li>[% END %]
+                <li [% IF consentview %]class="active"[% END %]>
                     <a href="/cgi-bin/koha/opac-patron-consent.pl">Consents</a>
                 </li>
             [% END %]
 
             [% IF Koha.Preference( 'TagsEnabled' ) == 1 %]
-                [% IF ( tagsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF tagsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-tags.pl?mine=1">Tags</a></li>
             [% END %]
 
             [% IF logged_in_user.category.effective_change_password %]
-                [% IF ( passwdview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF passwdview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-passwd.pl">Change password</a></li>
             [% END %]
 
             [% IF EnableOpacSearchHistory %]
-                [% IF ( searchhistoryview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF searchhistoryview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-search-history.pl">Search history</a></li>
             [% END %]
 
             [% IF ( opacreadinghistory ) %]
-                [% IF ( readingrecview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF readingrecview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-readingrecord.pl">Checkout history</a></li>
                 [% IF ( OPACPrivacy ) %]
-                    [% IF ( privacyview ) %]
-                        <li class="active">
-                    [% ELSE %]
-                        <li>
-                    [% END %]
+                    <li [% IF privacyview %]class="active"[% END %]>
                     <a href="/cgi-bin/koha/opac-privacy.pl">Privacy</a></li>
                 [% END %]
             [% END # / opacreadinghistory %]
 
             [% IF Koha.Preference('OPACHoldsHistory') == 1 %]
-                [% IF ( holdshistoryview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF holdshistoryview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-holdshistory.pl">Holds history</a></li>
             [% END %]
 
             [% IF Koha.Preference('UseRecalls') %]
-                [% IF ( recallsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF recallsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-recalls.pl">Recalls history</a>
             [% END %]
 
             [% IF ( suggestion ) %]
-                [% IF ( suggestionsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF suggestionsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a></li>
             [% END %]
 
             [% IF ( EnhancedMessagingPreferences ) %]
                 [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) || Koha.Preference('TranslateNotices') %]
-                    [% IF ( messagingview ) %]
-                        <li class="active">
-                    [% ELSE %]
-                        <li>
-                    [% END %]
+                    <li [% IF messagingview %]class="active"[% END %]>
                     <a href="/cgi-bin/koha/opac-messaging.pl">Messaging</a></li>
                  [% END %]
             [% END %]
 
             [% IF Koha.Preference( 'virtualshelves' ) == 1 %]
-                [% IF ( listsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF listsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-shelves.pl?op=list">Lists</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'RoutingSerials' ) && logged_in_user && logged_in_user.get_routing_lists.count %]
-                [% IF ( routinglistsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF routinglistsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-routing-lists.pl">Routing lists</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'useDischarge' ) == 1 %]
-                [% IF ( dischargeview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF dischargeview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-discharge.pl">Ask for discharge</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'ILLModule' ) == 1 %]
-                [% IF ( illrequestsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF illrequestsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-illrequests.pl">Interlibrary loan requests</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'CurbsidePickup' ) %]
-                [% IF ( curbside_pickups_view ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF curbside_pickups_view %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-curbside-pickups.pl">Curbside pickups</a></li>
             [% END %]
 
             [% IF logged_in_user.alert_subscriptions.count %]
-                [% IF ( alertsview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF alertsview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-alert-subscriptions.pl">Alert subscriptions ([% logged_in_user.alert_subscriptions.count | html %])</a></li>
             [% END %]
 
             [% IF Koha.Preference( 'OPACVirtualCard' ) %]
-                [% IF ( virtualcardview ) %]
-                    <li class="active">
-                [% ELSE %]
-                    <li>
-                [% END %]
+                <li [% IF virtualcardview %]class="active"[% END %]>
                 <a href="/cgi-bin/koha/opac-virtual-card.pl">My virtual card</a></li>
             [% END %]
         </ul>