kpac2 : results page

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/examples/web/templates/kpac/home.tt2 b/Open-ILS/examples/web/templates/kpac/home.tt2
index 44017f6..1378d18 100644 (file)
--- a/Open-ILS/examples/web/templates/kpac/home.tt2
+++ b/Open-ILS/examples/web/templates/kpac/home.tt2
@@ -5,59 +5,62 @@
     ctx.page_title = l("Home") 
 %]
 
-<div class="main_top_shadow">
-    <div class="main_tl_corner">&nbsp;</div>
-    <div class="main_mid_top">&nbsp;</div>
-    <div class="main_tr_corner">&nbsp;</div>
-    <div class="clear">&nbsp;</div>
-</div>
+<div class="center_me">[% INCLUDE 'kpac/parts/header.tt2' %]</div>
 
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td width="3" class="main_left_shadow"><div class="clear">&nbsp;</div></td>
-        <td valign="top" class="main_inside_cell" valign="top">
-            <!--
-            <div class="search_wrapper">
-                <h1>Search your Library</h1>
-                <h3>for books, movies, music, magazines, and more!</h3>
+<div class="banner_wrapper">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%"><tr>
+        <td class="hp_banner_bgl">&nbsp;</td>
+        <td class="hp_banner_content" valign="top">
+            <div class="hp_search_main">
                 <form action="[% ctx.kpac_root _ '/results' %]">
-                    [% qtype = CGI.param('qtype') %]
-                    <table cellpadding="0" cellspacing="0" border="0" align="center" class="search_box_wrapper">
-                        <tr>
-                            <td class="st_radio_btn"><input type="radio" name="qtype" value="keyword" id="st_word" class="st_word" 
-                                [% IF !qtype OR qtype == 'keyword' %]checked="checked"[% END %]/></td>
-                            <td class="st_label"><label for="st_word">[% l('Word') %]</label></td>
-
-                            <td class="st_radio_btn"><input type="radio" name="qtype" value="title" id="st_title" class="st_title" 
-                                [% IF qtype == 'title' %]checked="checked"[% END %]/></td>
-                            <td class="st_label"><label for="st_title">[% l('Title') %]</label></td>
+                    <table cellpadding="0" cellspacing="0" border="0"><tr>
+                        <td valign="top">
+                            <div class="hp_search_box_wrapper"><input type="text" name="query" class="hp_search_box" value="[% CGI.param('query') | html %]"/></div>
+                            <table cellpadding="0" cellspacing="0" border="0" class="hp_search_st"><tr>
+                                <td class="st_radio_btn"><input type="radio" name="qtype" value="keyword" id="st_word" class="st_word" 
+                                    [% IF !qtype OR qtype == 'keyword' %]checked="checked"[% END %]/></td>
+                                <td class="st_label"><label for="st_word">[% l('Word') %]</label></td>
 
-                            <td class="st_radio_btn"><input type="radio" name="qtype" value="author" id="st_author" class="st_author"
-                                [% IF qtype == 'author' %]checked="checked"[% END %]/></td>
-                            <td class="st_label st_author_box"><label for="st_author">[% l('Author') %]</label></td>
+                                <td class="st_radio_spacer"><div>&nbsp;</div></td>
+                                <td class="st_radio_btn"><input type="radio" name="qtype" value="title" id="st_title" class="st_title" 
+                                    [% IF qtype == 'title' %]checked="checked"[% END %]/></td>
+                                <td class="st_label"><label for="st_title">[% l('Title') %]</label></td>
 
-                            <td><input type="text" class="search_box" name="query" value="[% CGI.param('query') | html %]"/></td>
-                            <td><input type="image" src="[% ctx.media_prefix %]/images/kpac/search_btn.png" alt="search" /></td>
-                        </tr>
-                    </table>
+                                <td class="st_radio_spacer"><div>&nbsp;</div></td>
+                                <td class="st_radio_btn"><input type="radio" name="qtype" value="author" id="st_author" class="st_author"
+                                    [% IF qtype == 'author' %]checked="checked"[% END %]/></td>
+                                <td class="st_label st_author_box"><label for="st_author">[% l('Author') %]</label></td>
+                            </tr></table>
+                        </td>
+                        <td valign="top">
+                            <input type="image" src="[% ctx.media_prefix %]/images/kpac/hp_search_btn.png" alt="[% l('Search') %]" /></td>
+                        </td>
+                    </tr></table>
                 </form>
             </div>
-            -->
-            <div class="category_wrapper">
-                <h3 class="c_header_image">Or click on an image to get started:</h3>
-                [% render_kpac_grid(ctx.kpac_layout.page) %]
-            </div>
-
         </td>
-        <td width="3" class="main_right_shadow"><div class="clear">&nbsp;</div></td>
-    </tr>
-</table>
+        <td class="hp_banner_bgr">&nbsp;</td>
+    </tr></table>
+</div>
 
