diff --git a/themes/fid_adlr/scss/compiled.scss b/themes/fid_adlr/scss/compiled.scss index 64d1fd6e75afac34368d25738f0027e77ea11e43..1c067419a5af99207b24277f4bd1dca32c2747ea 100644 --- a/themes/fid_adlr/scss/compiled.scss +++ b/themes/fid_adlr/scss/compiled.scss @@ -329,6 +329,46 @@ form textarea:invalid { margin-right: 0; } +// ++ Helper Classes ++ + +//// A special "sr-only" to be shown on XS, SM and MD only -- but hidden on LG and larger +//// Example: Hidden description of anchors in header menu +.sr-only-xs-sm-md { + @media (max-width: $screen-md-max) { + border: 0; + clip: rect(1px, 1px, 1px, 1px); + height: auto; + margin: 0; + overflow: hidden; + padding: 0; + position: absolute; + width: auto; + + &:focus { + background-color: $white; + border-radius: $navbar-border-radius; + clip: auto; + color: $navbar-default-link-hover-color; + display: block; + font-size: $font-size-base; + height: $navbar-height; + left: 5px; + line-height: $line-height-computed; + padding: $navbar-padding-vertical $navbar-padding-horizontal; + position: absolute; + text-decoration: none; + text-transform: none; + top: 5px; + width: auto; + z-index: 100000; + } + } + + @media (min-width: $screen-lg-min) { + display: none; + } +} + // FIXME -- ggf. UEBERFLUESSIGE HELPER-Klassen ENTFERNEN -- auch phtml-Templates prüfen .hidden-lg-only { @media (min-width: $screen-lg-min) and (max-width: $screen-lg-max) { @@ -1834,6 +1874,15 @@ input.searchForm_lookfor { .sort { label { padding-top: 6px; + + @media screen and (max-width: $screen-xs-max) { + padding-top: 10px; + } + } + + @media screen and (max-width: $screen-xs-max) { + padding-bottom: 12px; + padding-right: 6px; } } diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml index 1adc31a789d8310aad4c83759befa767a3cbfd13..e9dc46d7870c674aa708e0f140807c73cd90d87b 100644 --- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml +++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/core.phtml @@ -16,9 +16,7 @@ <?php /* Display qrcode if appropriate: */ ?> <?php if ($QRCode): ?> - <span class="hidden-xs"> <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/> - </span> <?php endif; ?> <?php // if you have a preview tab but want to move or remove the preview link // from this area of the record view, this can be split into @@ -65,7 +63,8 @@ <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?> <div class="favorite"> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>"> - <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?php /* =$this->transEsc('Add to favorites') */?></span> + <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> + <span class="sr-only"><?=$this->transEsc('Add to favorites')?></span> </a> </div> <div class="toolbar-menu"> diff --git a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml index 0f3482724a0e65dc037140b7afcd1e16d6211775..84016d361f96e9c56db7a3801a7528652e0f3052 100644 --- a/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml +++ b/themes/fid_adlr/templates/RecordDriver/DefaultRecord/result-list.phtml @@ -172,7 +172,8 @@ if ($cover): <?php if ($this->permission()->allowDisplay('feature.Favorites')): ?> <?php /* Add to favorites; finc: keep Icon inside link - CK */ ?> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" data-lightbox class="save-record result-link-label" data-id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>" title="<?=$this->transEsc('Add to favorites')?>"> - <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> <span class="hidden-xs hidden-sm"><?php /* =$this->transEsc('Add to favorites') */?></span> + <i class="icon icon-star icon-1.5x" aria-hidden="true"></i> + <span class="sr-only"><?=$this->transEsc('Add to favorites')?></span> </a><br/> <?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?> <?=$block?> diff --git a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml index ea6d09abe6ced2c067ab612beb7da4495663e6e7..63f79ee6ba19afb8e4bee62aa3d6da26cd44e267 100644 --- a/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml +++ b/themes/fid_adlr/templates/RecordDriver/SolrAI/core.phtml @@ -17,9 +17,9 @@ <?php /* Display qrcode if appropriate: */ ?> <?php if ($QRCode): ?> - <span class="hidden-xs"> + <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/> - </span> + <?php endif; ?> <?php // if you have a preview tab but want to move or remove the preview link diff --git a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml index d06e1d135a1a30fc1b98bfb7f3b19fed1077263f..3147ca40ab2559225d3910402ddb4c03ff074598 100644 --- a/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml +++ b/themes/fid_adlr/templates/RecordDriver/SolrMarc/core.phtml @@ -17,9 +17,9 @@ <?php /* Display qrcode if appropriate: */ ?> <?php if ($QRCode): ?> - <span class="hidden-xs"> + <br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/> - </span> + <?php endif; ?> <?php // if you have a preview tab but want to move or remove the preview link diff --git a/themes/fid_adlr/templates/header.phtml b/themes/fid_adlr/templates/header.phtml index 1a88834e7c6e4908e2b0061f360fa3bccaaf293f..69991ac9c2fdb9f033079aefae29104eb6908666 100644 --- a/themes/fid_adlr/templates/header.phtml +++ b/themes/fid_adlr/templates/header.phtml @@ -5,107 +5,113 @@ - 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" --> - <!-- fid_adlr: navigation --> + <?php /* fid_adlr: navigation */ ?> <nav class="menubar"> - <!-- fid_adlr: logo --> + <?php /* 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> </div> - <!-- fid_adlr: logo - END --> + <?php /* fid_adlr: logo - END */ ?> - <!-- fid_adlr: header-menu-collapse for feedback (disabled?) / registering / card (disabled) --> + <?php /* fid_adlr: header-menu-collapse for feedback (disabled?) / registering / card (disabled) */ ?> <?php if (!isset($this->layout()->renderingError)): ?> <div class="register collapse header-menu-collapse" id="register-menu"> - <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> - <span class="hidden-xs hidden-sm hidden-md"> - <i class="icon icon-key" aria-hidden="true"></i> - </span> - </a> - <?php endif; ?> - </span> + <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> + <span class="hidden-xs hidden-sm hidden-md"> + <i class="icon icon-key" aria-hidden="true"></i> + </span> + <span class="sr-only-xs-sm-md"><?= $this->transEsc('Create New Account') ?></span> + </a> + <?php endif; ?> + </span> - <?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')?>"> - <i class="icon icon-calendar" aria-hidden="true"></i> <strong><?=count($cart->getItems())?></strong> <?=$this->transEsc('items')?> - <span class="full<?=!$cart->isFull() ? ' hidden' : ''?>">(<?=$this->transEsc('bookbag_full')?>)</span> - </a> - </li !--> - <?php endif; ?> + <?php /* + <ul> + <?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')?>"> + <i class="icon icon-calendar" aria-hidden="true"></i> <strong><?=count($cart->getItems())?></strong> <?=$this->transEsc('items')?> + <span class="full<?=!$cart->isFull() ? ' hidden' : ''?>">(<?=$this->transEsc('bookbag_full')?>)</span> + </a> + </li> + <?php endif; ?> - <?php 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")?> <b class="icon icon-chevron-down"></b></a> - <ul class="dropdown-menu"> - <?php 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> - <?php endforeach; ?> - </ul> - </li> - <?php endif; */ ?> - <!--/ul--> + <?php 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")?> <b class="icon icon-chevron-down"></b></a> + <ul class="dropdown-menu"> + <?php 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> + <?php endforeach; ?> + </ul> + </li> + <?php endif;?> + </ul> + */ ?> + </div> <?php endif; ?> - <!-- fid_adlr: header-menu-collapse for feedback (disabled?) / registering / card (disabled) - END--> + <?php /* fid_adlr: header-menu-collapse for feedback (disabled?) / registering / card (disabled) - END */ ?> - <!-- fid_adlr: basic header menu for login --> + <?php /* 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> - <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> - </span> + <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> + <span class="sr-only-xs-sm-md"><?= $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 ?>"> - <?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"> - <?= $this->transEsc("Institutional Login") ?> - </span> - <i class="icon icon-log-in" aria-hidden="true"></i> - </a> - <?php else: ?> - <a class="navbar-header-link" href="<?= $this->url('myresearch-userlogin') ?>" data-lightbox tabindex="2"> - <span class="decorate hidden-xs hidden-sm-lg"><?= $this->transEsc("Login") ?></span> - <i class="icon icon-log-in" aria-hidden="true"></i> - </a> - <?php endif; ?> - </span> + <?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"><?= $this->transEsc("Institutional Login") ?></span> + <span class="sr-only-xs-sm-md"><?= $this->transEsc("Institutional Login") ?></span> + <i class="icon icon-log-in" aria-hidden="true"></i> + </a> + <?php else: ?> + <a class="navbar-header-link" href="<?= $this->url('myresearch-userlogin') ?>" data-lightbox tabindex="2"> + <span class="decorate hidden-xs hidden-sm-lg"><?= $this->transEsc("Login") ?></span> + <span class="sr-only-xs-sm-md"><?= $this->transEsc("Login") ?></span> + <i class="icon icon-log-in" aria-hidden="true"></i> + </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> - <i id="account-icon" class="icon icon-user" aria-hidden="true"></i> - </a> - </span> + <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="sr-only-xs-sm-md"><?= $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 ?>"> - <a href="#" data-toggle="dropdown"><i class="icon icon-chevron-down"></i></a> - <div class="dropdown-menu"> - <?= $this->render('myresearch/menu'); ?> - </div> - </span> + <div 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'); ?> + </div> + </div> <?php endif; ?> - </div> + <?php endif; ?> <?php /* login / logout - END */ ?> </div> - <!-- fid_adlr: basic header menu for login - END --> + <?php /* fid_adlr: basic header menu for login - END */ ?> - <!-- fid_adlr: simple dropdown for language switch --> + <?php /* fid_adlr: simple dropdown for language switch */ ?> <?php if (!isset($this->layout()->renderingError)): ?> <div class="collapse header-menu-collapse" id="language-dropdown"> <?php if (isset($this->layout()->allLangs) && count($this->layout()->allLangs) > 1): ?> @@ -113,6 +119,7 @@ <form method="post" name="langForm" id="langForm"> <input type="hidden" name="mylang"/> </form> + <?php /* It is ok, to keep this hidden, as it shown on XS, SM, MD using other options, CK */ ?> <a class="navbar-header-link dropdown-toggle hidden-xs hidden-sm hidden-md" id="quickfilter-language" href="#" data-toggle="dropdown" tabindex="3" @@ -139,9 +146,9 @@ <?php endif; ?> </div> <?php endif; ?> - <!-- fid_adlr: simple dropdown for language switch - END--> + <?php /* fid_adlr: simple dropdown for language switch - END*/ ?> - <!-- fid_adlr: basic header menu for submenu toggler --> + <?php /* fid_adlr: basic header menu for submenu toggler */ ?> <div class="navbar-header"> <?php /* navigation toggler - RL */ ?> <div> @@ -154,17 +161,19 @@ <span class="sr-only">Toggle navigation</span> <span class="text-open"> <span class="decorate hidden-xs hidden-sm hidden-md"><?= $this->transEsc("Menu") ?></span> + <span class="sr-only-xs-sm-md"><?= $this->transEsc("Menu") ?></span> <i class="icon icon-burger" aria-hidden="true"></i> </span> <span class="text-close"> <span class="hidden-xs hidden-sm hidden-md"><?= $this->transEsc("Menu Close") ?></span> + <span class="sr-only-xs-sm-md"><?= $this->transEsc("Menu Close") ?></span> <i class="icon icon-close" aria-hidden="true"></i> </span> </a> </div> <?php /* navigation toggler - END */ ?> </div> - <!-- fid_adlr: basic header menu for submenu toggler - END --> + <?php /* fid_adlr: basic header menu for submenu toggler - END */ ?> <div class="collapse header-menu-collapse" id="submenu"> <div class="submenu-collapse-wrapper"> @@ -199,7 +208,7 @@ </div> </div> </nav> - <!-- fid_adlr: navigation - END --> + <?php /* fid_adlr: navigation - END */ ?> <?php /* adlr-specific header text on home page - END */ ?> diff --git a/themes/fid_adlr/templates/search/results.phtml b/themes/fid_adlr/templates/search/results.phtml index f18976a73b666418e9e633946e333dd7b9013da6..5187c3f81c05cfc78d6b6fa413ffe71d32ccdd56 100644 --- a/themes/fid_adlr/templates/search/results.phtml +++ b/themes/fid_adlr/templates/search/results.phtml @@ -71,10 +71,7 @@ $this->headScript()->appendFile("check_save_statuses_adlr.js"); <div class="search-stats"> <?php /* finc: use spans for easier to show/hide choices - CK */ ?> <?php if ($recordTotal > 0): ?> - <span class="hit-stats hidden-xs hidden-sm"> - <?php /*=$this->context()->renderInContext('search/controls/showing.phtml', ['lookfor' => $lookfor, 'recordTotal' => $recordTotal])*/ ?> - </span> - + <span class="hit-stats"></span> <?php else: ?> <h2><?=$this->transEsc('nohit_heading')?></h2> <?php endif; ?> @@ -83,11 +80,11 @@ $this->headScript()->appendFile("check_save_statuses_adlr.js"); <?php if ($recordTotal > 0): ?> <?php /* finc: use spans for easier to show/hide choices - CK */ ?> <div class="search-controls"> - <span class="limit hidden-xs hidden-sm"> - <?=$this->render('search/controls/limit.phtml')?> + <span class="limit"> + <?=$this->render('search/controls/limit.phtml')?> </span> - <span class="sort hidden-xs hidden-sm"> - <?=$this->render('search/controls/sort.phtml')?> + <span class="sort"> + <?=$this->render('search/controls/sort.phtml')?> </span> <span class="mailsave right"> <span>