opac pile of template updates

git-svn-id: svn://svn.open-ils.org/ILS/trunk@728 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/templates/opac/pages/advanced_search.ttk b/Open-ILS/src/templates/opac/pages/advanced_search.ttk
index 1efcfbe..c8cc8f4 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/advanced_search.ttk
+++ b/Open-ILS/src/templates/opac/pages/advanced_search.ttk
@@ -13,9 +13,6 @@
                        INCLUDE opac/pages/chunks/body_header.ttk;
 
                        lines(1);
-                       "<center>";
-                       box(content = "ADV search evolves from here...");
-                       "</center>";
 
                        box(id='adv_search_main_header', content="Advanced Search");
                        lines(1);
@@ -30,10 +27,14 @@
                        #box(class='vert_div');
 
                        WRAPPER html/div class='adv_search_big_box';
-                               INCLUDE opac/pages/chunks/adv_mixed_search.ttk;
+                               #INCLUDE opac/pages/chunks/adv_mixed_search.ttk;
                                INCLUDE opac/pages/chunks/adv_refined_keyword.ttk;
                        END;
 
+                       lines(5);
+
+                       "<center><b>More to come...</b></center>";
+
                END; # - body
        END; # - html
 

diff --git a/Open-ILS/src/templates/opac/pages/chunks/adv_refined_keyword.ttk b/Open-ILS/src/templates/opac/pages/chunks/adv_refined_keyword.ttk
index fbe119e..a43a52c 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/adv_refined_keyword.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/adv_refined_keyword.ttk
@@ -3,7 +3,7 @@
        WRAPPER html/div id='adv_refined_search_div' class='adv_search_chunk_box';
 
                WRAPPER html/div class='adv_search_header';
-                       "Refined Keyword Search";;
+                       "Refined Search";;
                END;
 
                WRAPPER html/div class='adv_dashed_box';
@@ -11,6 +11,22 @@
                        WRAPPER html/table;
        
                                row(content = cell(content = lines(1)));
+
+                               WRAPPER html/row;
+                               cell(align='left', content="Search Type");
+                               WRAPPER html/cell align='left';
+                                       WRAPPER html/select name='adv_search_type' id='adv_search_type';
+                                               option(value='title',   content="Title");
+                                               option(value='author',  content="Author");
+                                               option(value='subject', content="Subject");
+                                               option(value='keyword', selected='selected', content="Keyword");
+                                               option(value='series',  content="Series");
+                                       END;
+                               END;
+                               END;
+
+                               row(content = cell(content = lines(1)));
+
        
                                WRAPPER html/row;
                                        cell(align='left' , content= "Find results with all words:");
@@ -38,7 +54,7 @@
                                WRAPPER html/row;
                                        WRAPPER html/cell colspan='4';
                                                WRAPPER html/center;
-                                                       input( type='submit', value='Search', onclick='alert("Not Implemented, try the left search bar");');
+                                                       input( type='submit', value='Search', id="adv_search_refined_submit"); 
                                                END;
                                        END;
                                END;

