From 54dddcf54e6b0c822f3a2896ee5f582a3cd78449 Mon Sep 17 00:00:00 2001
From: Claas Kazzer <kazzer@uni-leipzig.de>
Date: Tue, 31 Aug 2021 10:45:30 +0200
Subject: [PATCH] refs #20530 [fid_adlr] Maintenance header

* code styles / syntax
---
 themes/fid_adlr/templates/header.phtml | 192 ++++++++++++-------------
 1 file changed, 95 insertions(+), 97 deletions(-)

diff --git a/themes/fid_adlr/templates/header.phtml b/themes/fid_adlr/templates/header.phtml
index 5f9553c4f2f..1a88834e7c6 100644
--- a/themes/fid_adlr/templates/header.phtml
+++ b/themes/fid_adlr/templates/header.phtml
@@ -5,12 +5,12 @@
        - affix is applied to ALL .navbar elements via JS in layout.phtml - CK */ ?>
 <?php $data_offset_top_affix = 85 ?>
 <div role="navigation" class="banner container navbar affix-top" id="main-navigation" data-spy="affix" data-offset-top="<?= $data_offset_top_affix ?>">
-<!--div role="navigation" class="banner container navbar affix" id="main-navigation" -->
+  <!--div role="navigation" class="banner container navbar affix" id="main-navigation" -->
   <!-- fid_adlr: navigation -->
   <nav class="menubar">
     <!-- fid_adlr: logo -->
     <div class="navbar-header fill-flex">
-      <a class="navbar-brand lang-<?=$this->layout()->userLang?>" href="<?=$this->url('search-home')?>" tabindex="0">adlr.link</a>
+      <a class="navbar-brand lang-<?= $this->layout()->userLang ?>" href="<?= $this->url('search-home') ?>" tabindex="0">adlr.link</a>
     </div>
     <!-- fid_adlr: logo - END -->
 
@@ -20,17 +20,17 @@
       <span<?php if ($account->isLoggedIn()): ?> class="hidden"<?php endif ?>>
         <?php if ($account->supportsCreation()): ?>
           <a class="navbar-header-link no-margin-l"
-            href="<?=$this->url('myresearch-account') ?>?auth_method=<?=$account->getAuthMethod()?>"
-            tabindex="1" data-lightbox>
-            <span class="decorate hidden-lg-only"><?=$this->transEsc('Create New Account')?></span>
+             href="<?= $this->url('myresearch-account') ?>?auth_method=<?= $account->getAuthMethod() ?>"
+             tabindex="1" data-lightbox>
+            <span class="decorate hidden-lg-only"><?= $this->transEsc('Create New Account') ?></span>
             <span class="hidden-xs hidden-sm hidden-md">
               <i class="icon icon-key" aria-hidden="true"></i>
             </span>
         </a>
         <?php endif; ?>
       </span>
-
-      <?php /* $cart = $this->cart();
+        
+        <?php /* $cart = $this->cart();
       if ($cart->isActive()): ?>
         <li id="cartSummary">
           <a id="cartItems" data-lightbox title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>">
@@ -55,22 +55,22 @@
           </ul>
         </li>
       <?php endif; */ ?>
-    <!--/ul-->
-    </div>
+        <!--/ul-->
+      </div>
     <?php endif; ?>
     <!-- fid_adlr: header-menu-collapse for feedback (disabled?) / registering / card (disabled) - END-->
 
     <!-- fid_adlr: basic header menu for login -->
     <div class="navbar-header">
-    <?php /* login / logout */ ?>
-	  <?php if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable?>
-    <div>
+      <?php /* login / logout */ ?>
+      <?php if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable?>
+        <div>
       <span class="logoutOptions<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
-        <a class="navbar-header-link logout" href="<?=$this->url('myresearch-logout')?>" tabindex="3">
-          <span class="decorate hidden-xs hidden-sm-lg"><?=$this->transEsc("Log Out")?></span> <i class="icon icon-log-out" aria-hidden="true"></i>
+        <a class="navbar-header-link logout" href="<?= $this->url('myresearch-logout') ?>" tabindex="3">
+          <span class="decorate hidden-xs hidden-sm-lg"><?= $this->transEsc("Log Out") ?></span> <i class="icon icon-log-out" aria-hidden="true"></i>
         </a>
       </span>
-      <span id="loginOptions" class="<?php if ($account->isLoggedIn()): ?>hidden<?php endif ?>">
+          <span id="loginOptions" class="<?php if ($account->isLoggedIn()): ?>hidden<?php endif ?>">
 	    <?php if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
         <a href="<?= $this->url('myresearch-userlogin') ?>" tabindex="2">
           <span class="decorate hidden-xs hidden-sm hidden-md">
@@ -85,23 +85,23 @@
         </a>
       <?php endif; ?>
       </span>
