From f8e32cf4609eb5a195ea71e2cde489f4f8f8752c Mon Sep 17 00:00:00 2001
From: Viola Elsenhans <elsenhans@ub.uni-leipzig.de>
Date: Thu, 15 Feb 2018 13:23:13 +0100
Subject: [PATCH] refs #12415 rest header template; rename logo; add
 translation for institution name

---
 adlr_link/languages/de.ini                 |   1 +
 adlr_link/languages/en.ini                 |   1 +
 themes/adlr_link/images/adlr_link_logo.png | Bin 4313 -> 0 bytes
 themes/adlr_link/templates/header.phtml    | 202 +++++++++++++--------
 4 files changed, 131 insertions(+), 73 deletions(-)
 delete mode 100644 themes/adlr_link/images/adlr_link_logo.png

diff --git a/adlr_link/languages/de.ini b/adlr_link/languages/de.ini
index f1b5ce69c35..ade8d574251 100644
--- a/adlr_link/languages/de.ini
+++ b/adlr_link/languages/de.ini
@@ -16,3 +16,4 @@
 ;##################### DO NOT DELETE THIS HEADER ####################
 ;####################################################################
 
+LibraryName = "adlr.link - Literatur für Kommunikations- und Medienwissenschaftler"
diff --git a/adlr_link/languages/en.ini b/adlr_link/languages/en.ini
index df207577041..2475ec2c9ca 100644
--- a/adlr_link/languages/en.ini
+++ b/adlr_link/languages/en.ini
@@ -16,3 +16,4 @@
 ;##################### DO NOT DELETE THIS HEADER ####################
 ;####################################################################
 
+LibraryName = "adlr.link - Literatur für Kommunikations- und Medienwissenschaftler"
diff --git a/themes/adlr_link/images/adlr_link_logo.png b/themes/adlr_link/images/adlr_link_logo.png
deleted file mode 100644
index fb7f5b4aeab3ec33c984a99f97b55bbdd60b09dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4313
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
Hu0mjf)wo68

diff --git a/themes/adlr_link/templates/header.phtml b/themes/adlr_link/templates/header.phtml
index 729a16588e4..e7553bf02fb 100644
--- a/themes/adlr_link/templates/header.phtml
+++ b/themes/adlr_link/templates/header.phtml
@@ -1,77 +1,133 @@
-<!-- HEADER.PHTML begin -->
+<!-- finc: header -->
 <? $account = $this->auth()->getManager(); ?>
-    <nav class="top-bar" data-topbar data-options="sticky_on:all">
-        <ul class="title-area">
-            <li class="name">
-            <h1><a role="logo" class="navbar-brand" href="<?=$this->url('home')?>"><span class="hide-for-medium-up">adlr.link - Literatur für Kommunikations- und Medienwissenschaftler</span><img src="<?=$this->imageLink('adlr_link_logo.png')?>" class="hide-for-small" alt="Logo adlr.link" title="adlr.link - Literatur für Kommunikations- und Medienwissenschaftler"></a></h1>
+<? /* This navbar is the sticky element in the header - CK; you can use 'affix' as an alternative to  'navbar-fixed-top' like so:
+ <div data-spy="affix" data-offset-top="1" class="navbar">
+ Do not use 'navbar-fixed-top' and 'affix' at the same time. When using 'affix', set the variables for
+ '$navbar-height', '$navbar-height-xs' and '$navbar-height-sm' in _customVariables.scss to '=0'
+ or set the paddings-top under 'body' in compiled.scss to '=0'
+ */ ?>
+<div class="banner container navbar navbar-fixed-top">
+  <? /* This element only holds the mobile toggler and the navbar-brand/library name - CK */ ?>
+  <div class="navbar-header">
+    <? /* mobile navigation toggler - CK */ ?>
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#header-collapse">
+      <span class="sr-only">Toggle navigation</span>
+      <i class="fa fa-bars" aria-hidden="true"></i>
+    </button>
+
+    <h1>
+      <a class="navbar-brand lang-<?=$this->layout()->userLang?>" href="<?=$this->url('home')?>">
+        <? /* Custom finc header - CK*/ ?>
+          <span class="hidden-sm hidden-md hidden-lg"><?=$this->transEsc("LibraryName")?></span>
+          <img src="<?=$this->imageLink('headerlogo.png')?>" class="hidden-xs" alt="Logo <?=$this->transEsc("LibraryName")?>" title="<?=$this->transEsc("LibraryName")?>">
+        <? /*  Custom finc header - END */ ?>
+      </a>
+    </h1>
+  </div>
+
+  <div class="flex-container">
+  <? if (!isset($this->layout()->renderingError)): ?>
+    <div class="collapse navbar-collapse right" id="header-collapse">
+      <? /* finc: right-hand navbar section - see flex-container in SCSS:
+              we need this order on XS: navbar-right searchbox
+              but reverse it on anything but mobile */ ?>
+      <nav>
+        <ul class="nav navbar-nav navbar-right flip">
+          <? if ($this->feedback()->tabEnabled()): ?>
+            <li>
+              <a id="feedbackLink" data-lightbox class="btn" href="<?=$this->url('feedback-home')?>"> <i class="fa fa-envelope" aria-hidden="true"></i>
+                <span class="hidden-sm"><?=$this->transEsc("Feedback")?></span>
+              </a>
+            </li>
+          <? endif; ?>
+          <? $cart = $this->cart();
+          if ($cart->isActive()): ?>
+            <li id="cartSummary">
+              <a id="cartItems" class="btn" data-lightbox title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>">
+                <i class="fa fa-clipboard" aria-hidden="true"></i> <strong><?=count($cart->getItems())?></strong> <span class="cart-label"><?=$this->transEsc('items')?></span>
+                <span class="hidden-sm full<?=!$cart->isFull() ? ' hidden' : ''?>">(<?=$this->transEsc('bookbag_full')?>)</span>
+              </a>
+            </li>
+          <? endif; ?>
+          <? if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable ?>
+            <li class="logoutOptions<? if (!$account->isLoggedIn()): ?> hidden<? endif ?>">
+              <a class="btn" href="<?=$this->url('myresearch-home', array(), array('query' => array('redirect' => 0)))?>">
+                <i class="fa fa-home" aria-hidden="true"></i>
+                <span class="hidden-sm"><?=$this->transEsc("Your Account")?></span>
+              </a>
+            </li>
+
+            <li class="logoutOptions<? if (!$account->isLoggedIn()): ?> hidden<? endif ?>">
+              <a href="<?=$this->url('myresearch-logout')?>" class="logout btn" title="<?=$this->transEsc("Log Out")?>">
+                <i class="fa fa-sign-out" aria-hidden="true"></i>
+                <span class="hidden-sm"><?=$this->transEsc("Log Out")?></span>
+              </a>
             </li>
