[open-ils-commits] [GIT] Evergreen ILS branch master updated. 26d52958c2103cb81914c17bf0d6734a42c2ff03

Evergreen Git git at git.evergreen-ils.org
Thu Aug 23 15:36:11 EDT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  26d52958c2103cb81914c17bf0d6734a42c2ff03 (commit)
       via  ecee476ede872cc671c8fe4887eb6194d6b9ef85 (commit)
      from  6afaf84691f593c8a48e528c4f54ef7f991a8a22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 26d52958c2103cb81914c17bf0d6734a42c2ff03
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Tue May 1 03:22:15 2018 -0500

    Docs: adding release notes and docs for LP1760160
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/different_styles_for_searchbar.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/different_styles_for_searchbar.adoc
new file mode 100644
index 0000000..aca7133
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/different_styles_for_searchbar.adoc
@@ -0,0 +1,10 @@
+New class for searchbar when on the homepage
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This adds the `.searchbar-home` class to the div that
+contains the searchbar when on the homepage.  This allows
+sites to customize the searchbar differently on the
+homepage than in other places the
+search bar appears (for example, offering a large,
+Google-style search bar on the homepage only).
+
diff --git a/docs/admin_initial_setup/different_styles_for_searchbar.adoc b/docs/admin_initial_setup/different_styles_for_searchbar.adoc
new file mode 100644
index 0000000..f1995a6
--- /dev/null
+++ b/docs/admin_initial_setup/different_styles_for_searchbar.adoc
@@ -0,0 +1,24 @@
+Styling the searchbar on the homepage
+-------------------------------------
+
+The `.searchbar-home` class is added to the div that
+contains the searchbar when on the homepage.  This allows
+sites to customize the searchbar differently on the
+homepage than in search results pages, and other places the
+search bar appears.  For example, adding the following CSS
+would create a large, Google-style search bar on the homepage only:
+
+[source,css]
+----
+.searchbar-home .search-box {
+  width: 80%;
+  height: 3em;
+}
+
+.searchbar-home #search_qtype_label,
+.searchbar-home #search_itype_label,
+.searchbar-home #search_locg_label {
+  display:none;
+}
+----
+
diff --git a/docs/root.adoc b/docs/root.adoc
index 25744ed..a282ea5 100644
--- a/docs/root.adoc
+++ b/docs/root.adoc
@@ -114,6 +114,8 @@ include::admin_initial_setup/ordering_materials.adoc[]
 
 include::admin_initial_setup/designing_your_catalog.adoc[]
 
+include::admin_initial_setup/different_styles_for_searchbar.adoc[]
+
 include::admin/search_interface.adoc[]
 
 include::admin_initial_setup/borrowing_items.adoc[]
diff --git a/docs/root_command_line_admin.adoc b/docs/root_command_line_admin.adoc
index 6a60f24..dd28df3 100644
--- a/docs/root_command_line_admin.adoc
+++ b/docs/root_command_line_admin.adoc
@@ -141,6 +141,8 @@ include::admin/template_toolkit.adoc[]
 
 include::admin_initial_setup/designing_your_catalog.adoc[]
 
+include::admin_initial_setup/different_styles_for_searchbar.adoc[]
+
 include::admin/search_interface.adoc[]
 
 include::opac/sitemap.adoc[]

commit ecee476ede872cc671c8fe4887eb6194d6b9ef85
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Sat Mar 31 06:48:49 2018 -0700

    LP1760160: Search bar has a different CSS class when on the home page
    
    To test:
    1. In templates/opac/css/style.css, add some highly noticeable CSS that
    applies to .searchbar-home or an element within .searchbar-home, e.g.
      .searchbar-home .search-box {
        background-color: purple;
        height: 4em;
      }
    2. Go to the home page of your public catalog.  The .searchbar-home .search-box CSS
    should have taken effect.
    3. Go to another page of your public catalog, such as a search results
    or login page.  The CSS should not have taken effect here.
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/opac/home.tt2 b/Open-ILS/src/templates/opac/home.tt2
index 8f120e6..25dd196 100644
--- a/Open-ILS/src/templates/opac/home.tt2
+++ b/Open-ILS/src/templates/opac/home.tt2
@@ -4,7 +4,7 @@
     ctx.metalinks.push('<link rel="canonical" href="' _ mkurl('', {}, 1) _ '" />');
     ctx.page_title = l("Home") %]
     <h2 class="sr-only">[% l('Catalog Home') %]</h2>
-    [% INCLUDE "opac/parts/searchbar.tt2" %]
+    [% INCLUDE "opac/parts/searchbar.tt2" is_home_page=1 %]
     <div id="content-wrapper">
         <div id="main-content-home">
             <div class="common-full-pad"></div>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 4cf34a3..1b6b7cf 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -46,7 +46,7 @@ END;
         <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, expert_search_parms.merge(general_search_parms, facet_search_parms, ['fi:has_browse_entry'])) %]">[% l('Browse the Catalog') %]</a></span>
         [% INCLUDE 'opac/parts/cart.tt2' %]
     </div>
-    <div class="searchbar">
+    <div class="searchbar [% is_home_page ? 'searchbar-home' : '' %]">
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
@@ -54,6 +54,7 @@ END;
             <input type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.user_query) : CGI.param('query') | html %]"
+                class="search-box"
                 [%- IF use_autosuggest.enabled == "t" %]
                 dojoType="openils.widget.AutoSuggest" type_selector="'qtype'"
                 submitter="this.textbox.form.submit();"

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/home.tt2               |    2 +-
 Open-ILS/src/templates/opac/parts/searchbar.tt2    |    3 +-
 .../OPAC/different_styles_for_searchbar.adoc       |   10 ++++++++
 .../different_styles_for_searchbar.adoc            |   24 ++++++++++++++++++++
 docs/root.adoc                                     |    2 +
 docs/root_command_line_admin.adoc                  |    2 +
 6 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/different_styles_for_searchbar.adoc
 create mode 100644 docs/admin_initial_setup/different_styles_for_searchbar.adoc


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list