more my_opac and cleaning

git-svn-id: svn://svn.open-ils.org/ILS/trunk@927 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 bca4d8c..0dcc0ee 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/advanced_search.ttk
+++ b/Open-ILS/src/templates/opac/pages/advanced_search.ttk
@@ -12,28 +12,42 @@
 
                        INCLUDE opac/pages/chunks/body_header.ttk hide_hits_per=1;
 
-                       lines(1);
+                       WRAPPER html/table width="100%";
+
+                               WRAPPER html/row;
+                                       WRAPPER html/cell colspan='2';
+                                               box(id='adv_search_main_header', content="Advanced Search");
+                                       END;
+                                       WRAPPER html/cell valign='top' rowspan='2';
+                                               box(id='main_page_nav_box', class='nav_box_box');
+                                       END;
+                               END;
 
-                       box(id='adv_search_main_header', content="Advanced Search");
-                       lines(1);
 
+                               WRAPPER html/row;
+
+                                       WRAPPER html/cell;
+                                               WRAPPER html/div class='adv_search_left_box';
+                                                       WRAPPER html/div class='adv_search_quick_box';
+                                                               INCLUDE opac/pages/chunks/adv_global_search.ttk;
+                                                       END;
+                                               END; # left box
+                                       END;
+                       
+                       
+                                       WRAPPER html/cell;
+                                               WRAPPER html/div class='adv_search_big_box';
+                                                       #INCLUDE opac/pages/chunks/adv_mixed_search.ttk;
+                                                       INCLUDE opac/pages/chunks/adv_refined_keyword.ttk;
+                                               END;
+                                       END;
 
-                       WRAPPER html/div class='adv_search_left_box';
-                               WRAPPER html/div class='adv_search_quick_box';
-                                       INCLUDE opac/pages/chunks/adv_global_search.ttk;
                                END;
-                       END; # left box
-
-                       #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_refined_keyword.ttk;
-                       END;
+                       END; #table
 
                        lines(5);
+                       "<center><b>More to come... ...</b></center>";
 
-                       "<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 a43a52c..25023a7 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
@@ -26,7 +26,6 @@
                                END;
 
                                row(content = cell(content = lines(1)));
-
        
                                WRAPPER html/row;
                                        cell(align='left' , content= "Find results with all words:");
@@ -47,10 +46,8 @@
                                        cell(align='left' content=input(type='text' size='34' id='adv_none_words'));
                                END;
        
-       
                                row(content = cell(content = lines(1)));
        
-       
                                WRAPPER html/row;
                                        WRAPPER html/cell colspan='4';
                                                WRAPPER html/center;

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 917dbab..23e333a 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
+++ b/Open-ILS/src/templates/opac/pages/chunks/body_header.ttk
@@ -2,10 +2,7 @@
        box(id='progress_bar_location'); 
        INCLUDE opac/pages/chunks/opac_search_bar.ttk;
 
-       WRAPPER html/div id='page_trail';END;
-       WRAPPER html/div id='deep_link_div';END;
-
-       lines(1);
+       #WRAPPER html/div id='deep_link_div';END;
 
        #INCLUDE opac/pages/chunks/status_bar.ttk;
 
@@ -17,7 +14,6 @@
                END;
        END;
 
-       lines(1);
-
+       #box(id='page_trail', style="float:left;");
        #INCLUDE opac/pages/chunks/org_tree.ttk;
 %]

diff --git a/Open-ILS/src/templates/opac/pages/main.ttk b/Open-ILS/src/templates/opac/pages/main.ttk
index 8f45e31..0c80e42 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/main.ttk
+++ b/Open-ILS/src/templates/opac/pages/main.ttk
@@ -25,14 +25,17 @@
 
                                        IF sub_frame;
                                                "src='/opac/?";
-                                               FOR p IN cgi.param;
+                                               a1 = [];
 
+                                               FOR p IN cgi.param;
                                                        IF p != "sub_frame"; 
-                                                               par = cgi.param(p) | uri | html;
-                                                               p _ "=" _ par  _ "&"; 
+                                                               v = p _ "=" _ cgi.param(p);
+                                                               a1.push(v);
                                                        END;
-
                                                END;
+                                               a1.join("&");
+                                               "'";
+
                                        ELSE; 
                                %]
 

diff --git a/Open-ILS/src/templates/opac/pages/my_opac.ttk b/Open-ILS/src/templates/opac/pages/my_opac.ttk
index f544b12..446d154 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/my_opac.ttk
+++ b/Open-ILS/src/templates/opac/pages/my_opac.ttk
@@ -24,7 +24,8 @@
                                style       = 'border:none;'
                                scrolling       = 'no'
                width       = '100%'
-                               height          = '500' 
+                               #height         = '500' 
+                               height          = '100%' 
                name        = 'my_oac_iframe'
                                #src        = 'https://gapines.org/opac/?target=my_opac_secure'
                id          = 'my_opac_iframe';