diff --git a/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk b/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
index 401e566..d36b014 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
@@ -1,7 +1,9 @@
 [%
        box(id='progress_bar_location'); 
-       box(id='progress_bar_percent_location'); 
        INCLUDE opac/pages/chunks/opac_search_bar.ttk;
+#lines(1);
+
+       WRAPPER html/div id='page_trail';END;
        lines(1);
 
        INCLUDE opac/pages/chunks/status_bar.ttk;
@@ -11,6 +13,8 @@
                WRAPPER html/div class='hit_count_cell' id='hit_count_cell';
                END;
 
+               box(id='progress_bar_percent_location'); 
+
                "Hits per page ";
                WRAPPER html/select name='hits_per_page' id='hits_per_page';
                        option(value='5',               content="5");
@@ -18,7 +22,6 @@
                        option(value='15',      content="15");
                        option(value='25',      content="25");
                        option(value='50',      content="50");
-                       option(value='100',  content="100");
                END;
        END;
 

diff --git a/Open-ILS/src/templates/opac/pages/chunks/opac_search_bar.ttk b/Open-ILS/src/templates/opac/pages/chunks/opac_search_bar.ttk
index 8588223..6c0c29f 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/opac_search_bar.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/opac_search_bar.ttk
@@ -59,7 +59,7 @@
                                WRAPPER html/cell valign='bottom' align='right';
                                        WRAPPER html/div id='small_logo_div';
                                                WRAPPER html/anchor href=global.config.root_url;
-                                                       img(src = "/images/small_logo.jpg", border="0", width='30', height='30');
+                                                       img(src = "/images/small_logo.jpg", title="Home", border="0", width='30', height='30');
                                                END; # - anchor
                                        END; # - div
                                END; # - cell   

diff --git a/Open-ILS/src/templates/opac/pages/chunks/search_bar_form.ttk b/Open-ILS/src/templates/opac/pages/chunks/search_bar_form.ttk
index 119ecdc..99ebb31 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/search_bar_form.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/search_bar_form.ttk
@@ -9,7 +9,7 @@
                input( type='hidden', name='page', value='0');
 
                input(id='mr_search_query',  name='mr_search_query',  
-                               type='textarea', size='24');
+                               type='textarea', size='34');
        
                space(1);
        

diff --git a/Open-ILS/src/templates/opac/pages/main.ttk b/Open-ILS/src/templates/opac/pages/main.ttk
index 6d64e0b..59a6313 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/main.ttk
+++ b/Open-ILS/src/templates/opac/pages/main.ttk
@@ -95,8 +95,6 @@
                        <frame
                                style                   = "border:0px;" 
                                frameborder     = '0' 
-                               height          = '100%'
-                               width                   = '100%' 
                                name                    = 'appframe' 
                                id                              = 'appframe' 
                                src                     = '/opac/?target=[%- IF top_target; top_target; ELSE; "start";END; %]';

diff --git a/Open-ILS/src/templates/opac/pages/record_result.ttk b/Open-ILS/src/templates/opac/pages/record_result.ttk
index df4feec..0b04f7d 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/record_result.ttk
+++ b/Open-ILS/src/templates/opac/pages/record_result.ttk
@@ -17,6 +17,8 @@
 
                        INCLUDE opac/pages/chunks/body_header.ttk;
 
+                       #WRAPPER html/div id='page_trail';END;
+
 
                        # --------------------------------------------------------------------------------- 
                        # search results are spit out into this table
@@ -30,7 +32,8 @@
                                                WRAPPER html/table class='record_result_box', id='record_result_box'; 
                                                        WRAPPER html/thead class='record_result_thead'; 
                                                                WRAPPER html/row id='record_result_thead_row';
-                                                                       cell(nowrap='nowrap', colspan='2' ); 
+                                                                       cell(nowrap='nowrap', colspan='2', 
+                                                                                       content="Title / Author", class='record_box_descriptor' ); 
                                                                END;
                                                        END;
                                                END;
@@ -44,9 +47,18 @@
 
                                END;
 
+                               WRAPPER html/row id='hourglass_row';
+                                       cell(style="text-align:center", content=img(src="http://www.filleacgil.it/Animate/book_b.gif"));
+                               END;
+
                                
                        END;
 
+                       lines(2);
+                       WRAPPER html/div class='hit_count_cell' id='hit_count_cell_2';
+                       END;
+                       lines(1);
+
                END; # body
 
        END; # html

diff --git a/Open-ILS/src/templates/strings/ex.ttk b/Open-ILS/src/templates/strings/ex.ttk
index 787ecdf..831178f 100644 (file)
--- a/Open-ILS/src/templates/strings/ex.ttk
+++ b/Open-ILS/src/templates/strings/ex.ttk
@@ -21,4 +21,7 @@
        IF type == ex_types.SEARCH_TOO_LARGE;
                ret("Search term is too broad, please narrow your search");     END;
 
+       IF type == ex_types.UNKNOWN_BARCODE;
+               ret("Barcode does not exist in the database");  END;
+
 -%]