-      <span class="logoutOptions<?php if ($account->dropdownEnabled()): ?> with-dropdown<?php endif ?><?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
-        <a tabindex="2" class="navbar-header-link" href="<?=$this->url('myresearch-home', [], ['query' => ['redirect' => 0]])?>">
-          <span class="decorate hidden-sm-lg hidden-xs"><?=$this->transEsc("Your Account")?></span>
+          <span class="logoutOptions<?php if ($account->dropdownEnabled()): ?> with-dropdown<?php endif ?><?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
+        <a tabindex="2" class="navbar-header-link" href="<?= $this->url('myresearch-home', [], ['query' => ['redirect' => 0]]) ?>">
+          <span class="decorate hidden-sm-lg hidden-xs"><?= $this->transEsc("Your Account") ?></span>
           <i id="account-icon" class="icon icon-user" aria-hidden="true"></i>
         </a>
       </span>
-      <?php if ($account->dropdownEnabled()): ?>
-        <span id="login-dropdown" class="dropdown<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
+          <?php if ($account->dropdownEnabled()): ?>
+            <span id="login-dropdown" class="dropdown<?php if (!$account->isLoggedIn()): ?> hidden<?php endif ?>">
           <a href="#" data-toggle="dropdown"><i class="icon icon-chevron-down"></i></a>
           <div class="dropdown-menu">
-            <?=$this->render('myresearch/menu');?>
+            <?= $this->render('myresearch/menu'); ?>
           </div>
         </span>
+          <?php endif; ?>
+        </div>
       <?php endif; ?>
-    </div>
-	  <?php endif; ?>
-	  <?php /* login / logout - END */ ?>
+      <?php /* login / logout - END */ ?>
     </div>
     <!-- fid_adlr: basic header menu for login - END -->
 
@@ -118,7 +118,7 @@
                tabindex="3"
                aria-controls="langmenu"
                aria-expanded="false"
-               onkeydown="forceFocus('#langmenu li a')" >
+               onkeydown="forceFocus('#langmenu li a')">
               <span class="sr-only">Toggle language</span>
               <span class="decorate"><?= $this->layout()->userLang ?></span>
               <i class="icon icon-chevron-down" aria-hidden="true"></i>
@@ -168,106 +168,104 @@
 
     <div class="collapse header-menu-collapse" id="submenu">
       <div class="submenu-collapse-wrapper">
-      <ul class="submenu-collapse">
-        <?php $searchOptions = $this->searchOptions("Solr"); ?>
-        <?php if (!empty($advSearch = $searchOptions->getAdvancedSearchAction())): ?>
+        <ul class="submenu-collapse">
+          <?php $searchOptions = $this->searchOptions("Solr"); ?>
+          <?php if (!empty($advSearch = $searchOptions->getAdvancedSearchAction())): ?>
+            <li>
+              <a href="<?= $this->url($advSearch) ?>"><?= $this->transEsc("Advanced Search") ?></a>
+            </li>
+          <?php endif; ?>
           <li>
-            <a href="<?=$this->url($advSearch)?>"><?=$this->transEsc("Advanced Search")?></a>
+            <a href="<?= $this->url('myresearch/databases') ?>"><?= $this->transEsc('Specific Databases') ?></a>
           </li>
-        <?php endif; ?>
-        <li>
-          <a href="<?= $this->url('myresearch/databases') ?>"><?= $this->transEsc('Specific Databases') ?></a>
-        </li>
-        <?php if (!empty($this->config()->get('config')->RawQueries['new_releases'])): ?>
+          <?php if (!empty($this->config()->get('config')->RawQueries['new_releases'])): ?>
+            <li>
+              <a href="<?= $this->url('search-results') . $this->config()->get('config')->RawQueries['new_releases'] ?>"><?= $this->transEsc('new_print_publications') ?></a>
+            </li>
+          <?php endif; ?>
           <li>
-            <a href="<?= $this->url('search-results') . $this->config()->get('config')->RawQueries['new_releases']?>"><?= $this->transEsc('new_print_publications') ?></a>
+            <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? "" ?>"><?= $this->transEsc('Blog') ?></a>
+          </li>
+          <li>
+            <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? "" ?>/team"><?= $this->transEsc('About Us') ?></a>
+          </li>
+          <li>
+            <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? "" ?>/faq"><?= $this->transEsc('FAQs') ?></a>
+          </li>
+          <li>
+            <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? "" ?>/service-fuer-fachreferate"><?= $this->translate('Services for subject specialists') ?></a>
           </li>
-        <?php endif; ?>
-        <li>
-          <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? ""?>"><?= $this->transEsc('Blog') ?></a>
-        </li>
-        <li>
-          <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? ""?>/team"><?= $this->transEsc('About Us') ?></a>
-        </li>
-        <li>
-          <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? ""?>/faq"><?=$this->transEsc('FAQs')?></a>
-        </li>
-        <li>
-          <a href="<?= $this->config()->get('config')->RssConsumer['fallback_url'] ?? ""?>/service-fuer-fachreferate"><?=$this->translate('Services for subject specialists')?></a>
-        </li>
         </ul>
       </div>
     </div>
   </nav>
   <!-- fid_adlr: navigation - END -->