-            <? /*Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone */ ?>
-            <li class="toggle-topbar menu-icon"><a href="#"><span></span></a></li>
-        </ul>
-        <section class="top-bar-section">
-            <? if ($this->layout()->searchbox !== false): ?>
-              <ul class="left list-unstyled show-for-medium-up">
-                <?=$this->layout()->searchbox ?>
-              </ul>
-            <? endif; ?>
-            <? if (!isset($this->layout()->renderingError)): ?>
-                <? /* Right-hand  Nav Section */ ?>
-                <ul class="right">
-                    <? if ($this->feedback()->tabEnabled()): ?>
-                        <li>
-                            <a id="feedbackLink" class="modal-link" href="<?=$this->url('feedback-home') ?>"><i class="fa fa-envelope"></i> <?=$this->transEsc("Feedback")?></a>
-                        </li>
-                    <? endif; ?>
-                    <? $cart = $this->cart(); if ($cart->isActive()): ?>
-                        <li id="cartSummary">
-                            <a id="cartItems" class="modal-link" title="<?=$this->transEsc('View Book Bag')?>" href="<?=$this->url('cart-home')?>"><i class="fa fa-clipboard"></i> <strong><?=count($cart->getItems())?></strong> <?=$this->transEsc('items')?><?=$cart->isFull() ? ' (' .  $this->transEsc('bookbag_full') . ')' : ''?></a>
-                        </li>
-                    <? endif; ?>
-                    <? if (is_object($account) && $account->loginEnabled()): // hide login/logout if unavailable ?>
-                        <li class="logoutOptions<? if(!$account->isLoggedIn()): ?> hide<? endif ?>">
-                            <a href="<?=$this->url('myresearch-home', array(), array('query' => array('redirect' => 0)))?>" class="modal-link" title="<?=$this->transEsc("Your Account")?>"><i class="fa fa-home"></i> <?=$this->transEsc("Your Account")?></a>
-                        </li>
-                        <li class="logoutLink logoutOptions<? if(!$account->isLoggedIn()): ?> hide<? endif ?>">
-                            <a href="<?=$this->url('myresearch-logout')?>" class="modal-link" title="<?=$this->transEsc("Log Out")?>"><i class="fa fa-sign-out"></i> <?=$this->transEsc("Log Out")?></a>
-                        </li>
-                        <li id="loginOptions" class="<? if($account->isLoggedIn()): ?> hide<? endif ?>">
-                            <? if ($sessionInitiator = $account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
-                                <a href="<?=$this->escapeHtmlAttr($sessionInitiator)?>"><i class="fa fa-sign-in"></i> <?=$this->transEsc("Institutional Login")?></a>
-                            <? else: ?>
-                                <a href="<?=$this->url('myresearch-userlogin')?>" class="modal-link" title="<?=$this->transEsc("Login")?>"><i class="fa fa-sign-in"></i> <?=$this->transEsc("Login")?></a>
-                            <? endif; ?>
-                        </li>
-                    <? endif; ?>
 
-                    <? if (isset($this->layout()->themeOptions) && count($this->layout()->themeOptions) > 1): ?>
-                        <li class="has-dropdown">
-                            <form method="post" name="themeForm" id="themeForm">
-                                <input type="hidden" name="ui"/>
-                            </form>
-                            <a href="#"><?=$this->transEsc("Theme")?></a>
-                            <ul class="dropdown">
-                                <? foreach ($this->layout()->themeOptions as $current): ?>
-                                  <li<?=$current['selected'] ? ' class="active"' : ''?>><a href="#" onClick="document.themeForm.ui.value='<?=$this->escapeHtmlAttr($current['name'])?>';document.themeForm.submit()"><?=$this->transEsc($current['desc'])?></a></li>
-                                <? endforeach; ?>
-                            </ul>
-                        </li>
-                    <? endif; ?>
+            <li id="loginOptions"<? if ($account->isLoggedIn()): ?> class="hidden"<? endif ?>>
+              <? if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>
+                <a class="btn" href="<?=$this->url('myresearch-userlogin')?>">
+                  <i class="fa fa-sign-in" aria-hidden="true"></i>
+                  <span class="hidden-sm"><?=$this->transEsc("Institutional Login")?></span>
+                </a>
+              <? else: ?>
+                <a class="btn" href="<?=$this->url('myresearch-userlogin')?>" data-lightbox>
+                  <i class="fa fa-sign-in" aria-hidden="true"></i>
+                  <span class="hidden-sm"><?=$this->transEsc("Login")?></span>
+                </a>
+              <? endif; ?>
+            </li>
+          <? endif; ?>
+
+          <? if (isset($this->layout()->themeOptions) && count($this->layout()->themeOptions) > 1): ?>
+            <li class="theme dropdown">
+              <form method="post" name="themeForm" id="themeForm">
+                <input type="hidden" name="ui"/>
+              </form>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?=$this->transEsc("Theme")?> <strong class="caret"></strong></a>
+
+              <ul class="dropdown-menu">
+                <? foreach ($this->layout()->themeOptions as $current): ?>
+                  <li<?=$current['selected'] ? ' class="active"' : ''?>>
+                    <a href="#" onClick="document.themeForm.ui.value='<?=$this->escapeHtmlAttr($current['name'])?>';document.themeForm.submit()"><?=$this->transEsc($current['desc'])?></a>
+                  </li>
+                <? endforeach; ?>
+              </ul>
+            </li>
+          <? endif; ?>
 
-                    <? if (isset($this->layout()->allLangs) && count($this->layout()->allLangs) > 1): ?>
-                        <li class="has-dropdown">
-                            <form method="post" name="langForm" id="langForm">
-                                <input type="hidden" name="mylang"/>
-                            </form>
-                            <a href="#"  aria-controls="langmenu" aria-expanded="false"><?=$this->transEsc("Language")?></a>
-                            <ul id="langmenu" class="dropdown">
-                                <? foreach ($this->layout()->allLangs as $langCode => $langName): ?>
-                                    <li<?=$this->layout()->userLang == $langCode ? ' class="active"' : ''?>><a href="#" onClick="document.langForm.mylang.value='<?=$langCode?>';document.langForm.submit()"><?=$this->displayLanguageOption($langName)?></a></li>
-                                <? endforeach; ?>
-                            </ul>
-                        </li>
-                    <? endif; ?>
-                </ul>
-            <? endif; ?>
-        </section>
-    </nav>
-<!-- HEADER.PHTML end -->
\ No newline at end of file
+          <? if (isset($this->layout()->allLangs) && count($this->layout()->allLangs) > 1): ?>
+            <li class="language dropdown">
+              <form method="post" name="langForm" id="langForm">
+                <input type="hidden" name="mylang"/>
+              </form>
+              <a href="#" class="btn dropdown-toggle hidden-xs hidden-sm" data-toggle="dropdown" aria-controls="langmenu" aria-expanded="false">
+                <?=$this->transEsc("Language")?> <strong class="caret"></strong>
+              </a>
+              <ul id="langmenu" class="dropdown-menu">
+                <? foreach ($this->layout()->allLangs as $langCode => $langName): ?>
+                  <li<?=$this->layout()->userLang == $langCode ? ' class="active"' : ''?>>
+                    <a class="btn" href="#" onClick="document.langForm.mylang.value='<?=$langCode?>';document.langForm.submit()"><?=$this->displayLanguageOption($langName)?></a>
+                  </li>
+                <? endforeach; ?>
+              </ul>
+            </li>
+          <? endif; ?>
+        </ul>
+      </nav>
+    </div>
+  <? endif; ?>
+    <? /* finc searchbox: we use searchbox here so it becomes part of the sticky header,
+        we need to place this after the navbar-right for anything but mobile  - see flex-container in SCSS:*/ ?>
+    <? if ($this->layout()->searchbox !== false): ?>
+      <div class="search container left">
+        <nav class="nav searchbox hidden-print">
+          <?=$this->layout()->searchbox?>
+        </nav>
+      </div>
+    <? endif; ?>
+    <? /* finc searchbox - END */ ?>
+  </div>
+</div>
+<? /* If you want to use searchbox in a separate row, insert it here as in bootstrap theme - CK */ ?>
+<!-- finc: header - END -->
-- 
GitLab