Testing modifications to navigation.

diff --git a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2
index 4532070..15abce0 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2
+++ b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2
@@ -2,7 +2,7 @@
     [% clear_params = ['action', 'hold', 'pickup_lib', 'ac', 'copy_limit', 'copy_offset', 'list'] %]
 
     <!-- home page -->
-    <a href="[% mkurl(ctx.kpac_root _ '/home', {}, ['trail', 'page']) %]" 
+    <a href="[%- ctx.kpac_root -%]/home" 
         class="bread_home"><img alt="[% l('Home') %]" 
         src="[% ctx.media_prefix %]/images/kpac/home_icon.png" /></a>
 

diff --git a/Open-ILS/src/templates/kpac/parts/grid.tt2 b/Open-ILS/src/templates/kpac/parts/grid.tt2
index 803ead5..566a6a3 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/grid.tt2
+++ b/Open-ILS/src/templates/kpac/parts/grid.tt2
@@ -27,13 +27,12 @@ MACRO render_kpac_grid(page_id) BLOCK;
 
         [% ELSIF cell.type == 'maintopic'; %]
 
-        <td width="[% width %]%"><a href="[%- ctx.kpac_root -%]/results?query=[%- cell.content -%];nosprop=1"><img 
+        <td width="[% width %]%"><a href="[%- ctx.kpac_root -%]/results?query=[%- cell.content -%];nosprop=1;locg=1"><img 
             src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% ELSIF cell.type == 'simplesearch'; %]
 
-        <td width="[% width %]%"><a href="[% 
-            mkurl(ctx.kpac_root _ '/results', {query => cell.content, nosprop => 1}, ['page', 'qtype']) %]"><img 
+        <td width="[% width %]%"><a href="[%- ctx.kpac_root -%]/results?query=[%- cell.content -%];nosprop=1;trail=[%- CGI.url_param('trail') -%]"><img 
             src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% ELSIF cell.type == 'link'; %]