From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 5 Jan 2015 18:56:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/rel_2_7_1_kpac' into rel_2_7_2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=83dab26cc5c5ef72aa15a29ea7982697e410df5e;p=evergreen%2Fpines.git

Merge remote-tracking branch 'origin/rel_2_7_1_kpac' into rel_2_7_2

Conflicts:
	ChangeLog
	Open-ILS/examples/kpac.xml
	Open-ILS/src/perlmods/lib/OpenILS.pm
	Open-ILS/src/perlmods/lib/OpenILS/Application.pm
	Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
	Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
	Open-ILS/src/sql/Pg/002.schema.config.sql
	Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.4.4-upgrade-db.sql
	Open-ILS/src/sql/Pg/version-upgrade/2.4.3-2.5.0-upgrade-db.sql
	Open-ILS/src/templates/kpac/getit.tt2
	Open-ILS/src/templates/kpac/homedewey.tt2
	Open-ILS/src/templates/kpac/parts/copy_table.tt2
	Open-ILS/src/templates/kpac/parts/header.tt2
	Open-ILS/src/templates/opac/css/style.css.tt2
	Open-ILS/src/templates/opac/parts/config.tt2
	Open-ILS/src/templates/opac/parts/footer.tt2
	Open-ILS/src/templates/opac/parts/header.tt2
	Open-ILS/src/templates/opac/parts/record/authors.tt2
	Open-ILS/src/templates/opac/parts/record/awards.tt2
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
	Open-ILS/src/templates/opac/parts/record/series.tt2
	Open-ILS/src/templates/opac/parts/record/subjects.tt2
	Open-ILS/src/templates/opac/parts/result/table.tt2
	Open-ILS/src/templates/opac/parts/searchbar.tt2
	Open-ILS/src/templates/opac/parts/topnav_links.tt2
	Open-ILS/src/templates/opac/results.tt2
	Open-ILS/web/css/skin/default/kpac/style.css
	Open-ILS/web/js/ui/default/opac/staff.js
	Open-ILS/xul/staff_client/chrome/content/main/about.html
	Open-ILS/xul/staff_client/defaults/preferences/prefs.js
	Open-ILS/xul/staff_client/server/cat/marcedit.js
	Open-ILS/xul/staff_client/windowssetup.nsi
	README
	build/tools/make_release
	configure.ac
	docs/installation/server_installation.txt
	docs/root.txt
---

83dab26cc5c5ef72aa15a29ea7982697e410df5e
diff --cc Open-ILS/examples/kpac.xml
index 7c2825f974,9dad65a2c6..cb01b261b4
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@@ -70,8 -73,7 +72,7 @@@
               <cell name="Book Award Nominees" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=154170;locg=1;trail=11</cell>
               <cell name="Picture Book Winners" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=153205;locg=1;trail=11</cell>
               <cell name="Picture Book Nominees" img="cat-gcba.png" type="link">https://gapines.org/eg/kpac/results?bookbag=154171;locg=1;trail=11</cell>
 -
 +             <cell name="For Young Georgians" img="cat-center.png" type="link">https://gapines.org/eg/kpac/results?bookbag=379799;locg=1;trail=11</cell>
- 
          </page>
  
          <page id="12" columns="2" name="Early Learning" img="cat-123.png">
diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 0452676b6a,8215736a92..c03e28a2dd
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@@ -2280,8 -2225,7 +2280,7 @@@ sub create_prox_list 
      my $lib = shift;
      my $copies = shift;
      my $hold = shift;
 -
 +    my $hold_copy_map = shift || {};
- 
      my %prox_list;
      my $editor = new_editor;
      for my $cp (@$copies) {
diff --cc Open-ILS/src/templates/kpac/homedewey.tt2
index b77a43b9ef,feeffeaeb3..fa66270bc3
--- a/Open-ILS/src/templates/kpac/homedewey.tt2
+++ b/Open-ILS/src/templates/kpac/homedewey.tt2
@@@ -7,8 -7,10 +7,9 @@@
  
               <div class="search_wrapper">
                  <h1>Dewey Decimal Guide</h1>
-                 <p style="font-style:italic;font-size:large;">Use this chart to learn how the library's books are organized!</p>
-                
+                 <p>Use this chart to learn how the library's books are organized on the shelves!</p>
+                 <p>Look at the number next to the subject you are interested in below (for example, 560 for Dinosaurs),<br/>
+                    then find that number on the library's shelves to find those books.</p>
 -               
              </div>
  </div> <!-- this ends the main_header_wrapper div that was started in header.tt2 -->
  
diff --cc Open-ILS/src/templates/opac/css/style.css.tt2
index 8ccaedd75e,ff11bd8688..416e573581
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@@ -29,11 -29,11 +29,6 @@@ img 
      width: 50%;
  }
  
--#surveylink {
--    padding:1em;
--    color:red;
--}
--
  a {
      color: [% css_colors.primary %];
  }
@@@ -47,6 -47,6 +42,7 @@@
      border:1px solid [% css_colors.border_standard %];
      margin:0;
      padding:0;
