From 5f29fb0bbb73d1ca2c44491df5911bfb12815165 Mon Sep 17 00:00:00 2001 From: Aspectis <tobias@aspectis.net> Date: Thu, 1 Apr 2021 19:14:12 +0200 Subject: [PATCH] refs #18783 [fid_bbi] change front page layout and contents * Extend, simplify and rename grid classes, now supporting a 12-column grid system similar to Bootstrap. * Add links to search box and footer. * Make footer 3 columns and move links to the right. * Change post excerpt suffix to prevent breaks directly before the ellipsis. * add icons for database and sources * remove indention from address TODO: Some texts still require translation. --- fid_bbi/config/vufind/config.ini | 4 +- themes/fid_bbi/icons/database.svg | 1 + themes/fid_bbi/icons/sources.svg | 1 + themes/fid_bbi/languages/de.ini | 24 ++++--- themes/fid_bbi/languages/en.ini | 18 ++--- themes/fid_bbi/scss/base/common.scss | 2 +- themes/fid_bbi/scss/blocks/box.scss | 4 -- themes/fid_bbi/scss/blocks/flex.scss | 82 --------------------- themes/fid_bbi/scss/blocks/footer.scss | 54 ++++++-------- themes/fid_bbi/scss/blocks/grid.scss | 42 +++++++++++ themes/fid_bbi/scss/blocks/item-list.scss | 2 +- themes/fid_bbi/scss/compiled.scss | 2 +- themes/fid_bbi/templates/footer.phtml | 84 +++++++++++++--------- themes/fid_bbi/templates/header.phtml | 20 ++++-- themes/fid_bbi/templates/search/home.phtml | 57 +++++++++++---- 15 files changed, 208 insertions(+), 189 deletions(-) create mode 100644 themes/fid_bbi/icons/database.svg create mode 100644 themes/fid_bbi/icons/sources.svg delete mode 100644 themes/fid_bbi/scss/blocks/flex.scss create mode 100644 themes/fid_bbi/scss/blocks/grid.scss diff --git a/fid_bbi/config/vufind/config.ini b/fid_bbi/config/vufind/config.ini index 1b0e66222d6..bb1c1b6a18d 100644 --- a/fid_bbi/config/vufind/config.ini +++ b/fid_bbi/config/vufind/config.ini @@ -100,7 +100,7 @@ xml_doc = "?feed=rss2" input_date_format = "D, j M Y G:i:s O" excerpt_length = 150 ; excerpt_suffix is the string added to excerpts to denote they were shortened -excerpt_suffix = " ..." +excerpt_suffix = " …" limit = 4 ; set cache_ttl to ; * number of seconds for cache lifetime @@ -209,4 +209,4 @@ alphabetical_order = true BookHistoryOnline = "https://fid-bbi.idm.oclc.org/login?url=https://bibliographies.brillonline.com/browse/book-history-online" [ExternalDatabases] -DBIS = true \ No newline at end of file +DBIS = true diff --git a/themes/fid_bbi/icons/database.svg b/themes/fid_bbi/icons/database.svg new file mode 100644 index 00000000000..804bba5806b --- /dev/null +++ b/themes/fid_bbi/icons/database.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path fill="none" d="M3 4h22v4H3zm0 8h22v4H3zm0 8h22v4H3z"/></svg> diff --git a/themes/fid_bbi/icons/sources.svg b/themes/fid_bbi/icons/sources.svg new file mode 100644 index 00000000000..d27dbc49245 --- /dev/null +++ b/themes/fid_bbi/icons/sources.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" height="28" width="28"><path fill="none" d="M2 2h4v4H2zm10 0h4v4h-4zm10 0h4v4h-4zM4 6v6h20V6M10 18h8v8h-8zm4-11v10"/></svg> \ No newline at end of file diff --git a/themes/fid_bbi/languages/de.ini b/themes/fid_bbi/languages/de.ini index 2dfa9bcc701..5bb265033b8 100644 --- a/themes/fid_bbi/languages/de.ini +++ b/themes/fid_bbi/languages/de.ini @@ -1,4 +1,5 @@ %%count%% results = %%count%% Ergebnisse +Accessibility = Barrierefreiheit Active Filters = Aktive Filter Add filter: = Filter hinzufügen: Add filter: NOT %%text%% = Filter hinzufügen: NICHT %%text%% @@ -7,8 +8,12 @@ Add to favorites = Zu Favoriten hinzufügen Back = Zurück BBI Blog = BBI-Blog Book Bag = Merkliste +Browse data sources = Datenquellen durchsuchen Close = Schließen Close functions & filters = Funktionen & Filter schließen +Contact Form = Kontaktformular +Data Sources = Datenquellen +Databases = Datenbanken FAQs = Häufige Fragen Filters are kept = Filter werden beibehalten Filters are not kept = Filter werden nicht beibehalten @@ -27,6 +32,7 @@ Remove all filters = Alle Filter entfernen Scroll to top = Nach oben scrollen Search: %%lookfor%% = Suche: %%lookfor%% Show all = Alle anzeigen +Show databases = Datenbanken anzeigen Show functions & filters = Funktionen & Filter anzeigen Show less = Weniger anzeigen Sorted by = Sortiert nach @@ -35,6 +41,8 @@ the year = zum Jahr This field is required = Pflichtfeld to = bis +404_message = Diese Seite gibt es leider nicht. Wenn an dieser Stelle eigentlich eine Seite erscheinen sollte, <a href="mailto:%%email%%">lassen Sie uns das bitte wissen</a>. Ansonsten wäre das doch eine gute Gelegenheit für eine Pause und eine heiße Tasse Tee. + boss_true = In Ihrer Bibliothek vorhanden boss_false = Nicht in Ihrer Heimatbibliothek vorhanden. Ob der Titel per Fernleihe bestellbar ist, kann Ihnen Ihre Heimatbibliothek mitteilen. boss_noISXNZBD = "Für diesen Titel können wir derzeit leider keine weiteren Informationen zur Verfügbarkeit bereitstellen. Ob der Titel per Fernleihe bestellbar ist, kann Ihnen Ihre Heimatbibliothek mitteilen." @@ -42,14 +50,14 @@ boss_noISXNZBD = "Für diesen Titel können wir derzeit leider keine weiteren In history_purge = Nicht gespeicherte Suchanfragen entfernen history_recent_searches = Ihre aktuellen Suchanfragen -404_message = Diese Seite gibt es leider nicht. Wenn an dieser Stelle eigentlich eine Seite erscheinen sollte, <a href="mailto:%%email%%">lassen Sie uns das bitte wissen</a>. Ansonsten wäre das doch eine gute Gelegenheit für eine Pause und eine heiße Tasse Tee. - -home_about_1 = <p class="-columns">Der Fachinformationsdienst Buch-, Bibliotheks- und InformationsÂwissenÂschaft (FID BBI) stellt SpezialÂliteratur und forschungsÂrelevante InformaÂtionen für Forschende der drei DisziÂplinen zur Verfügung. Das HerzÂstück bildet das umfangreiche RechercheÂwerkzeug in dem Forschende, Lehrende und StudieÂrende in über 3 Millionen DatenÂsätzen gezielt recherÂchieren können. Der DatenÂpool speist sich aus über 30 DatenÂquellen, die regelÂmäßig aktualiÂsiert und ergänzt werden.</p> -home_about_2 = <h2>Anregungen und Feedback</h2><p>Der FID BBI richtet sich an den Bedarfen der Forschenden aus. Vermissen Sie eine Datenquelle, können Sie einen bestimmten Titel nicht finden oder suchen Sie ausführlichere Informationen zum FID BBI, <a href="%%feedback_url%%">kontaktieren Sie uns</a> oder <a href="%%blog_url%%">besuchen Sie unser Blog</a>.</p> -home_about_3 = <h2>Bereitstellung von Spezialliteratur</h2><p>Für Forschende der Fächer Buch-, Bibliotheks- und Informationswissenschaft lizenziert der FID BBI fachspezifische Datenbanken, auf die über das Nachweisportal zugegriffen werden kann. Außerdem können Forschende Spezialliteratur direkt über den FID BBI beziehen.</p><p>Haben Sie die von Ihnen gesuchte Publikation nicht gefunden, <a href="%%feedback_url%%">kontaktieren Sie uns</a>. Wir kümmern uns darum.</p> -home_step_1 = <p>Suchen Sie in über 3 Millionen Datensätzen.</p> -home_step_2 = <p>Greifen Sie auf SpezialÂliteratur und forschungsÂrelevante Informationen für die Buch-, Bibliotheks- und InformationsÂwissenschaft zu.</p> -home_step_3 = <p>Registrieren Sie sich kostenlos für die Nutzung weiterer Funktionen.</p> +home_databases = <h2>Datenbanken</h2><p>Ãœber das Portal des FID BBI hinaus gibt es noch zahlreiche weitere Datenbanken, die für die Buch-, Bibliotheks- und Informationswissenschaften relevant sind. Hier finden Sie eine Ãœbersicht.</p> +home_provision = <h2>Bereitstellung von Spezialliteratur</h2><p>Für Forschende der Fächer Buch-, Bibliotheks- und Informationswissenschaft lizenziert der FID BBI fachspezifische Datenbanken, auf die über das Nachweisportal zugegriffen werden kann. Außerdem können Forschende Spezialliteratur direkt über den FID BBI beziehen.</p><p>Haben Sie die von Ihnen gesuchte Publikation nicht gefunden, <a href="%%feedback_url%%">kontaktieren Sie uns</a>. Wir kümmern uns darum.</p> +home_sources = <h2>Unsere Datenquellen</h2><p>Die Titeldaten, die im Portal recherchiert werden können, stammen aus verschiedensten Quellen. Welche das sind, und wie sie gefiltert werden, können Sie hier nachvollziehen.</p> +home_step_1 = <p>Der Fachinformationsdienst Buch-, Bibliotheks- und InformationsÂwissenÂschaft (FID BBI) stellt SpezialÂliteratur und forschungsÂrelevante InformaÂtionen für Forschende der drei DisziÂplinen zur Verfügung.</p> +home_step_2 = <p>Forschende, Lehrende und StudieÂrende können in über 3 Millionen DatenÂsätzen gezielt recherÂchieren.</p> +home_step_3 = <p>Der DatenÂpool speist sich aus über 30 DatenÂquellen, die regelÂmäßig aktualiÂsiert und ergänzt werden.</p> +home_step_4 = <p>Registrieren Sie sich kostenlos für die Nutzung weiterer Funktionen.</p> +home_suggestions = <h2>Anregungen und Feedback</h2><p>Der FID BBI richtet sich an den Bedarfen der Forschenden aus. Vermissen Sie eine Datenquelle, können Sie einen bestimmten Titel nicht finden oder suchen Sie ausführlichere Informationen zum FID BBI, <a href="%%feedback_url%%">kontaktieren Sie uns</a> oder <a href="%%blog_url%%">besuchen Sie unser Blog</a>.</p> home_tagline = Das Nachweisportal für die <br>Buch-, BiblioÂtheks- und InformaÂtionsÂwissenÂschaft licenses_BookHistoryOnline = Bibliographie "Book History Online" bei brill.com diff --git a/themes/fid_bbi/languages/en.ini b/themes/fid_bbi/languages/en.ini index db7f172155a..614530aaf74 100644 --- a/themes/fid_bbi/languages/en.ini +++ b/themes/fid_bbi/languages/en.ini @@ -12,6 +12,8 @@ Scroll to top = Scroll to top Team = Team This field is required = This field is required +404_message = Unfortunately, this page does not exist. If you are certain that there should be a page here, <a href="mailto:%%email%%">please let us know</a>. Otherwise, how about taking a break and getting a hot cup of tea? + boss_true = Available in your library boss_false = "Not available in your home library. Your home library can tell you whether the title can be ordered by interlibrary loan." boss_noISXNZBD = "Unfortunately, we cannot provide any further information on availability for this title at the moment. Your home library can tell you whether the title can be ordered by interlibrary loan." @@ -19,14 +21,14 @@ boss_noISXNZBD = "Unfortunately, we cannot provide any further information on av history_purge = Discard unsaved searches history_recent_searches = Your Recent Searches -404_message = Unfortunately, this page does not exist. If you are certain that there should be a page here, <a href="mailto:%%email%%">please let us know</a>. Otherwise, how about taking a break and getting a hot cup of tea? - -home_about_1 = <p class="-columns">The Specialized Information Program on Book Studies, Library and Information Science (FID BBI) provides literature and information for researchers in the three disciplines. The core of our service is our research tool in which researchers, lecturers and students can conduct targeted research in over 3 million data records. The data pool is fed by over 30 data sources that are regularly updated.</p> -home_about_2 = <h2>Suggestions and Feedback</h2><p>The FID BBI is designed to meet the needs of researchers. If you are missing a data source, cannot find a particular title, or are looking for more detailed information about the FID BBI, <a href="%%feedback_url%%">contact us</a> or <a href="%%blog_url%%">visit our blog</a>.</p> -home_about_3 = <h2>Provision of Specialized Literature</h2><p>The FID BBI licenses full-text and reference databases for researchers in the fields of book studies, library and information science, which can be accessed via the reference portal. In addition, researchers can obtain specialized literature directly from the FID BBI. If you have not found the publication you are looking for, <a href="%%feedback_url%%">please contact us</a>. We will take care of it.</p> -home_step_1 = <p>Search over 3 million records.</p> -home_step_2 = <p>Access specialized literature and information for book studies as well as library and information science.</p> -home_step_3 = <p>Register for free to use additional features.</p> +home_databases = <h2>TODO: Translate. Databases</h2><p>Ãœber das Portal des FID BBI hinaus gibt es noch zahlreiche weitere Datenbanken, die für die Buch-, Bibliotheks- und Informationswissenschaften relevant sind. Hier finden Sie eine Ãœbersicht.</p> +home_provision = <h2>Provision of Specialized Literature</h2><p>The FID BBI licenses full-text and reference databases for researchers in the fields of book studies, library and information science, which can be accessed via the reference portal. In addition, researchers can obtain specialized literature directly from the FID BBI. If you have not found the publication you are looking for, <a href="%%feedback_url%%">please contact us</a>. We will take care of it.</p> +home_sources = <h2>TODO: Translate. Our Data Sources</h2><p>Die Titeldaten, die im Portal recherchiert werden können, stammen aus verschiedensten Quellen. Welche das sind, und wie sie gefiltert werden, können Sie hier nachvollziehen.</p> +home_step_1 = <p>The Specialized Information Program on Book Studies, Library and Information Science (FID BBI) provides literature and information for researchers in the three disciplines.</p> +home_step_2 = <p>Researchers, lecturers and students can conduct targeted research in over 3 million data records.</p> +home_step_3 = <p>The data pool is fed by over 30 data sources that are regularly updated.</p> +home_step_4 = <p>Registrieren Sie sich kostenlos für die Nutzung weiterer Funktionen.</p> +home_suggestions = <h2>Suggestions and Feedback</h2><p>The FID BBI is designed to meet the needs of researchers. If you are missing a data source, cannot find a particular title, or are looking for more detailed information about the FID BBI, <a href="%%feedback_url%%">contact us</a> or <a href="%%blog_url%%">visit our blog</a>.</p> home_tagline = The Main Research Catalogue for<br> Book Studies, Library and Information Science licenses_BookHistoryOnline = "Book History Online" bibliography hosted at brill.com diff --git a/themes/fid_bbi/scss/base/common.scss b/themes/fid_bbi/scss/base/common.scss index a0f667dc343..aecda084853 100644 --- a/themes/fid_bbi/scss/base/common.scss +++ b/themes/fid_bbi/scss/base/common.scss @@ -227,7 +227,7 @@ p { text-align: right; } - address & { + address > & { margin: 0; } diff --git a/themes/fid_bbi/scss/blocks/box.scss b/themes/fid_bbi/scss/blocks/box.scss index ac64830e3e7..6f71b3d0db1 100644 --- a/themes/fid_bbi/scss/blocks/box.scss +++ b/themes/fid_bbi/scss/blocks/box.scss @@ -105,8 +105,4 @@ } } } - - > :last-child { - margin-bottom: 0; - } } diff --git a/themes/fid_bbi/scss/blocks/flex.scss b/themes/fid_bbi/scss/blocks/flex.scss deleted file mode 100644 index 59cbcfad46e..00000000000 --- a/themes/fid_bbi/scss/blocks/flex.scss +++ /dev/null @@ -1,82 +0,0 @@ -.flex { - display: flex; - flex-direction: column; - - > * { - flex: 1; - } - - &.-break-small { - @media #{$bp3} { - flex-direction: row; - } - } - - &.-break-medium { - @media #{$bp3} { - flex-direction: row; - } - } - - &.-break-large { - @media #{$bp5} { - flex-direction: row; - } - } - - &.-gap { - margin: g(-1); - - > * { - margin: g(1); - } - } - - &.-gap-half { - margin: g(-.5); - - > * { - margin: g(.5); - } - } - - &.-margin { - margin-bottom: g(); - - &.-gap { - margin-bottom: g(-1 + 1); - } - - &.-gap-half { - margin-bottom: g(-.5 + 1); - } - } - - &.-margin-double { - margin-bottom: g(2); - - &.-gap { - margin-bottom: g(-1 + 2); - } - - &.-gap-half { - margin-bottom: g(-.5 + 2); - } - } -} - -.flex_0 { - flex: 0; -} - -.flex_1 { - flex: 1; -} - -.flex_2 { - flex: 2; -} - -.flex_3 { - flex: 3; -} diff --git a/themes/fid_bbi/scss/blocks/footer.scss b/themes/fid_bbi/scss/blocks/footer.scss index 051d425bd0e..556ad280c24 100644 --- a/themes/fid_bbi/scss/blocks/footer.scss +++ b/themes/fid_bbi/scss/blocks/footer.scss @@ -4,12 +4,17 @@ overflow: hidden; // Prevent box background from leaking padding: 0 g(); + address, + p { + max-width: none; + } + .box.-left { clip-path: none; font-weight: normal; margin-bottom: 0; margin-top: 0; - padding: g(1); + padding: g() g() g(2); &::after { background: $text-muted-color; @@ -20,19 +25,24 @@ } } } +} - .flex { - flex-direction: column; +.footer_links { + margin: g(-.5) g(-.5) g(-.5 - 1) g(-.5) !important; // override last-child margin + padding: 0; + width: auto; - @media #{$bp4} { - flex-direction: row-reverse; - } + a { + color: inherit; } -} -.footer_wrap { - margin: 0 auto; - max-width: $max-width; + li { + margin: g(.5); + + &::before { + content: none; + } + } } .footer_partners { @@ -57,27 +67,9 @@ max-height: g(2); max-width: g(8); } - - .flex { - align-items: center; - } } -.footer_links { - list-style: none; - margin: g(-.5) g(-.5) g(-.5 + 1); - padding: 0; - - a { - color: inherit; - } - - li { - display: inline-block; - margin: g(.5); - - &::before { - content: none; - } - } +.footer_wrap { + margin: 0 auto; + max-width: $max-width; } diff --git a/themes/fid_bbi/scss/blocks/grid.scss b/themes/fid_bbi/scss/blocks/grid.scss new file mode 100644 index 00000000000..75710424a88 --- /dev/null +++ b/themes/fid_bbi/scss/blocks/grid.scss @@ -0,0 +1,42 @@ +.grid { + // display: flex; + flex-direction: column; + margin: g(-1); + + > * { + flex: 1; + padding: g(); + } + + &.-break-small { + @media #{$bp3} { + display: flex; + flex-direction: row; + } + } + + &.-break-medium { + @media #{$bp4} { + display: flex; + flex-direction: row; + } + } + + &.-break-large { + @media #{$bp5} { + display: flex; + flex-direction: row; + } + } + + &.-margin-bottom { + margin-bottom: g(); + } +} + +@for $i from 1 through 12 { + .grid_#{$i} { + flex: percentage($i / 12); + min-width: percentage($i / 12); + } +} diff --git a/themes/fid_bbi/scss/blocks/item-list.scss b/themes/fid_bbi/scss/blocks/item-list.scss index c1b5810667b..4e95ea52465 100644 --- a/themes/fid_bbi/scss/blocks/item-list.scss +++ b/themes/fid_bbi/scss/blocks/item-list.scss @@ -1,5 +1,5 @@ .item-list { - // + @include paragraph; } .item-list_item { diff --git a/themes/fid_bbi/scss/compiled.scss b/themes/fid_bbi/scss/compiled.scss index f802bd7a13f..0081a402c6f 100644 --- a/themes/fid_bbi/scss/compiled.scss +++ b/themes/fid_bbi/scss/compiled.scss @@ -31,9 +31,9 @@ @import 'blocks/container'; @import 'blocks/facet'; @import 'blocks/filters'; -@import 'blocks/flex'; @import 'blocks/footer'; @import 'blocks/form'; +@import 'blocks/grid'; @import 'blocks/header'; @import 'blocks/icon'; @import 'blocks/item-list'; diff --git a/themes/fid_bbi/templates/footer.phtml b/themes/fid_bbi/templates/footer.phtml index 72bc0cff302..bfda00e750a 100644 --- a/themes/fid_bbi/templates/footer.phtml +++ b/themes/fid_bbi/templates/footer.phtml @@ -2,40 +2,60 @@ <footer class="footer"> <div class="footer_wrap"> <div class="box -left"> - <div class="flex -break-medium -gap"> - <div class="column"> - <ul class="footer_links"> - <li> - <a href="<?=$this->url('fid/user/policy')?>"> - <?=$this->translate('Privacy Policy')?> - </a> - </li> - <li> - <a href="<?=$this->url('content-page', ['page' => 'impressum'])?>"> - <?=$this->translate('Legal Notes')?> - </a> - </li> - <li> - <a href="<?=$this->url('feedback-home')?>"> - <?=$this->translate('Contact')?> - </a> - </li> - </ul> - <div class="footer_contact"> - <address> - <?php // TODO: Translate other contact strings? ?> - <p>Fachinformationsdienst <br>Buch-, Bibliotheks- und Informationswissenschaft</p> - <p>Anna Lingnau</p> - <p><?=$this->translate('Project Coordination')?></p> - <p>Herzog August Bibliothek</p> - <p>Postfach 1364</p> - <p>38299 Wolfenbüttel</p> - <p><br>Tel. +49 (0) 5331 808-321</p> - <p><a href="mailto:fid@hab.de">fid@hab.de</a></p> - </address> + <div class="grid -break-large"> + <div class="grid_6"> + <div class="grid -break-small"> + <div class="grid_3" style="order: 9"> + <ul class="footer_links"> + <li> + <a href="<?=$this->url('content-page', ['page' => 'impressum'])?>"> + <?=$this->translate('Legal Notes')?> + </a> + </li> + <li> + <a href="<?=$this->url('fid/user/policy')?>"> + <?=$this->translate('Privacy Policy')?> + </a> + </li> + <li> + <a href="#TODO"> + <?=$this->translate('Accessibility')?> + </a> + </li> + <li> + <a href="#TODO"> + <?=$this->translate('Terms of Use')?> + </a> + </li> + <li> + <a href="<?=$this->url('feedback-home')?>"> + <?=$this->translate('Contact Form')?> + </a> + </li> + </ul> + </div> + + <div class="grid_3"> + <div class="footer_contact"> + <address> + <?php // TODO: Translate other contact strings? ?> + <p>Fachinformationsdienst <br>Buch-, Bibliotheks- und Informationswissenschaft</p> + <br> + <p>Anna Lingnau</p> + <p><?=$this->translate('Project Coordination')?></p> + <p>Herzog August Bibliothek</p> + <p>Postfach 1364</p> + <p>38299 Wolfenbüttel</p> + <br> + <p>Tel. +49 (0) 5331 808-321</p> + <p><a href="mailto:fid@hab.de">fid@hab.de</a></p> + </address> + </div> + </div> </div> </div> - <div class="column"> + + <div class="grid_6" style="order: -1"> <div class="footer_partners"> <a href="https://www.ub.uni-leipzig.de/"> <img src="<?=$this->imageLink('ubl-logo.svg')?>" alt="Universitätsbibliothek Leipzig"> diff --git a/themes/fid_bbi/templates/header.phtml b/themes/fid_bbi/templates/header.phtml index 7c2aa9953c0..689d9e12b74 100644 --- a/themes/fid_bbi/templates/header.phtml +++ b/themes/fid_bbi/templates/header.phtml @@ -36,31 +36,37 @@ <div class="search_links"> <ul> <li> - <a class="link-with-icon" href="<?=$this->url('search-sources')?>"> + <a class="link-with-icon" href="<?=$this->url('resources')?>"> <?=$this->icon('arrow-right')?> - <?=$this->transEsc('Data Collection')?> + <?=$this->translate('Data Sources')?> + </a> + </li> + <li> + <a class="link-with-icon" href="<?=$this->url('myresearch/databases')?>"> + <?=$this->icon('arrow-right')?> + <?=$this->translate('Databases')?> </a> </li> <li> <a class="link-with-icon" href="<?=$this->url('search-advanced')?>"> <?=$this->icon('arrow-right')?> - <?=$this->transEsc('Advanced Search')?> + <?=$this->translate('Advanced Search')?> </a> </li> </ul> </div> <?php else: ?> <div class="search_header"> - <h2><?=$this->transEsc("Search")?></h2> + <h2><?=$this->translate('Search')?></h2> <!-- TODO: Add JS for button --> <button class="-icon-only -small" type="button" aria-controls="search" - aria-label="<?=$this->transEsc('Close search')?>" + aria-label="<?=$this->translate('Close search')?>" > <?=$this->icon('x')?> - <span class="sr-only"><?=$this->transEsc('Close')?>"</span> + <span class="sr-only"><?=$this->translate('Close')?>"</span> </button> </div> @@ -68,7 +74,7 @@ <div class="search_menu"> <a href="<?=$this->url('search-advanced')?>"> - <?=$this->transEsc('Advanced Search')?> + <?=$this->translate('Advanced Search')?> </a> </div> <?php endif; ?> diff --git a/themes/fid_bbi/templates/search/home.phtml b/themes/fid_bbi/templates/search/home.phtml index 474c47e37c5..e01c0854637 100644 --- a/themes/fid_bbi/templates/search/home.phtml +++ b/themes/fid_bbi/templates/search/home.phtml @@ -6,8 +6,8 @@ $this->layout()->breadcrumbs = false; <p class="tagline"><?=$this->translate('home_tagline')?></p> -<div class="flex -break-large -gap -margin-double"> - <div class="flex_2"> +<div class="grid -break-large -margin-bottom"> + <div class="grid_8"> <h2 class="sr-only"><?=$this->translate('Recent Blog Posts')?></h2> <?php $posts = $this->rss(); ?> @@ -28,43 +28,76 @@ $this->layout()->breadcrumbs = false; <?php endif; ?> </div> - <div class="flex_1"> + <div class="grid_4"> <div class="item-list"> <div class="item-list_item"> - <div class="item-list_prefix">1</div> + <div class="item-list_prefix"> + <span aria-hidden="true">i</span> + </div> <div class="item-list_content"> <?=$this->translate('home_step_1')?> </div> </div> <div class="item-list_item"> - <div class="item-list_prefix">2</div> + <div class="item-list_prefix"> + <?=$this->icon('magnifier')?> + </div> <div class="item-list_content"> <?=$this->translate('home_step_2')?> </div> </div> <div class="item-list_item"> - <div class="item-list_prefix">3</div> + <div class="item-list_prefix"> + <?=$this->icon('sources')?> + </div> <div class="item-list_content"> <?=$this->translate('home_step_3')?> </div> </div> + <div class="item-list_item"> + <div class="item-list_prefix"> + <?=$this->icon('signup')?> + </div> + <div class="item-list_content"> + <?=$this->translate('home_step_4')?> + </div> + </div> </div> </div> </div> <div class="box -left"> - <?=$this->translate('home_about_1')?> + <div class="grid -break-medium"> + <div class="grid_6"> + <?=$this->translate('home_sources')?> + <p> + <a class="link-with-icon" href="<?=$this->url('resources')?>"> + <?=$this->icon('arrow-right')?> + <?=$this->translate('Browse data sources')?> + </a> + </p> + </div> + <div class="grid_6"> + <?=$this->translate('home_databases')?> + <p> + <a class="link-with-icon" href="<?=$this->url('myresearch/databases')?>"> + <?=$this->icon('arrow-right')?> + <?=$this->translate('Show databases')?> + </a> + </p> + </div> + </div> </div> -<div class="flex -break-medium -gap"> - <div> - <?=$this->translate('home_about_2', [ +<div class="grid -break-medium"> + <div class="grid_6"> + <?=$this->translate('home_suggestions', [ '%%feedback_url%%' => $this->url('feedback-home'), '%%blog_url%%' => '#' // TODO: Add blog URL ])?> </div> - <div> - <?=$this->translate('home_about_3', [ + <div class="grid_6"> + <?=$this->translate('home_provision', [ '%%feedback_url%%' => $this->url('feedback-home'), ])?> </div> -- GitLab