From 746471f5a90573b6a79613065a913462163aaaa3 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 25 Jan 2012 14:17:37 -0500
Subject: [PATCH] kpac : template-ifying

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/examples/kpac.xml                    |  9 ++++++---
 Open-ILS/src/templates/kpac/category.tt2      | 15 +++------------
 Open-ILS/src/templates/kpac/parts/grid.tt2    | 16 +++++++++-------
 Open-ILS/src/templates/kpac/parts/subpage.tt2 |  1 -
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml
index 0360d4592c..92182e1087 100644
--- a/Open-ILS/examples/kpac.xml
+++ b/Open-ILS/examples/kpac.xml
@@ -23,9 +23,12 @@
 
         <!-- topic pages -->
         <page id="10" columns="3" name="Book Series" img="category.png">
-            <!--
-            <cell name="Mammals" img="/images/koala.jpg" type="search">su:mammal audience(j)</cell>
-            -->
+            <cell name="Mammals" img="category.png" type="search">su:mammal audience(j)</cell>
+            <cell name="Molluscs" img="category.png" type="search">su:mammal audience(j)</cell>
+            <cell name="Squids" img="category.png" type="search">su:mammal audience(j)</cell>
+            <cell name="Snails" img="category.png" type="search">su:mammal audience(j)</cell>
+            <cell name="Jellyfish" img="category.png" type="search">su:mammal audience(j)</cell>
+            <cell name="Old Yeller" img="category.png" type="search">su:mammal audience(j)</cell>
         </page>
         <page id="11" columns="1" name="Current Events" img="category.png">
         </page>
diff --git a/Open-ILS/src/templates/kpac/category.tt2 b/Open-ILS/src/templates/kpac/category.tt2
index 3ffc210c05..eab0e2df15 100644
--- a/Open-ILS/src/templates/kpac/category.tt2
+++ b/Open-ILS/src/templates/kpac/category.tt2
@@ -1,4 +1,6 @@
 [%  
+    PROCESS "opac/parts/header.tt2";
+    PROCESS "kpac/parts/grid.tt2";
     WRAPPER "kpac/parts/subpage.tt2";
     ctx.page_title = l("Sub Page");
 %]
@@ -6,18 +8,7 @@
 <h2 class="sub_header2">Living Creatures</h2>
 <div class="hr">&nbsp;</div>
 <div class="sub_cat_wrapper">
-    <table cellpadding="0" cellspacing="0" border="0" class="main_category_table">
-        <tr>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Book Series this is more test text</span></a></td>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Current Events</span></a></td>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Book Series</span></a></td>
-        </tr>
-        <tr>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Book Series</span></a></td>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Book Series</span></a></td>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/category.png" alt="" /><span>Book Series</span></a></td>
-        </tr>
-    </table>
+    [% render_kpac_grid(ctx.kpac_config.pages.page.10); %]
 </div>
 
 <div class="sub_navigation1">
diff --git a/Open-ILS/src/templates/kpac/parts/grid.tt2 b/Open-ILS/src/templates/kpac/parts/grid.tt2
index 15214f63f7..fd3471a057 100644
--- a/Open-ILS/src/templates/kpac/parts/grid.tt2
+++ b/Open-ILS/src/templates/kpac/parts/grid.tt2
@@ -1,6 +1,8 @@
 
 [% 
-    MACRO img_path(img) BLOCK;
+    # Use absolute and fully-qualified image URLs as-is.
+    # Otherwise, use the kpac base path.
+    MACRO kpac_img_path(img) BLOCK;
         IF img.match('^/') OR img.match('^https?://');
             img;
         ELSE;
@@ -17,7 +19,7 @@
 <table cellpadding="0" cellspacing="0" border="0" class="main_category_table">
     <tr>
     [% 
-    width = POSIX.floor(100 / ncols);
+    width = 100 / ncols;
     FOR cell IN page.cell;
         IF idx == ncols; 
             %]</tr><tr>[%  
@@ -30,17 +32,17 @@
             topic_page = ctx.kpac_config.pages.page.$page_id %]
 
         <td width="[% width %]%"><a href="javascript:;"><img 
-            src="[% img_path(topic_page.img) %]" alt="" /><span>[% topic_page.name %]</span></a></td>
+            src="[% kpac_img_path(topic_page.img) %]" alt="" /><span>[% topic_page.name %]</span></a></td>
 
         [% ELSIF cell.type == 'search'; %]
 
-        <td>[% cell.name _ ' : ' _ cell.content %]</td>
-        <td><img src="[% ctx.media_prefix %][% cell.img %]"</td>
+        <td width="[% width %]%"><a href="[% mkurl('search_results') %]"><img 
+            src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% ELSIF cell.type == 'link'; %]
 
-        <td>[% cell.name _ ' : ' _ cell.content %]</td>
-        <td><img src="[% ctx.media_prefix %][% cell.img %]"</td>
+        <td width="[% width %]%"><a href="[% mkurl(cell.content) %]"><img 
+            src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% END %]
     [% END %]
diff --git a/Open-ILS/src/templates/kpac/parts/subpage.tt2 b/Open-ILS/src/templates/kpac/parts/subpage.tt2
index 6c950480fe..8f3a06ad74 100755
--- a/Open-ILS/src/templates/kpac/parts/subpage.tt2
+++ b/Open-ILS/src/templates/kpac/parts/subpage.tt2
@@ -1,6 +1,5 @@
 [%  
     PROCESS "opac/parts/header.tt2";
-    PROCESS "kpac/parts/grid.tt2";
     WRAPPER "kpac/parts/base.tt2";
 %]
 
-- 
2.11.0