From ff77e3b0323311107b88b0439f0105c6f98959c2 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 21 Jun 2005 16:36:27 +0000 Subject: [PATCH] tests and typos. xpi is currently broken for mozilla. Not registering the skins correctly git-svn-id: svn://svn.open-ils.org/ILS/trunk@896 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/main/app_shell.js | 2 +- .../chrome/content/evergreen/main/app_shell.xul | 2 +- .../chrome/content/evergreen/main/app_shell_overlay.xul | 2 +- .../staff_client/chrome/content/evergreen/util/error.js | 3 ++- .../chrome/content/evergreen/util/spawn_win.js | 4 +++- .../staff_client/chrome/skin/evergreen/app_shell.css | 2 ++ Evergreen/staff_client/chrome/skin/evergreen/contents.rdf | 8 ++++---- .../staff_client/chrome/skin/evergreen/evergreen.css | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) 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 7bc2edc619..4ad89c72f5 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.js @@ -1,4 +1,4 @@ -sdump('D_TRACE','Loading util.js\n'); +sdump('D_TRACE','Loading app_shell.js\n'); var tab_count = [ false, false, false, false, false, false, false, false, false, false ]; 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 5e3cd93acd..92ad01285b 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell.xul @@ -14,7 +14,7 @@ - + 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 829e32e0a6..43f873104b 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul @@ -59,7 +59,7 @@ - + diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js index ca02b74ef2..c15a6b873a 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js @@ -6,7 +6,8 @@ var sdump_levels = { 'D_UTIL' : false, 'D_EXPLODE' : false, 'D_PRINT' : false, - 'D_SES' : true + 'D_SES' : true, + 'D_SPAWN' : true }; function sdump(level,msg) { diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js index 4002bc229a..d84e6076f1 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js @@ -51,8 +51,9 @@ function spawn_copy_browser(d,tab_flag,passthru_params) { } function spawn_main() { + sdump('D_SPAWN','trying to spawn app_shell\n'); try { - var w = new_window('chrome://evergreen/content/evergreen/main/app_shell.xul'); + var w = new_window('chrome://evergreen/content/main/app_shell.xul'); if (!w) { throw('window ref == null'); } try { w.document.title = G.user.usrname() + '@' + G.user_ou.name(); @@ -60,6 +61,7 @@ function spawn_main() { alert('Hrmm. ' + pretty_print( js2JSON(E) ) ); } } catch(E) { + dump(js2JSON(E)+'\n'); //incr_progressmeter('auth_meter',-100); //alert('Login failed on new_window: ' + js2JSON(E)); enable_login_prompts(); return; } diff --git a/Evergreen/staff_client/chrome/skin/evergreen/app_shell.css b/Evergreen/staff_client/chrome/skin/evergreen/app_shell.css index e69de29bb2..6fa0a42f1e 100644 --- a/Evergreen/staff_client/chrome/skin/evergreen/app_shell.css +++ b/Evergreen/staff_client/chrome/skin/evergreen/app_shell.css @@ -0,0 +1,2 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/TR/REC-html40"); diff --git a/Evergreen/staff_client/chrome/skin/evergreen/contents.rdf b/Evergreen/staff_client/chrome/skin/evergreen/contents.rdf index 8da189a871..40d320118c 100644 --- a/Evergreen/staff_client/chrome/skin/evergreen/contents.rdf +++ b/Evergreen/staff_client/chrome/skin/evergreen/contents.rdf @@ -6,17 +6,17 @@ - + - - - + + diff --git a/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css b/Evergreen/staff_client/chrome/skin/evergreen/evergreen.css index 19db78ef40..367cae9130 100644 --- 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; } -- 2.43.2