moving around some of the navigation components

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

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 9f5b0c7..917dbab 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
@@ -7,27 +7,17 @@
 
        lines(1);
 
-       INCLUDE opac/pages/chunks/status_bar.ttk;
+       #INCLUDE opac/pages/chunks/status_bar.ttk;
 
-       WRAPPER html/div class='hit_count_selector_div';
-
-               WRAPPER html/div class='hit_count_cell' id='hit_count_cell';
-               END;
-
-               box(id='progress_bar_percent_location'); 
-
-               IF ! hide_hits_per;
-                       "Hits per page ";
-                       WRAPPER html/select name='hits_per_page' id='hits_per_page';
-                               option(value='5',               content="5");
-                               option(value='10',      selected='selected', content="10");
-                               option(value='15',      content="15");
-                               option(value='25',      content="25");
-                               option(value='50',      content="50");
-                       END;
+       WRAPPER html/center;
+               WRAPPER html/div class='hit_count_selector_div' width="100%";
+                       box(id='hit_count_cell', class='hit_count_cell');
+                       box(id='progress_bar_percent_location'); 
+                       box(id='now_searching_cell', class='now_searching_cell', style="float:right;");
                END;
-
        END;
 
-       INCLUDE opac/pages/chunks/org_tree.ttk;
+       lines(1);
+
+       #INCLUDE opac/pages/chunks/org_tree.ttk;
 %]

diff --git a/Open-ILS/src/templates/opac/pages/chunks/init.ttk b/Open-ILS/src/templates/opac/pages/chunks/init.ttk
index 770b28c..e66edb1 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/init.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/init.ttk
@@ -67,7 +67,7 @@
 
                        globalAppFrame = window;
                        globalPage = logicNode.globalPage;
-                       setDeepLink();
+                       //setDeepLink();
                }
 
                function setDeepLink() {

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 9ecbd15..56ddf30 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
@@ -20,6 +20,31 @@
                                        INCLUDE opac/pages/chunks/search_bar_form.ttk;
                                END;
 
+                               %]
+
+
+                               [%
+
+
+                               WRAPPER html/cell nowrap='nowrap';
+                               WRAPPER html/span;
+                                       space(3);
+                                       "Expand search to ";
+                                       space(1);
+               
+                                       WRAPPER html/select 
+                                               name='search_range_select' 
+                                               id='search_range_select'
+                                               onchange='logicNode.globalSearchDepth = this.options[this.selectedIndex].value;';
+                                       END;
+                               END;
+                               END;
+                               %]
+
+
+
+                               [%# -------
+
                                WRAPPER html/cell  align='center';
 
                                        WRAPPER html/div class='text_link_div' id='login_div';
@@ -52,7 +77,11 @@
                                        END;
                                END;
 
-                       
+                               %]
+
+
+
+                               [%
 
                                WRAPPER html/cell valign='bottom' align='right';
                                        WRAPPER html/div id='small_logo_div';

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 99ebb31..620df15 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='34');
+                               type='textarea', size='28');
        
                space(1);
        
@@ -27,9 +27,23 @@
                                value=tm.search, onclick='alert("help");' );
 
                space(1);
+               %]
+
+               [%
+                       "Hits per page ";
+                       WRAPPER html/select name='hits_per_page' id='hits_per_page';
+                               option(value='5',               content="5");
+                               option(value='10',      selected='selected', content="10");
+                               option(value='15',      content="15");
+                               option(value='25',      content="25");
+                               option(value='50',      content="50");
+                       END;
+               %]
+
 
                
                
+               [%
        END;
 
 %]

diff --git a/Open-ILS/src/templates/opac/pages/chunks/status_bar.ttk b/Open-ILS/src/templates/opac/pages/chunks/status_bar.ttk
index 63497f5..4ee1be4 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/status_bar.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/status_bar.ttk
@@ -4,12 +4,14 @@
 
        WRAPPER html/table  + html/row id='top_status_bar' class='status_bar';
 
-               cell(id='now_searching_cell', class='now_searching_cell');
+               #cell(id='now_searching_cell', class='now_searching_cell');
 
-               WRAPPER html/cell class='search_range_cell' nowrap='nowrap';
+               #WRAPPER html/cell class='search_range_cell' nowrap='nowrap';
        
                        
 