diff --git a/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk b/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
index 06e3c9d..e710b8b 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
+++ b/Open-ILS/src/templates/opac/pages/my_opac_secure.ttk
@@ -1,9 +1,15 @@
 [%
+       url             = cgi.server_name();
+       port            = cgi.server_port();
+
        WRAPPER html/html;
 
                WRAPPER html/head title="My OPAC"; 
                        link(rel="stylesheet", href="/css/my_opac.css" type="text/css");
                        link(rel="stylesheet", href="/css/box.css" type="text/css");
+                       link(rel="stylesheet", href="/css/opac_main.css" type="text/css");
+
+                       js( src='/js/opac/Page.js' );
                        js( src='/js/opac/MyOPACSPage.js' );
                        js( src='/js/util/RemoteRequest.js' );
                        js( src='/js/util/webutils.js' );
@@ -14,40 +20,66 @@
                        js( src='/js/util/JSON.js' );
                        js( src='/js/util/web_fieldmapper.js' );
                        js( src='/js/util/browser.js' );
-               END;
 
-               WRAPPER html/body class='no_border_body' 
-                       onload='
+                       WRAPPER html/js;
+                               '
+                               var globalSelectedLocation = null;
+                               var globalLocation = null;
+                               var globalSearchDepth = null;
+
                                var globalAppFrame = window;
                                var globalPage = new MyOPACSPage();
-                               globalPage.init(); 
+                               var globalRootURL = "' _ url _ '";
+                               var globalRootPath      = "/opac/";
+                               var globalPort                  = "' _ port _ '";
                                ';
+                       END;
 
-                       lines(2);
-                       WRAPPER html/box id='my_opac_nav_bar';
-                               WRAPPER html/center;
-                               WRAPPER html/table id='my_opac_nav_table';      
-                                       WRAPPER html/row;
-                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_checked', 
-                                                               content=anchor(id='my_opac_checked_link', 
-                                                                       text="Checked Out", href="javascript:void(0);"));
-
-                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_holds', 
-                                                               content=anchor(id='my_opac_holds_link', 
-                                                                       text="Holds", href="javascript:void(0);"));
-
-                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_profile', 
-                                                               content=anchor(id='my_opac_profile_link', 
-                                                                       text="My Profile", href="javascript:void(0);"));
-
-                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_fines', 
-                                                               content=anchor(id='my_opac_fines_link', 
-                                                                       text="Fines", href="javascript:void(0);"));
+               END;
+
+
+               WRAPPER html/body class='no_border_body' onload='globalPage.init();';
+
+                       WRAPPER html/table width="100%";
+
+                               WRAPPER html/row;
+
+                                       WRAPPER html/cell width="70%";
+                                               WRAPPER html/box id='my_opac_nav_bar';
+                                                       WRAPPER html/center;
+                                                               WRAPPER html/table id='my_opac_nav_table';      
+                                                                       WRAPPER html/row;
+                                                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_checked', 
+                                                                                               content=anchor(id='my_opac_checked_link', 
+                                                                                                       text="Checked Out", href="javascript:void(0);"));
+                               
+                                                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_holds', 
+                                                                                               content=anchor(id='my_opac_holds_link', 
+                                                                                                       text="Holds", href="javascript:void(0);"));
+                               
+                                                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_profile', 
+                                                                                               content=anchor(id='my_opac_profile_link', 
+                                                                                                       text="My Profile", href="javascript:void(0);"));
+                               
+                                                                               cell(class='my_opac_link_cell', width="25%", id='my_opac_fines', 
+                                                                                               content=anchor(id='my_opac_fines_link', 
+                                                                                                       text="Fines", href="javascript:void(0);"));
+                                                                       END;
+                                                               END;
+                                                       END;
+                                               END;
+                                       END; # cell
+
+                                       WRAPPER html/cell;
+                                               box(id='main_page_nav_box', class='nav_box_box');
                                        END;
-                               END;
-                               END;
-                       END;
-                       lines(2);
+
+                               END; #row
+                       END; # table
+
+
+
+                       lines(1);
 
                        WRAPPER html/box id='my_opac_info_pane';
                                WRAPPER html/center;

diff --git a/Open-ILS/src/templates/opac/pages/record_detail.ttk b/Open-ILS/src/templates/opac/pages/record_detail.ttk
index 62f1ca9..b43ee14 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/record_detail.ttk
+++ b/Open-ILS/src/templates/opac/pages/record_detail.ttk
@@ -16,14 +16,12 @@
                WRAPPER html/body onload='pageInit();';
 
                        INCLUDE opac/pages/chunks/body_header.ttk hide_hits_per=1;
-                       WRAPPER html/div id='page_trail';END;
+                       #WRAPPER html/div id='page_trail';END;
 
                        # --------------------------------------------------------------------------------- 
                        # Display record detail info
                        # --------------------------------------------------------------------------------- 
 
-                       lines(1);
-
                        WRAPPER html/box id='record_detail_main_box';
 
                                WRAPPER html/box id='detail_items_div';

diff --git a/Open-ILS/src/templates/opac/pages/record_result.ttk b/Open-ILS/src/templates/opac/pages/record_result.ttk
index cfe25a0..f4e79fc 100644 (file)
--- a/Open-ILS/src/templates/opac/pages/record_result.ttk
+++ b/Open-ILS/src/templates/opac/pages/record_result.ttk
@@ -43,7 +43,6 @@
 
 
                                        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;