[open-ils-commits] r11962 - branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main
svn at svn.open-ils.org
svn at svn.open-ils.org
Sun Jan 25 23:09:24 EST 2009
Author: phasefx
Date: 2009-01-25 23:09:22 -0500 (Sun, 25 Jan 2009)
New Revision: 11962
Modified:
branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu.js
branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame.xul
branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul
Log:
change and/or remove references to chrome resources
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu.js
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu.js 2009-01-26 04:08:02 UTC (rev 11961)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu.js 2009-01-26 04:09:22 UTC (rev 11962)
@@ -2,11 +2,12 @@
// vim:noet:sw=4:ts=4:
var offlineStrings;
-offlineStrings = document.getElementById('offlineStrings');
if (typeof main == 'undefined') main = {};
main.menu = function () {
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+ offlineStrings = document.getElementById('offlineStrings');
JSAN.use('util.error'); this.error = new util.error();
JSAN.use('util.window'); this.window = new util.window();
@@ -47,11 +48,13 @@
['oncommand'],
function() {
obj.data.stash_retrieve();
- obj.window.open(
+ var mframe = obj.window.open(
obj.url_prefix(urls.XUL_MENU_FRAME)
+ '?server='+window.escape(urls.remote),
'main' + obj.window.window_name_increment(),
'chrome,resizable');
+ netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
+ mframe.xulG = xulG;
}
],
'cmd_new_tab' : [
@@ -499,6 +502,7 @@
obj.data.session = obj.data.previous_session;
obj.data.stash('session');
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var ios = Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService);
var cookieUri = ios.newURI("http://" + obj.data.server_unadorned, null, null);
var cookieUriSSL = ios.newURI("https://" + obj.data.server_unadorned, null, null);
@@ -664,6 +668,7 @@
['oncommand'],
function clear_the_cache() {
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var cacheClass = Components.classes["@mozilla.org/network/cache-service;1"];
var cacheService = cacheClass.getService(Components.interfaces.nsICacheService);
cacheService.evictEntries(Components.interfaces.nsICache.STORE_ON_DISK);
@@ -704,6 +709,7 @@
['oncommand'],
function() {
if (window.confirm(offlineStrings.getString('menu.cmd_shutdown.prompt'))) {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
var enumerator = windowManagerInterface.getEnumerator(null);
@@ -750,6 +756,7 @@
function(p) {
return function() {
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (p
&& p.firstChild
&& ( p.firstChild.nodeName == 'iframe' || p.firstChild.nodeName == 'browser' )
@@ -891,8 +898,9 @@
content_params.new_tab = function(a,b,c) { return obj.new_tab(a,b,c); };
content_params.set_tab = function(a,b,c) { return obj.set_tab(a,b,c); };
content_params.set_tab_name = function(name) { tab.setAttribute('label',(idx + 1) + ' ' + name); };
- content_params.open_chrome_window = function(a,b,c) { return obj.window.open(a,b,c); };
+ content_params.open_chrome_window = function(a,b,c) { return xulG.window.open(a,b,c); };
content_params.url_prefix = function(url) { return obj.url_prefix(url); };
+ content_params.chrome_xulG = xulG;
if (params && params.tab_name) content_params.set_tab_name( params.tab_name );
var frame;
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame.xul
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame.xul 2009-01-26 04:08:02 UTC (rev 11961)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame.xul 2009-01-26 04:09:22 UTC (rev 11962)
@@ -8,24 +8,19 @@
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<!-- STYLESHEETS -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://open_ils_staff_client/skin/global.css" type="text/css"?>
-<!--
<?xml-stylesheet href="/xul/server/skin/global.css" type="text/css"?>
<?xml-stylesheet href="/xul/server/skin/menu_frame.css" type="text/css"?>
--->
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<!-- LOCALIZATION -->
-<!DOCTYPE window SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
+<!DOCTYPE window PUBLIC "" ""[
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+]>
<!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
<!-- OVERLAYS -->
-<?xul-overlay href="chrome://open_ils_staff_client/content/main/menu_frame_overlay.xul"?>
-<?xul-overlay href="chrome://open_ils_staff_client/content/OpenILS/util_overlay_chrome.xul"?>
-<!--
<?xul-overlay href="/xul/server/main/menu_frame_overlay.xul"?>
<?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
--->
<window id="menu_frame_win"
onload="try { my_init(); } catch(E) { alert(E); }"
@@ -39,8 +34,6 @@
<scripts id="openils_util_scripts"/>
<script type="text/javascript" src="JSAN.js"/>
- <script type="text/javascript" src="constants.js"/>
- <script type="text/javascript" src="../OpenILS/util/fmall.js"/>
<script type="text/javascript">
<![CDATA[
function my_init() {
@@ -48,10 +41,10 @@
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (typeof JSAN == 'undefined') { throw(document.getElementById('offlineStrings').getString('common.jsan.missing')); }
JSAN.errorLevel = "die"; // none, warn, or die
- /*
JSAN.addRepository('/xul/server/');
- */
+ /*
JSAN.addRepository('..');
+ */
JSAN.use('util.error'); g.error = new util.error();
g.error.sdump('D_TRACE','my_init() for menu_frame.xul');
@@ -77,10 +70,11 @@
}
]]>
</script>
+<!--
<script src="chrome://venkman/content/venkman-overlay.js"/>
<messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />
-
+-->
<commandset id="universal_cmds" />
<keyset id="menu_frame_keys" />
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul 2009-01-26 04:08:02 UTC (rev 11961)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_menus.xul 2009-01-26 04:09:22 UTC (rev 11962)
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
-<!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
+<!DOCTYPE overlay PUBLIC "" ""[
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+]>
<overlay id="menu_frame_menus"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
Modified: branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul
===================================================================
--- branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul 2009-01-26 04:08:02 UTC (rev 11961)
+++ branches/staff-client-experiment/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul 2009-01-26 04:09:22 UTC (rev 11962)
@@ -1,9 +1,8 @@
<?xml version="1.0"?>
-<!DOCTYPE overlay SYSTEM "chrome://open_ils_staff_client/locale/lang.dtd">
-<?xul-overlay href="chrome://open_ils_staff_client/content/main/menu_frame_menus.xul"?>
-<!--
+<!DOCTYPE overlay PUBLIC "" ""[
+ <!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+]>
<?xul-overlay href="/xul/server/main/menu_frame_menus.xul"?>
--->
<overlay id="menu_frame_overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
More information about the open-ils-commits
mailing list