+               %]
+               [%#
                        WRAPPER html/span;
                                space(3);
                                "Expand search to ";
@@ -21,6 +23,10 @@
                                        onchange='logicNode.globalSearchDepth = this.options[this.selectedIndex].value;';
                                END;
                        END;
+               %]
+
+
+               [%#
 
                        input( type='submit', value="Location", id='location_select_button' 
                                onclick='
@@ -30,10 +36,13 @@
                                if(evt)
                                        globalPage.locationTree.toggle(target);'
                        ); 
+               %]
+
+               [%
 
        
                
-               END;
+#      END;
 
        END;
        END;

diff --git a/Open-ILS/src/templates/opac/pages/opac_start.ttk b/Open-ILS/src/templates/opac/pages/opac_start.ttk
index 382eb53..a7fcf09 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/opac_start.ttk
+++ b/Open-ILS/src/templates/opac/pages/opac_start.ttk
@@ -57,7 +57,7 @@
                        PROCESS search_range;
 
                        lines(3);
-                       anchor( id='login_link',  href='?target=login', text = "Login" );
+                       anchor( id='login_link',  href='?target=my_opac', text = "My OPAC" );
                        space(3);
                        anchor( id='adv_search_link',  href='?target=advanced_search', text = "Advanced Search" );
 

diff --git a/Open-ILS/src/templates/opac/pages/record_detail.ttk b/Open-ILS/src/templates/opac/pages/record_detail.ttk
index 3f272fd..62f1ca9 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/record_detail.ttk
+++ b/Open-ILS/src/templates/opac/pages/record_detail.ttk
@@ -28,68 +28,80 @@
 
                                WRAPPER html/box id='detail_items_div';
 
-                                       WRAPPER html/table id='record_detail_table';
+                               WRAPPER html/table width="100%";
+                                       WRAPPER html/row;
+                                               WRAPPER html/cell width="70%";
+                                                       WRAPPER html/table id='record_detail_table';
+               
+                                                               WRAPPER html/row;
+                                                                       cell(content="Record Details", nowrap='nowrap', class="detail_header_cell");
+                                                                       cell(id='record_detail_view_marc', class="detail_header_cell");
+                                                                       cell(id='record_detail_pic_cell', rowspan='10');
+                                                               END;
 
-                                               WRAPPER html/row;
-                                                       cell(content="Record Details", nowrap='nowrap', class="detail_header_cell");
-                                                       cell(id='record_detail_view_marc', class="detail_header_cell");
-                                                       cell(id='record_detail_pic_cell', rowspan='10');
-                                               END;
-
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Title", nowrap='nowrap', class='detail_item_label');
-                                                       cell(id='record_detail_title_cell');
-                                               END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Author", class='detail_item_label');
-                                                       cell(id='record_detail_author_cell');
-                                               END;
        
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="ISBN", class='detail_item_label');
-                                                       cell(id='record_detail_isbn_cell');
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Title", nowrap='nowrap', class='detail_item_label');
+                                                                       cell(id='record_detail_title_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Author", class='detail_item_label');
+                                                                       cell(id='record_detail_author_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="ISBN", class='detail_item_label');
+                                                                       cell(id='record_detail_isbn_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Edition", class='detail_item_label');
+                                                                       cell(id='record_detail_edition_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Publication Date", class='detail_item_label');
+                                                                       cell(id='record_detail_pubdate_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Publisher", class='detail_item_label');
+                                                                       cell(id='record_detail_publisher_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Title Control Number", nowrap='nowrap', class='detail_item_label');
+                                                                       cell(id='record_detail_tcn_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Type of Resource", class='detail_item_label');
+                                                                       cell(id='record_detail_resource_cell');
+                                                               END;
+                       
+                                                               WRAPPER html/row class='detail_item_row';
+                                                                       cell(content="Subjects", class='detail_item_label');
+                                                                       cell(id='record_detail_subject_cell');
+                                                               END;
+                       
+                                                       END; # table
                                                END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Edition", class='detail_item_label');
-                                                       cell(id='record_detail_edition_cell');
-                                               END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Publication Date", class='detail_item_label');
-                                                       cell(id='record_detail_pubdate_cell');
-                                               END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Publisher", class='detail_item_label');
-                                                       cell(id='record_detail_publisher_cell');
+               
+                                               WRAPPER html/cell valign='top' width="30%";
+                                                       box(id='main_page_nav_box', style="width:200px; float:right;");
                                                END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Title Control Number", nowrap='nowrap', class='detail_item_label');
-                                                       cell(id='record_detail_tcn_cell');
-                                               END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Type of Resource", class='detail_item_label');
-                                                       cell(id='record_detail_resource_cell');
-                                               END;
-       
-                                               WRAPPER html/row class='detail_item_row';
-                                                       cell(content="Subjects", class='detail_item_label');
-                                                       cell(id='record_detail_subject_cell');
-                                               END;
-       
-                                       END;
+                                       END; #row
+                               END; # table
 
-                               END;
+                       END; # detail_items_div
 
-                               lines(1);
-                               box(id='record_detail_copy_info');
 
                        END;
+
+                       lines(1);
+                       box(id='record_detail_copy_info');
+
                                                
                END; # body
 

diff --git a/Open-ILS/src/templates/opac/pages/record_result.ttk b/Open-ILS/src/templates/opac/pages/record_result.ttk
index 0b6d532..cfe25a0 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/record_result.ttk
+++ b/Open-ILS/src/templates/opac/pages/record_result.ttk
@@ -43,6 +43,7 @@
 
 
                                        WRAPPER html/cell class='record_sidebar_cell' id='record_sidebar_cell' valign="top";
+                                               #box( id='main_page_nav_box');
                                                box( id='record_sidebar_box' );
                                        END;
 
@@ -60,6 +61,8 @@
                        END;
                        lines(1);
 
+                       INCLUDE opac/pages/chunks/org_tree.ttk;
+
                END; # body
 
        END; # html