++    width: 12em;
  }
  
  .searchbar {
diff --cc Open-ILS/src/templates/opac/parts/config.tt2
index 395deb1d0e,76252b937e..8b0e69f3c0
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@@ -110,21 -110,18 +110,22 @@@ facet.default_display_count = 5
  #   lib_selector will put the search library box (with limit to available)
  #   pub_year will put the publication year box
  #   sort_selector will put the sort results selector
 +# id DOM id used for linking labels to form controls.  They are pinned 
 +#   here instead of auto-generated (from the attr type, for example) 
 +#   for consistency.
  
  search.adv_config = [
 -    {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
 -    {adv_label => l("Item Form"), adv_attr => "item_form"},
 -    {adv_label => l("Language"),  adv_attr => "item_lang"},
 -    {adv_label => l("Audience"),  adv_attr => ["audience_group", "audience"], adv_break => 1},
 -    {adv_label => l("Video Format"), adv_attr => "vr_format"},
 -    {adv_label => l("Literary Form"), adv_attr => "lit_form"},
 -    {adv_label => l("Shelving Location"), adv_special => "copy_location", js_only => 1, adv_break => 1},
 -    {adv_label => l("Search Library"), adv_special => "lib_selector"},
 -    {adv_label => l("Publication Year"), adv_special => "pub_year"},
 -    {adv_label => l("Sort Results"), adv_special => "sort_selector"},
 +    {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"], id => 'adv_selector_item_type'},
 +    {adv_label => l("Item Form"), adv_attr => "item_form", id => 'adv_selector_item_form'},
 +    {adv_label => l("Language"),  adv_attr => "item_lang", id => 'adv_selector_item_lang'},
 +    {adv_label => l("Audience"),  adv_attr => ["audience_group", "audience"], id => 'adv_selector_audience', adv_break => 1},
 +    {adv_label => l("Video Format"), adv_attr => "vr_format", id => 'adv_selector_video_format'},
++    {adv_label => l("Bib Level"), adv_attr => "bib_level", id => 'adv_selector_bib_level'},
 +    {adv_label => l("Literary Form"), adv_attr => "lit_form", id => 'adv_selector_lit_form'},
 +    {adv_label => l("Shelving Location"), adv_special => "copy_location", id => 'adv_copy_location_selector', js_only => 1, adv_break => 1},
 +    {adv_label => l("Search Library"), adv_special => "lib_selector", id => 'adv_org_selector'},
 +    {adv_label => l("Publication Year"), adv_special => "pub_year", id => 'adv_selector_pub_year'},
 +    {adv_label => l("Sort Results"), adv_special => "sort_selector", id => 'adv_selector_sort_results'},
  ];
  
  # Set the default height of the select boxes. Defaults to 4.
diff --cc Open-ILS/src/templates/opac/parts/footer.tt2
index 04b99c0c61,a8e62b0f95..4e62f85b52
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@@ -3,16 -3,17 +3,13 @@@
      [% IF ctx.get_org_setting(
          ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
      <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
-         l('Apply for a PINES Library Card') %]</a> &nbsp;|&nbsp;
+         l('Request Library Card') %]</a> &nbsp;|&nbsp;
+     [% ELSE %]
 -    <a href="/eg/opac/home">[% l("Home") %]</a> &nbsp;|&nbsp;
++    <a href="http://example.com">[% l('Bottom Link 2') %]</a> &nbsp;|&nbsp;
      [% END %]
--    <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp;
--    <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;
--    <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp;
-     <a href="http://pines.georgialibraries.org/about/">[% l('About PINES') %]</a> &nbsp;|&nbsp;
 -    <a href="http://www.georgialibraries.org/public/pines.html">[% l('About PINES') %]</a> &nbsp;|&nbsp;
--    <!-- <a href="/">[% l('Dynamic catalog') %]</a> &nbsp;|&nbsp; -->
--    [% gurl = mkurl(ctx.opac_root _ '/galileo', {}, 1) %]
-     <a href="[% gurl %]"> [% l('GALILEO') %] </a> 
 -    <a href="[% gurl %]"> [% l('GALILEO') %] </a> &nbsp;|&nbsp;
++    <a href="http://example.com">[% l('Bottom Link 3') %]</a> &nbsp;|&nbsp;
++    <a href="http://example.com">[% l('Bottom Link 4') %]</a> &nbsp;|&nbsp;
++    <a href="http://example.com">[% l('Bottom Link 5') %]</a>
      [% IF ctx.timing %]
      <div id="timing">
          [% FOR event IN ctx.timing %]
diff --cc Open-ILS/src/templates/opac/parts/record/awards.tt2
index 1500779205,5507128823..d4460e87a2
--- a/Open-ILS/src/templates/opac/parts/record/awards.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/awards.tt2
@@@ -1,19 -1,20 +1,18 @@@
  <div class='rdetail_extras_div'> 
      <div style="margin-bottom:20px;"></div>
  
--        <!-- Chilifresh patron reviews 
--        <strong>[% l('Patron Reviews:') %]</strong>
--        <div style="margin-bottom:20px;">
--            <span class="chili_review" id="isbn_[% attrs.isbn_clean | html %]"> </span>
--            <div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center" width="100%"></div>
--        </div>
--        -->
++    <!-- Chilifresh patron reviews -->
++    <strong>[% l('Patron Reviews:') %]</strong>
++    <div style="margin-bottom:20px;">
++        <span class="chili_review" id="isbn_[% attrs.isbn_clean | html %]"> </span>
++        <div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center" width="100%"></div>
++    </div>
  
 -        <!-- Novelist suggestions-->
 -        [% IF ENV.OILS_NOVELIST_URL %] 
 -            <!-- <div id='novelist-loading'>[% l('Loading...') %]</div> -->
 -            <div data-novelist-novelistselect="[% attrs.isbn_clean || attrs.upc %]"></div>
 -        [% END %]
 +    <!-- Novelist suggestions-->
 +    [% IF ENV.OILS_NOVELIST_URL %] 
 +        <div id='novelist-loading'>[% l('Loading...') %]</div>
 +        <div data-novelist-novelistselect="[% attrs.isbn_clean || attrs.upc %]"></div>
 +    [% END %]
  
 -    </div>
  </div>