Further tweaks to search limits and modifications to book bag links.

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index ff2c3c4..6338462 100644 (file)
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -60,14 +60,14 @@
         </page> 
 
         <page id="11" columns="2" name="Award-Winners" img="cat-caldecott.png" >
-             <cell name="Caldecott Medal" img="cat-caldecott.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153202;page=0;locg=1;depth=0</cell>
-             <cell name="Coretta Scott King" img="cat-king.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153204;page=0;locg=1;depth=0</cell>
-             <cell name="Geisel Award" img="cat-geisel.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153203;page=0;locg=1;depth=0</cell>
-             <cell name="Newbery Medal" img="cat-newbery.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153201;page=0;locg=1;depth=0</cell>
-             <cell name="Georgia Children's Book" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153206;page=0;locg=1;depth=0</cell>
-             <cell name="2014 GCBA Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154170;page=0;locg=1;depth=0</cell>
-             <cell name="Georgia Picture Book" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153205;page=0;locg=1;depth=0</cell>
-             <cell name="2014 GPBA Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154171;page=0;locg=1;depth=0</cell>
+             <cell name="Caldecott Medal" img="cat-caldecott.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153202;locg=1;trail=11</cell>
+             <cell name="Coretta Scott King" img="cat-king.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153204;locg=1;trail=11</cell>
+             <cell name="Geisel Award" img="cat-geisel.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153203;locg=1;trail=11</cell>
+             <cell name="Newbery Medal" img="cat-newbery.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153201;locg=1;trail=11</cell>
+             <cell name="Georgia Children's Book" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153206;locg=1;trail=11</cell>
+             <cell name="2014 GCBA Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154170;locg=1;trail=11</cell>
+             <cell name="Georgia Picture Book" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=153205;locg=1;trail=11</cell>
+             <cell name="2014 GPBA Nominees" img="cat-gcba.png" type="link">https://test.gapines.org/eg/kpac/results?bookbag=154171;locg=1;trail=11</cell>
 
         </page>
 

diff --git a/Open-ILS/src/templates/kpac/parts/grid.tt2 b/Open-ILS/src/templates/kpac/parts/grid.tt2
index 566a6a3..195021d 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/grid.tt2
+++ b/Open-ILS/src/templates/kpac/parts/grid.tt2
@@ -32,7 +32,7 @@ MACRO render_kpac_grid(page_id) BLOCK;
 
         [% ELSIF cell.type == 'simplesearch'; %]
 
-        <td width="[% width %]%"><a href="[%- ctx.kpac_root -%]/results?query=[%- cell.content -%];nosprop=1;trail=[%- CGI.url_param('trail') -%]"><img 
+        <td width="[% width %]%"><a href="[%- ctx.kpac_root -%]/results?query=[%- cell.content -%];nosprop=1;locg=1;trail=[%- CGI.url_param('trail') -%]"><img 
             src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% ELSIF cell.type == 'link'; %]

diff --git a/Open-ILS/src/templates/kpac/parts/searchlimits.tt2 b/Open-ILS/src/templates/kpac/parts/searchlimits.tt2
index c0df245..41121bc 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/searchlimits.tt2
+++ b/Open-ILS/src/templates/kpac/parts/searchlimits.tt2
@@ -4,7 +4,7 @@
 [% newurl = oldurl %]
 
 [% IF (matches = oldurl.match('/results?')) %]
-     <h3>Limit Results By Age Group:</h3>
+     <h3>Results By Age Group:</h3>
      <ul style="font-size:medium;margin-left:-20px;">
 
      [% IF (matches = oldurl.match('audience='));
@@ -26,7 +26,7 @@
      [% IF (matches = oldurl.match('audience=c')) %]
           <li><b>Pre-adolescent (9-13 years)</b></li>
      [% ELSE %]
-          <li><a href="[% newurl %]&fi%3Aaudience=c">Pre-adolescent (9-13 years)</a></li>
+          <li><a href="[% newurl %]&fi%3Aaudience=c">Tween (9-13 years)</a></li>
      [% END %]
 
      [% IF (matches = oldurl.match('audience=')) %]
@@ -37,7 +37,7 @@
      </ul>
 
 
-<h3>Limit Results by Library:</h3>
+<h3>Showing Results For:</h3>
 
 [% PROCESS "kpac/parts/org_selector.tt2" %]
 

diff --git a/Open-ILS/web/kpac/index.html b/Open-ILS/web/kpac/index.html
new file mode 100644 (file)
index 0000000..42c6b8f
--- /dev/null
+++ b/Open-ILS/web/kpac/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+    <head>
+        <meta charset="UTF-8">
+        <meta http-equiv="refresh" content="1;url=/eg/kpac/home">
+        <script type="text/javascript">
+            window.location.href = "/eg/kpac/home"
+        </script>
+        <title>KPAC</title>
+    </head>
+    <body>
+        <p>If you are not redirected automatically, follow the <a  href='/eg/kpac/home'>link to the main page</a>.</p>
+    </body>
+</html>
\ No newline at end of file