-
+  
   <?php /* adlr-specific header text on home page - END */ ?>
-
-	<?php if ($this->layout()->searchbox !== false): ?>
-		<div class="search-wrapper container">
+  
+  <?php if ($this->layout()->searchbox !== false): ?>
+    <div class="search-wrapper container">
       <div id="searchbox" class="search container navbar collapse in affix-top" data-spy="affix" data-offset-top="<?= $data_offset_top_affix ?>">
         <div class="dropdown sbox-dd">
-					<?php /* no data-toggle: .open dropdown-menu of sbox manually to prevent interdependence-bug with dropdown quickfilter(s) within sbox - RL */ ?>
+          <?php /* no data-toggle: .open dropdown-menu of sbox manually to prevent interdependence-bug with dropdown quickfilter(s) within sbox - RL */ ?>
           <button class="btn btn-primary dropdown-toggle" type="button" id="search-main-dropdown">
             <span class="text-open"><?= $this->transEsc("Open Search") ?><span class="icon icon-chevron-down"></span></span>
             <span class="text-close"><?= $this->transEsc("Close Search") ?><span
-                      class="icon icon-chevron-up"></span></span>
+                class="icon icon-chevron-up"></span></span>
           </button>
           <ul class="dropdown-menu-parent sbox-dd-menu">
             <li>
               <nav class="nav searchbox hidden-print">
-								<?= $this->layout()->searchbox ?>
+                <?= $this->layout()->searchbox ?>
               </nav>
             </li>
           </ul>
         </div>
       </div>
     </div>
-	<?php endif; ?>
+  <?php endif; ?>
 </div>
 
 <script type="text/javascript">
-    $(document).ready(function(){
-        <?php /* disable transitions and delay while collapsing completely */ ?>
-        $.support.transition = false;
-
-        <?php /* Bugfix for switching affix / affix-top on click */ ?>
-        $( '#main-navigation' ).on( 'affix.bs.affix', function(){
-            if( !$( window ).scrollTop() ) return false;
-        } );
-
-        <?php /* still needed in bootstrap 3 for dropdown within dropdown */ ?>
-        $('#search-main-dropdown').on('click', function () {
-            $('.dropdown.sbox-dd').toggleClass( "open" );
-        });
-
-        <?php /* close main menu after click on language menu or within search box */ ?>
-        $(document).on('click','#language-dropdown *, .nav *, #main',function(){
-            if($('#submenu') && $('#submenu').attr('aria-expanded') == 'true') {
-                $('header').addClass('in')
-                $('#submenu').collapse('hide');
-                $('#register-menu').collapse('hide');
-                $('#language-dropdown').collapse('hide');
-            }
-        });
-    });
+	$(document).ready(function () {
+      <?php /* disable transitions and delay while collapsing completely */ ?>
+		$.support.transition = false;
+      
+      <?php /* Bugfix for switching affix / affix-top on click */ ?>
+		$('#main-navigation').on('affix.bs.affix', function () {
+			if (!$(window).scrollTop()) return false;
+		});
+      
+      <?php /* still needed in bootstrap 3 for dropdown within dropdown */ ?>
+		$('#search-main-dropdown').on('click', function () {
+			$('.dropdown.sbox-dd').toggleClass("open");
+		});
+      
+      <?php /* close main menu after click on language menu or within search box */ ?>
+		$(document).on('click', '#language-dropdown *, .nav *, #main', function () {
+			if ($('#submenu') && $('#submenu').attr('aria-expanded') == 'true') {
+				$('header').addClass('in')
+				$('#submenu').collapse('hide');
+				$('#register-menu').collapse('hide');
+				$('#language-dropdown').collapse('hide');
+			}
+		});
+	});
 
-    function clickElementOnKeyDown(event, elementId)
-    {
-        if (event.keyCode == 13 || event.keyCode == 32) {
-            var element = $(elementId);
-            if (element && element.length) {
-                element.click();
-            }
-        }
-    }
+	function clickElementOnKeyDown(event, elementId) {
+		if (event.keyCode == 13 || event.keyCode == 32) {
+			var element = $(elementId);
+			if (element && element.length) {
+				element.click();
+			}
+		}
+	}
 
-    function forceFocus(elementId)
-    {
-        var element = $(elementId);
-        if (element && element.length) {
-            element.first().focus();
-        }
-    }
+	function forceFocus(elementId) {
+		var element = $(elementId);
+		if (element && element.length) {
+			element.first().focus();
+		}
+	}
 </script>
-<!-- fid_adlr: header - END -->
\ No newline at end of file
+<!-- fid_adlr: header - END -->
-- 
GitLab