-<div class="main_bottom_shadow">
-    <div class="main_bl_corner">&nbsp;</div>
-    <div class="main_mid_bottom">&nbsp;</div>
-    <div class="main_br_corner">&nbsp;</div>
-    <div class="clear">&nbsp;</div>
+<div class="center_me hp_reposition">
+    <div class="main_wrapper">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%">
+            <tr>
+                <td width="3"><div class="clear">&nbsp;</div></td>
+                <td valign="top" class="main_inside_cell" valign="top">
+                    <div class="category_wrapper">
+                        <h3 class="c_header_image2"><span class="c_header_hp_or">or</span> click on an image to get started:</h3>
+                        [% render_kpac_grid(ctx.kpac_layout.page) %]
+                    </div>
+                </td>
+                <td width="3"><div class="clear">&nbsp;</div></td>
+            </tr>
+        </table>
+    </div>
+</div>
+<div class="center_me hp_reposition">
+    [% INCLUDE 'kpac/parts/footer.tt2' %]
 </div>
 
 [% END %]

diff --git a/Open-ILS/examples/web/templates/kpac/parts/base.tt2 b/Open-ILS/examples/web/templates/kpac/parts/base.tt2
index 2d32b71..be26cd0 100644 (file)
--- a/Open-ILS/examples/web/templates/kpac/parts/base.tt2
+++ b/Open-ILS/examples/web/templates/kpac/parts/base.tt2
@@ -10,13 +10,14 @@
         <title>[% l("Kid's Catalog - [_1]", ctx.page_title) %]</title>
     </head>
     <body>
-        <div class="center_me">[% INCLUDE 'kpac/parts/header.tt2' %]</div>
-        <!-- home_search sits outside the normal content div -->
-        [% INCLUDE 'kpac/parts/home_search.tt2' IF ctx.page == 'home' %]
-        <div class="center_me hp_reposition">
+        <!-- home has a different layout.  it loads its own header/footer blocks -->
+        [% IF ctx.page == 'home'; content; ELSE %]
+        <div class="main_center">
+            [% INCLUDE 'kpac/parts/header.tt2' %]
             <div class="main_wrapper">[% content %]</div>
+            [% INCLUDE 'kpac/parts/footer.tt2' %]
         </div>
-        [% INCLUDE 'kpac/parts/footer.tt2' %]
+        [% END %]
         <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/kpac/functions.js"></script>
         [%- INCLUDE 'kpac/parts/acimport.tt2' %]
     </body>

diff --git a/Open-ILS/examples/web/templates/kpac/parts/home_search.tt2 b/Open-ILS/examples/web/templates/kpac/parts/home_search.tt2
deleted file mode 100644 (file)
index 6406803..0000000
--- a/Open-ILS/examples/web/templates/kpac/parts/home_search.tt2
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="banner_wrapper">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%"><tr>
-        <td class="hp_banner_bgl">&nbsp;</td>
-        <td class="hp_banner_content" valign="top">
-            <div class="hp_search_main">
-                <form action="[% ctx.kpac_root _ '/results' %]">
-                    <table cellpadding="0" cellspacing="0" border="0"><tr>
-                        <td valign="top">
-                            <div class="hp_search_box_wrapper"><input type="text" name="query" class="hp_search_box" value="[% CGI.param('query') | html %]"/></div>
-                            <table cellpadding="0" cellspacing="0" border="0" class="hp_search_st"><tr>
-                                <td class="st_radio_btn"><input type="radio" name="qtype" value="keyword" id="st_word" class="st_word" 
-                                    [% IF !qtype OR qtype == 'keyword' %]checked="checked"[% END %]/></td>
-                                <td class="st_label"><label for="st_word">[% l('Word') %]</label></td>
-
-                                <td class="st_radio_btn"><input type="radio" name="qtype" value="title" id="st_title" class="st_title" 
-                                    [% IF qtype == 'title' %]checked="checked"[% END %]/></td>
-                                <td class="st_label"><label for="st_title">[% l('Title') %]</label></td>
-
-                                <td class="st_radio_btn"><input type="radio" name="qtype" value="author" id="st_author" class="st_author"
-                                    [% IF qtype == 'author' %]checked="checked"[% END %]/></td>
-                                <td class="st_label st_author_box"><label for="st_author">[% l('Author') %]</label></td>
-                            </tr></table>
-                        </td>
-                        <td valign="top">
-                            <input type="image" src="[% ctx.media_prefix %]/images/kpac/hp_search_btn.png" alt="[% l('Search') %]" /></td>
-                        </td>
-                    </tr></table>
-                </form>
-            </div>
-        </td>
-        <td class="hp_banner_bgr">&nbsp;</td>
-    </tr></table>
-</div>
-