diff --git a/adlr_link/languages/de.ini b/adlr_link/languages/de.ini
index f1b5ce69c35e8e2567b85bdb24cb3f7dc3dce66b..ade8d574251746f2a96e94cce2e2ce41eb62d64b 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 df2075770418e7c9ce7605dae4586262be656239..2475ec2c9ca8e577b8f9490be15527024a8ef99d 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
Binary files a/themes/adlr_link/images/adlr_link_logo.png and /dev/null differ
diff --git a/themes/adlr_link/templates/header.phtml b/themes/adlr_link/templates/header.phtml
index 729a16588e47fcd7c47bca5f8bc1de2bb948bf54..e7553bf02fb721e5e9cc91082d60d100265bc3bf 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 -->