app_shell is sort of working now.. time to shake it out

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
index 7c5e870..294f68e 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
@@ -1,9 +1,9 @@
-function OpenILS_init(screen) { 
+function OpenILS_init(screen,params) { 
        sdump('D_TRACE','Entering OpenILS_init with ' + screen + '\n');
 
        switch(screen) {
-               case 'Auth' : auth_init(); break;
-               case 'AppShell' : app_shell_init(); break;
+               case 'Auth' : auth_init(params); break;
+               case 'AppShell' : app_shell_init(params); break;
        }
 
        sdump('D_TRACE','Exiting OpenILS_init\n');

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js
index 4ad89c7..87b85af 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js
@@ -2,13 +2,14 @@ sdump('D_TRACE','Loading app_shell.js\n');
 
 var tab_count = [ false, false, false, false, false, false, false, false, false, false ];
 
-function app_shell_init() {
+function app_shell_init(params) {
        dump("TESTING: app_shell.js: " + mw.G['main_test_variable'] + '\n');
-       replace_tab('main_tabbox','Tab','chrome://evergreen/content/main/about.xul');
+       replace_tab(params.d,'main_tabbox','Tab','chrome://evergreen/content/main/about.xul');
        mw.G.sound.beep();
 }
 
 function close_tab( d, tabbox ) {
+       sdump('D_TAB','calling close_tab( ' + d + ',' + tabbox + ');\n');
        var tbox = d.getElementById(tabbox);
        var tabs = tbox.firstChild;
        var panels = tbox.lastChild;
@@ -21,19 +22,20 @@ function close_tab( d, tabbox ) {
                tabs.removeChild( tab );
                panels.removeChild( panel );
        } catch(E) {
-               alert(E);
+               dump(js2JSON(E)+'\n');
        }
        if (tabs.childNodes.length == 0) { 
-               new_tab('main_tabbox');
+               new_tab(d,'main_tabbox');
        }
 }
 
 function delete_tab_contents( tab, panel ) {
+       sdump('D_TAB','calling delete_tab_contents( ' + tab + ',' + panel + ');\n');
        try {
                while (tab.lastChild) { tab.removeChild(tab.lastChild); }
                while (panel.lastChild) { panel.removeChild(panel.lastChild); }
        } catch(E) {
-               alert(E);
+               dump(js2JSON(E)+'\n');
        }
 }
 
@@ -48,6 +50,7 @@ function first_free_tab_count() {
 }
 
 function new_tab( d, tabbox ) {
+       sdump('D_TAB','calling new_tab( ' + d + ',' + tabbox + ');\n');
        var tbox = d.getElementById(tabbox);
        var tabs = tbox.firstChild;
        var panels = tbox.lastChild;
@@ -73,17 +76,18 @@ function new_tab( d, tabbox ) {
                tabs.selectedIndex = tc;
                //tbox.selectedIndex = tabs.childNodes.length - 1;
                //tabs.selectedIndex = tabs.childNodes.length - 1;
-               replace_tab(tabbox,'Tab','chrome://evergreen/content/about.xul');
+               replace_tab(d,tabbox,'Tab','chrome://evergreen/content/about.xul');
        } catch(E) {
-               alert(E);
+               dump(js2JSON(E)+'\n');
        }
 }
 
 function replace_tab( d, tabbox, label, chrome, params ) {
+       sdump('D_TAB','calling replace_tab( ' + d + ',' + tabbox + ');\n');
        var tbox = d.getElementById(tabbox);
        var tabs = tbox.firstChild;
        var panels = tbox.lastChild;
-       if (tabs.childNodes.length == 0) { new_tab(tabbox); }
+       if (tabs.childNodes.length == 0) { new_tab(d,tabbox); }
        try {
                var tab = tabs.selectedItem;
                var panel = tbox.selectedPanel;
@@ -96,17 +100,17 @@ function replace_tab( d, tabbox, label, chrome, params ) {
                //frame.setAttribute('style','overflow: scroll; min-height: 500px; min-width: 500px;');
                frame.setAttribute('src',chrome);
                panel.appendChild(frame);
-               frame.contentWindow.parentWindow = parentWindow;
-               frame.contentWindow.tabWindow = this;
-               dump('replace_tab.tabWindow = ' + this + '\n');
+               //frame.contentWindow.parentWindow = parentWindow;
+               //frame.contentWindow.tabWindow = this;
+               //dump('replace_tab.tabWindow = ' + this + '\n');
                frame.contentWindow.mw = mw;
-               frame.contentWindow.am_i_a_top_level_tab = true;
+               //frame.contentWindow.am_i_a_top_level_tab = true;
                if (params) {
                        frame.contentWindow.params = params;
                }
                return frame.contentWindow;
        } catch(E) {
-               alert(E);
+               dump(js2JSON(E)+'\n');
        }
 
 }

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul
index 92ad012..84a81a4 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul
@@ -7,7 +7,7 @@
 <window id="app_shell_win"
        orient="vertical" style="overflow: auto" width="800" height="500"
        sizemode="maximized" persist="width height" 
-       onload="mw.OpenILS_init('AppShell');"
+       onload="mw.OpenILS_init('AppShell',{ 'd' : document });"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
        <!-- Stylesheets -->

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
index 43f8731..d3bd2b1 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
@@ -9,46 +9,46 @@
                window.close();" />
 
        <command id="cmd_new_window" oncommand="
-               spawn_main_window();" />
+               mw.spawn_main_window();" />
 
        <command id="cmd_new_tab" oncommand="
-               new_tab(document,'main_tabbox');" />
+               mw.new_tab(document,'main_tabbox');" />
 
        <command id="cmd_close_tab" oncommand="
-               close_tab(document,'main_tabbox');" />
+               mw.close_tab(document,'main_tabbox');" />
 
        <command id="cmd_cat_main" oncommand="
-               spawn_opac_navigator(document,'replace',{}); "/>        
+               mw.spawn_opac_navigator(document,'replace',{}); "/>     
 
        <command id="cmd_circ_checkout" oncommand="
-               spawn_check_out(document,'replace',{}); "/>     
+               mw.spawn_check_out(document,'replace',{}); "/>  
 
        <command id="cmd_circ_search" oncommand="
-               spawn_circ_search(document,'replace',{}); "/>   
+               mw.spawn_circ_search(document,'replace',{}); "/>        
 
        <command id="cmd_circ_display" oncommand="
-               spawn_circ_display(document,'replace',{}); "/>
+               mw.spawn_circ_display(document,'replace',{}); "/>
 
        <command id="cmd_circ_checkin" oncommand="
-               spawn_check_in(document,'replace',{}); "/>      
+               mw.spawn_check_in(document,'replace',{}); "/>   
 
        <command id="cmd_search_opac" oncommand="
-               spawn_opac_navigator(document,'replace',{}); "/>        
+               mw.spawn_opac_navigator(document,'replace',{}); "/>     
 
        <command id="cmd_patron_register" oncommand="
-               spawn_patron_register(document,'replace',{}); "/>       
+               mw.spawn_patron_register(document,'replace',{}); "/>    
 
        <command id="cmd_survey_wizard" oncommand="
-               spawn_survey_admin_wizard(document,false,{}); "/>       
+               mw.spawn_survey_admin_wizard(document,false,{}); "/>    
 
        <command id="cmd_copy_stat_cat_edit" oncommand="
-               spawn_copy_stat_cat_edit(document,'replace',{}); "/>    
+               mw.spawn_copy_stat_cat_edit(document,'replace',{}); "/> 
 
        <command id="cmd_patron_stat_cat_edit" oncommand="
-               spawn_patron_stat_cat_edit(document,'replace',{}); "/>  
+               mw.spawn_patron_stat_cat_edit(document,'replace',{}); "/>       
 
        <command id="cmd_z39_50_import_old" oncommand="
-               spawn_z3950_import(document,'replace',{}); "/>  
+               mw.spawn_z3950_import(document,'replace',{}); "/>       
 
        <command id="cmd_test" oncommand="
                "/>

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
index c15a6b8..feb72ef 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
@@ -7,7 +7,8 @@ var sdump_levels = {
        'D_EXPLODE' : false,
        'D_PRINT' : false,
        'D_SES' : true,
-       'D_SPAWN' : true
+       'D_SPAWN' : true,
+       'D_TAB' : true
 };
 
 function sdump(level,msg) {

diff --git a/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css b/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
index 367cae9..545ac1c 100644 (file)
--- a/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
+++ b/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css
@@ -1,3 +1,3 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
 @namespace html url("http://www.w3.org/TR/REC-html40"); 
-* { background-color: red; }
+* { color: red; }