diff --git a/fid_bbi/languages/de.ini b/fid_bbi/languages/de.ini
index 9c155d9a42545a2a9bb64414e7b52934797b3030..2b5328d2a40c506d06748b79589933990fc88591 100644
--- a/fid_bbi/languages/de.ini
+++ b/fid_bbi/languages/de.ini
@@ -347,7 +347,7 @@ Holdings details from = "Bestandsangaben von"
Holdnep-Submit = "Benutzergesteuerte Erwerbung"
Holds = Bestellungen
Holds and Recalls = "Bestellungen & Vormerkungen"
-Home = "Start"
+Home = "Home"
Identity Number = Personalausweisnummer
Illustrated = Abbildungen
Import Record = "Daten exportieren"
@@ -379,6 +379,8 @@ Legal Documents = "Gesetzestexte"
Legal Info = Impressum
Less = "Weniger"
Library = Bibliothek
+LibraryName = Fachinformationsdienst Buch-, Bibliotheks- und Informationswissenschaft (FID BBI)
+LibraryNameShort = Fachinformationsdienst Buch-, Bibliotheks- und Informationswissenschaft
Library Regulations = Benutzungsordnung
Limit To = "Begrenze auf"
Link to = "Zur Webseite"
diff --git a/fid_bbi/languages/en.ini b/fid_bbi/languages/en.ini
index f333db44618cd95b8959913338a9798fa6c0d2d5..4fd98858584b97f7eb988e521fb09b8bdd1ea17f 100644
--- a/fid_bbi/languages/en.ini
+++ b/fid_bbi/languages/en.ini
@@ -137,6 +137,8 @@ Kollektion = Collection
Kontakt = Contact
Language = Language
Library = Library
+LibraryName = Fachinformationsdienst Buch-, Bibliotheks- und Informationswissenschaft (FID BBI)
+LibraryNameShort = Fachinformationsdienst Buch-, Bibliotheks- und Informationswissenschaft
Library Catalog Username = "Library Catalog User Name"
Limit To = "Limit to"
Link to = "To Website"
diff --git a/themes/fid_bbi/images/de.svg b/themes/fid_bbi/images/de.svg
new file mode 100644
index 0000000000000000000000000000000000000000..49144dd2ab2e6f123ed3cd7032f1985744371799
--- /dev/null
+++ b/themes/fid_bbi/images/de.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="de.svg" viewBox="0 0 640 480">
+ <path fill="#ffce00" d="M0 320h640v160H0z"/>
+ <path d="M0 0h640v160H0z"/>
+ <path fill="#d00" d="M0 160h640v160H0z"/>
+</svg>
diff --git a/themes/fid_bbi/images/en.svg b/themes/fid_bbi/images/en.svg
new file mode 100644
index 0000000000000000000000000000000000000000..655e82c6ba90015cb60da5ef7ad2475c0e8fbfc6
--- /dev/null
+++ b/themes/fid_bbi/images/en.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="en.svg" viewBox="0 0 640 480">
+ <defs>
+ <clipPath id="a">
+ <path fill-opacity=".7" d="M-85.3 0h682.6v512H-85.3z"/>
+ </clipPath>
+ </defs>
+ <g clip-path="url(#a)" transform="translate(80) scale(.94)">
+ <g stroke-width="1pt">
+ <path fill="#012169" d="M-256 0H768v512H-256z"/>
+ <path fill="#fff" d="M-256 0v57.2L653.5 512H768v-57.2L-141.5 0H-256zM768 0v57.2L-141.5 512H-256v-57.2L653.5 0H768z"/>
+ <path fill="#fff" d="M170.7 0v512h170.6V0H170.7zM-256 170.7v170.6H768V170.7H-256z"/>
+ <path fill="#c8102e" d="M-256 204.8v102.4H768V204.8H-256zM204.8 0v512h102.4V0H204.8zM-256 512L85.3 341.3h76.4L-179.7 512H-256zm0-512L85.3 170.7H9L-256 38.2V0zm606.4 170.7L691.7 0H768L426.7 170.7h-76.3zM768 512L426.7 341.3H503l265 132.5V512z"/>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/themes/fid_bbi/images/headerlogo.png b/themes/fid_bbi/images/headerlogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc9d8e16b394318740772458240061a73ddd2f8
Binary files /dev/null and b/themes/fid_bbi/images/headerlogo.png differ
diff --git a/themes/fid_bbi/scss/_customVariables.scss b/themes/fid_bbi/scss/_customVariables.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6ba0df356d3fb06017ee65762b022db516b6292d 100644
--- a/themes/fid_bbi/scss/_customVariables.scss
+++ b/themes/fid_bbi/scss/_customVariables.scss
@@ -0,0 +1,13 @@
+// COLORS
+$brand-primary: #035151 !default;
+$brand-primary-light: #b3caca !default;
+$brand-secondary: #8a151a !default;
+$brand-danger: #f04124 !default;
+$brand-info: #008cba !default;
+$brand-success: #43ac6a !default;
+$brand-warning: #f08a24 !default;
+
+$alert-warning-bg: #d3d3d3 !default;
+
+$component-active-bg: $brand-primary-light !default;
+$snow: $brand-primary-light !default;
diff --git a/themes/fid_bbi/scss/compiled.scss b/themes/fid_bbi/scss/compiled.scss
index b9e55596f51a11fd1565ef5eb18ce6967070030c..f2e90def154a676562ece2f715a6f66066ab4b31 100644
--- a/themes/fid_bbi/scss/compiled.scss
+++ b/themes/fid_bbi/scss/compiled.scss
@@ -2,53 +2,168 @@
@import 'customMixins';
@import '../../finc/scss/compiled';
+// General
+body {
+ hyphens: auto;
+}
+
// Header
.navbar {
+ background-color: $brand-secondary;
min-height: 95px;
-}
-.searchHomeContent {
- min-height: 15em;
- display: flex;
- align-items: center;
- justify-content: center;
+ // Header logo and text
+ h1 {
+ img {
+ margin-top: 12px;
+ }
+
+ span {
+ color: $white;
+
+ @media only screen and (max-width: $screen-xs-max) {
+ font-size: 12px;
+ left: 0;
+ line-height: 1.2;
+ margin-right: 40px;
+ position: absolute;
+ }
+
+ @media only screen and (min-width: $screen-sm-min) {
+ font-size: 16px;
+ }
+
+ @media only screen and (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+ margin: 0;
+ max-width: 400px;
+ padding-top: 7px;
+ }
+ }
+ }
}
#header-collapse {
flex: 1 1;
}
+// set font color in header to white for better visibility
+.nav {
+ a {
+ &.btn,
+ &.search-filter-toggle {
+ color: $white;
+
+ &:hover,
+ &:focus {
+ background-color: $brand-primary;
+ color: $snow;
+ }
+ }
+
+ &.de::after,
+ &.en::after {
+ background-position: 50% 30%;
+ background-repeat: no-repeat;
+ background-size: contain;
+ content: '\00a0';
+ display: inline-block;
+ margin-left: 7px;
+ position: relative;
+ width: (4 / 3) * 1em;
+ }
+
+ &.en::after {
+ background-image: url('../images/en.svg');
+ }
+
+ &.de::after {
+ background-image: url('../images/de.svg');
+ }
+ }
+}
+
+// Breadcrumbs
.breadcrumb {
- padding-top: 20px;
+ padding-top: 23px;
+
+ > li + li::before {
+ color: $white;
+ content: '';
+ padding: 0 5px;
+ }
+
+ a {
+ color: $brand-primary-light;
+
+ &:active {
+ color: $white;
+ }
+
+ &:hover {
+ color: $brand-primary-light;
+ text-decoration: underline;
+ }
+ }
+}
+
+// Search Box on home page
+.searchHomeContent {
+ align-items: center;
+ display: flex;
+ justify-content: center;
+ min-height: 15em;
+}
+
+.searchbox-home {
+ // truly justify content
+ .searchForm {
+ display: flex;
+ justify-content: center;
+ }
}
-.breadcrumb > li + li::before {
- content: "";
- padding: 0 5px;
- color: #fff;
+// Search Box on all other pages
+.searchbox {
+ .searchForm {
+ display: inline-flex;
+ position: absolute;
+ right: 10px;
+ top: 45px;
+
+ input {
+ min-width: 250px;
+ }
+ }
}
+// Content
.searchtools {
display: block;
- margin: 0 0 1em 0;
+ margin: 0 0 1em;
}
-.search-home {
- display: block;
- margin-left: auto;
- margin-right: auto;
- width: 50%;
- //padding-top: 7em;
+.result:nth-of-type(2n) {
+ background-color: $brand-primary-light;
}
-.searchbox-home {
- position: absolute;
- padding-left: 12em;
- //padding-top: 2em;
+
+// Footer
+footer {
+ background: $brand-primary;
+ color: $white;
+
+ a {
+ color: $white;
+
+ &:hover,
+ &:focus {
+ color: $brand-primary-light;
+ }
+ }
}
-.searchbox {
- position: absolute;
- padding-left: 50em;
- padding-top: 3em;
+.powered-by a {
+ background-color: $snow;
+ padding: 5px;
}
+
diff --git a/themes/fid_bbi/templates/footer.phtml b/themes/fid_bbi/templates/footer.phtml
index b0a588b181aadc865dd5d567999a551d5bf1d536..a5ec72e2cc10cbdbed0ecf9f40a81a3165a759f8 100644
--- a/themes/fid_bbi/templates/footer.phtml
+++ b/themes/fid_bbi/templates/footer.phtml
@@ -4,39 +4,37 @@
<div class="footer-column">
<p><strong><?=$this->transEsc('Search Options')?></strong></p>
<ul>
- <li><a href="<?=$this->url('search-advanced')?>"><?=$this->transEsc('Advanced Search')?></a></li>
- <li><a href="<?=$this->url('search-sources')?>"><?=$this->transEsc('Datensammlung')?></a></li>
+ <li><a href="<?=$this->url('search-advanced')?>"><?=$this->transEsc('Advanced Search')?></a></li>
+ <li><a href="<?=$this->url('search-sources')?>"><?=$this->transEsc('Datensammlung')?></a></li>
</ul>
</div>
<div class="footer-column">
<p><strong><?=$this->transEsc('More Information')?></strong></p>
- <ul>
- <li><a href="<?=$this->url('content-page', ['page' => 'about'])?>"><?=$this->transEsc('About Us')?></a></li>
- <li><a href="<?=$this->url('content-page', ['page' => 'faq'])?>"><?=$this->transEsc('FAQs')?></a></li>
- <li><a href="<?=$this->url('content-page', ['page' => 'terms'])?>"><?=$this->transEsc('Terms of Use')?></a></li>
- <li><a href="<?=$this->url('content-page', ['page' => 'privacy'])?>"><?=$this->transEsc('Privacy Policy')?></a></li>
+ <ul>
+ <li><a href="<?=$this->url('content-page', ['page' => 'about'])?>"><?=$this->transEsc('About Us')?></a></li>
+ <li><a href="<?=$this->url('content-page', ['page' => 'faq'])?>"><?=$this->transEsc('FAQs')?></a></li>
+ <li><a href="<?=$this->url('content-page', ['page' => 'terms'])?>"><?=$this->transEsc('Terms of Use')?></a></li>
+ <li><a href="<?=$this->url('content-page', ['page' => 'privacy'])?>"><?=$this->transEsc('Privacy Policy')?></a></li>
</ul>
</div>
- <div class="footer-column">
- <p><strong><?=$this->transEsc('Contact')?></strong></p>
- <ul>
- <p>N.N.<br/>
- <?=$this->transEsc('Project Coordination')?><br/>
- <?=$this->transEsc('Phone Number')?>: N.N.<br/>
- <?=$this->transEsc('Email')?>: <a href="mailto:fid@hab.de">fid@hab.de</a></p>
- </ul>
- </div>
+ <div class="footer-column">
+ <p><strong><?=$this->transEsc('Contact')?></strong></p>
+ <p>N.N.<br/>
+ <?=$this->transEsc('Project Coordination')?><br/>
+ <?=$this->transEsc('Phone Number')?>: N.N.<br/>
+ <?=$this->transEsc('Email')?>: <a href="mailto:fid@hab.de">fid@hab.de</a></p>
+ </div>
</div>
- <? /* finc branding footer */ ?>
- <hr>
- <div class="footer-container powered-by">
- <div class="footer-column">
- <?=$this->layout()->poweredBy?>
- <span>Powered by</span>
- <a href="https://vufind.org/" title="vufind.org" target="_blank"><img src="<?=$this->imageLink('vufind_logo.png')?>" alt="powered by VuFind - VuFind Logo"/></a>
- <a href="http://blog.finc.info" title="Blog FinC-Team" target="_blank"><img src="<?=$this->imageLink('finc_logo.png')?>" alt="powered by finc - finc Logo"/></a>
- </div>
+ <?php /* finc branding footer */ ?>
+ <hr>
+ <div class="footer-container powered-by">
+ <div class="footer-column">
+ <?=$this->layout()->poweredBy?>
+ <span>Powered by</span>
+ <a href="https://vufind.org/" title="vufind.org" target="_blank"><img src="<?=$this->imageLink('vufind_logo.png')?>" alt="powered by VuFind - VuFind Logo"/></a>
+ <a href="http://blog.finc.info" title="Blog FinC-Team" target="_blank"><img src="<?=$this->imageLink('finc_logo.png')?>" alt="powered by finc - finc Logo"/></a>
</div>
+ </div>
</footer>
<!-- finc: Footer - END -->
diff --git a/themes/fid_bbi/templates/header.phtml b/themes/fid_bbi/templates/header.phtml
index d864ea08e760728d7e4876275cca3050fb181015..40757e37ef5c07a7b4d3c0a921487e68a877987d 100644
--- a/themes/fid_bbi/templates/header.phtml
+++ b/themes/fid_bbi/templates/header.phtml
@@ -1,15 +1,15 @@
-<!-- finc: header -->
-<? $account = $this->auth()->getManager(); ?>
-<? /* This navbar is the sticky element in the header - CK; you can use 'affix' as an alternative to 'navbar-fixed-top' like so:
+<!-- fid_bbi: header -->
+<?php $account = $this->auth()->getManager(); ?>
+<?php /* 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 */ ?>
+ <?php /* This element only holds the mobile toggler and the navbar-brand/library name - CK */ ?>
<div class="navbar-header">
- <? /* mobile navigation toggler - CK */ ?>
+ <?php /* 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>
@@ -17,30 +17,30 @@
<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>
+ <?php /* Custom finc header - CK */ ?>
<img src="<?=$this->imageLink('headerlogo.png')?>" class="hidden-xs" alt="Logo <?=$this->transEsc("LibraryName")?>" title="<?=$this->transEsc("LibraryName")?>">
- <? /* Custom finc header - END */ ?>
+ <span><?=$this->transEsc("LibraryNameShort")?></span>
+ <?php /* Custom finc header - END */ ?>
</a>
</h1>
</div>
<div class="flex-container">
- <? if (!isset($this->layout()->renderingError)): ?>
+ <?php if (!isset($this->layout()->renderingError)): ?>
<div class="collapse navbar-collapse right" id="header-collapse">
- <? /* finc: right-hand navbar section - see flex-container in SCSS:
+ <?php /* 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()): ?>
+ <?php 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();
+ <?php endif; ?>
+ <?php $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')?>">
@@ -48,9 +48,9 @@
<span class="hidden-sm full<?=!$cart->isFull() ? ' hidden' : ''?>">(<?=$this->transEsc('bookbag_full')?>)</span>
</a>
</li>
- <? endif; ?>
+ <?php endif; ?>
- <? if (isset($this->layout()->themeOptions) && count($this->layout()->themeOptions) > 1): ?>
+ <?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"/>
@@ -58,47 +58,46 @@
<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): ?>
+ <?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>
- <? endforeach; ?>
+ <?php endforeach; ?>
</ul>
</li>
- <? endif; ?>
+ <?php endif; ?>
- <? if (isset($this->layout()->allLangs) && count($this->layout()->allLangs) > 1): ?>
+ <?php 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>
+ <span id="langmenu">
+ <? /* Hide active language and show only second choice,
+ add language code in css for BG image - CK */ ?>
+ <?php foreach ($this->layout()->allLangs as $langCode => $langName): ?>
+ <span<?=$this->layout()->userLang == $langCode ? ' class="hidden"' : ''?>>
+ <a class="btn <?=$langCode?>" href="#" onClick="document.langForm.mylang.value='<?=$langCode?>';document.langForm.submit()"><?=$this->displayLanguageOption($langName)?></a>
+ </span>
+ <?php endforeach; ?>
+ </span>
</li>
- <? endif; ?>
+ <?php endif; ?>
</ul>
</nav>
</div>
- <? endif; ?>
- <? /* finc searchbox: we use searchbox here so it becomes part of the sticky header,
+ <?php endif; ?>
+ <?php /* 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">
+ <?php if ($this->layout()->searchbox !== false): ?>
+ <div class="search container">
<nav class="nav searchbox hidden-print">
<?=$this->layout()->searchbox?>
</nav>
</div>
- <? endif; ?>
- <? /* finc searchbox - END */ ?>
+ <?php endif; ?>
+ <?php /* 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 -->
+<?php /* If you want to use searchbox in a separate row, insert it here as in bootstrap theme - CK */ ?>
+<!-- fid_bbi: header -->
diff --git a/themes/fid_bbi/templates/search/home.phtml b/themes/fid_bbi/templates/search/home.phtml
index 108902f83b52ccc2ce954fffe91afe720f4ca6e4..adbb10811246540070fcc6663cc96be20fa865c5 100644
--- a/themes/fid_bbi/templates/search/home.phtml
+++ b/themes/fid_bbi/templates/search/home.phtml
@@ -1,5 +1,5 @@
<!-- fid_bbi: search - home -->
-<?
+<?php
// Set page title.
$this->headTitle($this->translate('Search Home'));
@@ -20,7 +20,7 @@ $this->layout()->breadcrumbs = false;
?>
<div class="searchHomeContent">
- <?
+ <?php
/* fid_bbi 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:*/
?>
@@ -29,9 +29,9 @@ $this->layout()->breadcrumbs = false;
<?=$this->render('search/searchbox.phtml')?>
</nav>
</div>
- <? /* fid_bbi searchbox - END */ ?>
- <? /* finc-specific: #7187@89bb6e70; VF moved the original BS code to a separate template: helpers - ils-offline.phtml - CK */ ?>
- <?
+ <?php /* fid_bbi searchbox - END */ ?>
+ <?php /* finc-specific: #7187@89bb6e70; VF moved the original BS code to a separate template: helpers - ils-offline.phtml - CK */ ?>
+ <?php
$ilsStatusScript = <<<JS
$(document).ready(function() {
$.ajax({
@@ -46,11 +46,11 @@ $this->layout()->breadcrumbs = false;
});
JS;
?>
- <? /* finc-specific: #7187 - END */ ?>
+ <?php /* finc-specific: #7187 - END */ ?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $ilsStatusScript, 'SET');?>
- <? /* finc: Activate search box here if you want the old look -- otherwise we keep the consisten look with searchbox in header */ ?>
- <? /* =$this->context($this)->renderInContext("search/searchbox.phtml", ['ignoreHiddenFilterMemory' => true])?>
+ <?php /* finc: Activate search box here if you want the old look -- otherwise we keep the consisten look with searchbox in header */ ?>
+ <?php /* =$this->context($this)->renderInContext("search/searchbox.phtml", ['ignoreHiddenFilterMemory' => true])?>
<?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, '$("#searchForm_lookfor").focus();', 'SET'); */ ?>
</div>
diff --git a/themes/fid_bbi/templates/search/searchbox.phtml b/themes/fid_bbi/templates/search/searchbox.phtml
index 7dede105bbcb93611045ac2ae0715c0867d0ca9e..bd8ffbd75df2a086c42f6229d961e99691bc0930 100644
--- a/themes/fid_bbi/templates/search/searchbox.phtml
+++ b/themes/fid_bbi/templates/search/searchbox.phtml
@@ -1,5 +1,5 @@
-<!-- finc: search - searchbox -->
-<?
+<!-- fid_bbi: search - searchbox -->
+<?php
// Set default value if necessary:
if (!isset($this->searchClassId)) {
$this->searchClassId = 'Solr';
@@ -28,109 +28,106 @@ if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) {
}
$hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
?>
-<? $searchTabs = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
-<? if ($this->searchType == 'advanced'): ?>
- <? /* finc: keep .no-margin-t or advanced search box will be pushed down too far (navbar-form) */ ?>
- <div class="navbar-left flip no-margin-t">
- <? $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $searchTabs['tabs']]); ?>
- <? if (!empty($tabs)): ?><?=$tabs?>
- <div class="tab-content clearfix no-gutter-all"><? endif; ?>
+<?php $tabConfig = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
+<?php if ($this->searchType == 'advanced'): ?>
+ <?php /* finc: keep .no-margin-t or advanced search box will be pushed down too far (navbar-form) */ ?>
+ <div class="navbar-form flip no-margin-t">
+ <?php $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?>
+ <?php if (!empty($tabs)): ?><?=$tabs?>
+ <div class="tab-content clearfix no-gutter-all"><?php endif; ?>
<p class="adv_search_terms"><?=$this->transEsc("Your search terms")?> : "<strong><?=$this->escapeHtml($this->lookfor)?></strong>"</p>
- <? /* finc: we use an ul li list, CK */ ?>
+ <?php /* finc: we use an ul li list, CK */ ?>
<ul class="adv_search_links">
<li><a href="<?=$this->url($advSearch)?>?edit=<?=$this->escapeHtmlAttr($this->searchId)?>"><?=$this->transEsc("Edit this Advanced Search")?></a></li>
<li><a href="<?=$this->url($advSearch) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Advanced Search")?></a></li>
<li><a href="<?=$this->url($searchHome) . $hiddenFilterParams?>"><?=$this->transEsc("Start a new Basic Search")?></a></li>
</ul>
- <? if (!empty($tabs)): ?></div><? endif; ?>
+ <?php if (!empty($tabs)): ?></div><?php endif; ?>
</div>
-<? else: ?>
- <form id="searchForm" class="searchForm navbar-form navbar-left flip" role="search" method="get" action="<?=$this->url($basicSearch)?>" name="searchForm" autocomplete="off">
- <?=$this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $searchTabs['tabs']]);?>
- <? $placeholder = $this->searchbox()->getPlaceholderText(isset($searchTabs['selected']['id']) ? $searchTabs['selected']['id'] : null); ?>
- <? /* finc: We use a list here, CK */ ?>
- <ul class="navbar-left list-unstyled">
- <li>
- <? /* finc: we use required='required', CK */ ?>
- <input id="searchForm_lookfor"
- class="searchForm_lookfor form-control search-query<? if ($this->searchbox()->autocompleteEnabled($this->searchClassId)): ?> autocomplete searcher:<?=$this->escapeHtmlAttr($this->searchClassId)?><? endif ?>"
- type="text" name="lookfor" value="<?=$this->escapeHtmlAttr($this->lookfor)?>"<? if ($placeholder): ?> placeholder="<?=$this->transEsc($placeholder)?>"<? endif ?> required="required"/>
- </li>
- <?/* if ($handlerCount > 1): ?>
+<?php else: ?>
+ <form id="searchForm" class="searchForm navbar-form flip" method="get" action="<?=$this->url($basicSearch)?>" name="searchForm" autocomplete="off">
+ <?= $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?>
+ <?php $placeholder = $this->searchbox()->getPlaceholderText($tabConfig['selected']['id'] ?? null); ?>
+ <?php /* finc: keep "required" */ ?>
+ <input id="searchForm_lookfor" class="searchForm_lookfor form-control search-query<?php if($this->searchbox()->autocompleteEnabled($this->searchClassId)):?> autocomplete searcher:<?=$this->escapeHtmlAttr($this->searchClassId) ?><?=$this->searchbox()->autocompleteAutoSubmit($this->searchClassId) ? ' ac-auto-submit' : '' ?><?php endif ?>" type="text" name="lookfor" value="<?=$this->escapeHtmlAttr($this->lookfor)?>"<?php if ($placeholder): ?> placeholder="<?=$this->transEsc($placeholder) ?>"<?php endif ?> aria-label="<?=$this->transEsc("search_terms")?>" required="required" />
+ <?php /* finc: We use a list here, CK */ ?>
+ <ul class="list-unstyled">
+ <?php /* if ($handlerCount > 1): ?>
<li class="hidden-xs">
- <select id="searchForm_type" class="searchForm_type form-control" name="type" data-native-menu="false">
- <? foreach ($handlers as $handler): ?>
+ <select id="searchForm_type" class="searchForm_type form-control" name="type" data-native-menu="false" aria-label="<?=$this->transEsc("Search type")?>">
+ <?php foreach ($handlers as $handler): ?>
<option
value="<?=$this->escapeHtmlAttr($handler['value'])?>"<?=$handler['selected'] ? ' selected="selected"' : ''?>><?=$handler['indent'] ? '-- ' : ''?><?=$this->transEsc($handler['label'])?></option>
- <? endforeach; ?>
+ <?php endforeach; ?>
</select>
</li>
- <? elseif ($handlerCount == 1): ?>
+ <?php elseif ($handlerCount == 1): ?>
<input type="hidden" name="type" value="<?=$this->escapeHtmlAttr($handlers[0]['value'])?>"/>
- <? endif;*/ ?>
+ <?php endif; */ ?>
<li>
- <button type="submit" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i> <span class="find-label"><?/*=$this->transEsc("Find")*/?></span></button>
+ <button type="submit" class="btn btn-primary"><i class="fa fa-search" aria-hidden="true"></i> <span class="find-label sr-only"><?=$this->transEsc("Find")?></span></button>
</li>
- <? /*if ($advSearch): ?>
+ <?php /* if ($advSearch): ?>
<li class="hidden-xs">
- <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : $hiddenFilterParams)?>" class="btn btn-transparent"
- role="button" rel="nofollow"><i class="fa fa-cog"></i> <span class="hidden-xs hidden-sm hidden-md"><?=$this->transEsc("Advanced")?></span></a>
+ <a href="<?=$this->url($advSearch) . ((isset($this->searchId) && $this->searchId) ? '?edit=' . $this->escapeHtmlAttr($this->searchId) : $hiddenFilterParams)?>" class="btn btn-transparent" role="button" rel="nofollow"><i class="fa fa-cog"></i> <span class="hidden-xs hidden-sm hidden-md"><?=$this->transEsc("Advanced")?></span></a>
</li>
- <? endif;*/ ?>
+ <?php endif; */ ?>
<li>
- <? if ($geoUrl = $this->geocoords()->getSearchUrl($options)) : ?>
+ <?php if ($geoUrl = $this->geocoords()->getSearchUrl($options)) : ?>
<a href="<?=$geoUrl?>" class="btn btn-link"><?=$this->transEsc('Geographic Search')?></a>
- <? endif; ?>
+ <?php endif; ?>
</li>
</ul>
- <? /* finc: We hide this for small and keep the solution using labels, same below - CK */ ?>
+ <?php /* finc: We hide this for small and keep the solution using labels, same below - CK */ ?>
<div class="checkbox hidden-xs">
- <? $shards = $options->getShards();
+ <?php $shards = $options->getShards();
if ($options->showShardCheckboxes() && !empty($shards)): ?>
- <?
+ <?php
$selectedShards = isset($this->selectedShards)
? $this->selectedShards : $options->getDefaultSelectedShards();
?>
- <? foreach ($shards as $shard => $val): ?>
- <? $isSelected = empty($selectedShards) || in_array($shard, $selectedShards); ?>
- <input type="checkbox" <?=$isSelected ? 'checked="checked" ' : ''?>name="shard[]" value='<?=$this->escapeHtmlAttr($shard)?>' id='checkbox_<?=$this->escapeHtmlAttr($shard)?>'/> <label for="checkbox_<?=$this->escapeHtmlAttr($shard)?>"><?=$this->transEsc($shard)?></label>
- <? endforeach; ?>
- <? endif; ?>
+ <?php foreach ($shards as $shard => $val): ?>
+ <?php $isSelected = empty($selectedShards) || in_array($shard, $selectedShards); ?>
+ <label for="checkbox_<?=$this->escapeHtmlAttr($shard)?>"><?=$this->transEsc($shard)?>
+ <input type="checkbox" <?=$isSelected ? 'checked="checked" ' : ''?>name="shard[]" value='<?=$this->escapeHtmlAttr($shard)?>' id='checkbox_<?=$this->escapeHtmlAttr($shard)?>'/>
+ </label>
+ <?php endforeach; ?>
+ <?php endif; ?>
</div>
- <?
+ <?php
$filterDetails = $this->searchbox()->getFilterDetails(
isset($this->filterList) && is_array($this->filterList) ? $this->filterList : [],
isset($this->checkboxFilters) && is_array($this->checkboxFilters) ? $this->checkboxFilters : []
);
?>
- <? if ((isset($hasDefaultsApplied) && $hasDefaultsApplied) || !empty($filterDetails)): ?>
- <? $defaultFilterState = $options->getRetainFilterSetting() ? ' checked="checked"' : ''; ?>
+ <?php if ((isset($hasDefaultsApplied) && $hasDefaultsApplied) || !empty($filterDetails)): ?>
+ <?php $defaultFilterState = $options->getRetainFilterSetting() ? ' checked="checked"' : ''; ?>
<div class="checkbox">
- <input type="checkbox"<?=$defaultFilterState?> class="searchFormKeepFilters" id="keepfilters">
- <label for="keepfilters">
+ <label>
+ <input type="checkbox"<?=$defaultFilterState?> class="searchFormKeepFilters"/>
<?=$this->transEsc("basic_search_keep_filters")?>
</label>
</div>
<div class="hidden">
- <? foreach ($filterDetails as $current): ?>
+ <?php foreach ($filterDetails as $current): ?>
<input class="applied-filter" id="<?=$this->escapeHtmlAttr($current['id'])?>" type="checkbox"<?=$defaultFilterState?> name="filter[]" value="<?=$this->escapeHtmlAttr($current['value'])?>"/>
<label for="<?=$this->escapeHtmlAttr($current['id'])?>"><?=$this->escapeHtml($current['value'])?></label>
- <? endforeach; ?>
- <? if (isset($hasDefaultsApplied) && $hasDefaultsApplied): ?>
+ <?php endforeach; ?>
+ <?php if (isset($hasDefaultsApplied) && $hasDefaultsApplied): ?>
<!-- this is a hidden element that flags whether or not default filters have been applied;
it is intentionally unlabeled, as users are not meant to manipulate it directly. -->
<input class="applied-filter" id="dfApplied" type="checkbox" name="dfApplied" value="1"<?=$defaultFilterState?> />
- <? endif; ?>
+ <?php endif; ?>
</div>
- <? endif; ?>
- <? foreach ($hiddenFilters as $key => $filter): ?>
- <? foreach ($filter as $value): ?>
+ <?php endif; ?>
+ <?php foreach ($hiddenFilters as $key => $filter): ?>
+ <?php foreach ($filter as $value): ?>
<input type="hidden" name="hiddenFilters[]" value="<?=$this->escapeHtmlAttr($key) . ':' . $this->escapeHtmlAttr($value)?>"/>
- <? endforeach; ?>
- <? endforeach; ?>
- <?
+ <?php endforeach; ?>
+ <?php endforeach; ?>
+ <?php
/* Show hidden field for active search class when in combined handler mode. */
if ($this->searchbox()->combinedHandlersActive()) {
echo '<input type="hidden" name="activeSearchClassId" value="' . $this->escapeHtmlAttr($this->searchClassId) . '" />';
@@ -144,5 +141,5 @@ $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->s
}
?>
</form>
-<? endif; ?>
-<!-- finc: search - searchbox - END -->
+<?php endif; ?>
+<!-- fid_bbi: search - searchbox - END -->