KPAC 2.7 Upgrade Tweaks

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 12fac12..9edc587 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -24,22 +24,20 @@
         <page id="1" columns="4" name="Home" img="/images/home.jpg">
         <!-- Use type="topic" for top-level categories, type="maintopic" for searches, or type="link" for page links --> 
             
-            <!-- 
-            <cell name="Martin Luther King, Jr. Day" img="cat-mlk.png" type="maintopic">keyword:king martin luther</cell>
-            <cell name="Valentine's Day" img="cat-valentines.png" type="maintopic">keyword:valentine's day</cell> 
+            <cell name="Martin Luther King, Jr." img="cat-mlk.png" type="maintopic">keyword:king martin luther</cell>
+                       <!--
+                       <cell name="Valentine's Day" img="cat-valentines.png" type="maintopic">keyword:valentine's day</cell> 
             <cell name="President's Day" img="cat-history-us.png" type="maintopic">keyword:presidents' day</cell>
             <cell name="St. Patrick's Day" img="cat-stpatricks.png" type="maintopic">keyword:st. patrick's day</cell> 
             <cell name="Easter" img="cat-easter.png" type="maintopic">keyword:easter</cell>
             <cell name="4th of July" img="cat-independence.png" type="maintopic">(keyword:independence day || keyword:fourth of july)</cell>
             <cell name="Back to School" img="cat-school.png" type="maintopic">(keyword:back to school || keyword:goes to school)</cell>
             <cell name="Thanksgiving" img="cat-thanksgiving.png" type="maintopic">keyword:thanksgiving</cell>
-            -->
-
             <cell name="Christmas" img="cat-christmas.png" type="maintopic">keyword:christmas</cell>
             <cell name="Hannukah" img="cat-hannukah.png" type="maintopic">((keyword:hannukah || keyword:hanukkah) || keyword: chanukah)</cell>
             <cell name="Kwanzaa" img="cat-kwanzaa.png" type="maintopic">keyword:kwanzaa</cell>
             <cell name="Happy New Year!" img="cat-newyear.png" type="maintopic">keyword:new year's day</cell>
-                    
+            -->        
             <cell name="Dinosaurs" img="cat-dinosaur.png" type="maintopic">keyword:dinosaur</cell>
             <cell name="Princesses" img="cat-princess.png" type="maintopic">keyword:princess</cell>
             <cell type="topic">10</cell>

diff --git a/Open-ILS/src/templates/kpac/parts/header.tt2 b/Open-ILS/src/templates/kpac/parts/header.tt2
index 36ec6ca..177d212 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/header.tt2
+++ b/Open-ILS/src/templates/kpac/parts/header.tt2
@@ -19,7 +19,7 @@
     </div>
     <div class="header_menu">
         <!-- menu rendered in reverse order -->
-        <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> 
+        <!-- <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> --> 
         <a href="http://www.galileo.usg.edu/kids">GALILEO for Kids</a>
         <a href="http://gapines.org">Full PINES Catalog</a>
         <a href="http://www.georgialibraries.org/directories/pineslibdir.php">Find a Library</a> 

diff --git a/Open-ILS/src/templates/kpac/parts/org_selector.tt2 b/Open-ILS/src/templates/kpac/parts/org_selector.tt2
index 4ea338e..82e5c33 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/kpac/parts/org_selector.tt2
@@ -108,6 +108,9 @@ BLOCK build_org_selector;
 
             pad_depth = pad_depth * 2;
             display_name = loc_grp ? loc_grp.name : korg_unit.name %]
+                       [% IF node_value == 1 %]
+                           [% display_name = "All PINES Libraries" %]
+                   [% END %]                   
 
             <option value='[% node_value %]' [% selected %] [% disabled %] [% css_class %]> 
                 [% '&nbsp;' FOR [0..pad_depth]; display_name | html %]

diff --git a/Open-ILS/src/templates/kpac/results.tt2 b/Open-ILS/src/templates/kpac/results.tt2
index 9a0b0d5..bab0f60 100644 (file)
--- a/Open-ILS/src/templates/kpac/results.tt2
+++ b/Open-ILS/src/templates/kpac/results.tt2
@@ -4,7 +4,13 @@
     WRAPPER "kpac/parts/subpage.tt2";
     ctx.page_title = l('Search Results') %]
         
-<h2 class="sub_header2">[% l('Search Results') %]</h2>
+[% IF ctx.bookbag %]
+    <h2 class="sub_header2">[% ctx.bookbag.name | html %]</h2>
+    <div style="font-weight:bold;font-size:1.5em;text-align:center;">[% ctx.bookbag.description | html %]</div>
+[% ELSE %]
+       <h2 class="sub_header2">[% l('Search Results') %]</h2>
+[% END %]
+
 
 [% IF ctx.records.size == 0 %]
 
@@ -17,7 +23,7 @@
 
     <div class="sub_navigation2">
         [% INCLUDE 'kpac/parts/paginate.tt2' %]
-    </div>
+       </div>
 
     <div id="search_results_parent"> [%
         FOR rec IN ctx.records;

diff --git a/Open-ILS/web/images/kpac/cat-nutrition.png b/Open-ILS/web/images/kpac/cat-nutrition.png
new file mode 100644 (file)
index 0000000..f999d70
Binary files /dev/null and b/Open-ILS/web/images/kpac/cat-nutrition.png differ