From e57505c8c19c2efe604d50fa39333f259830f4a7 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 25 Feb 2010 20:58:10 +0000
Subject: [PATCH] Reload button for staff client's browser, and some missing
DTD entities
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15643 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/web/opac/locale/en-US/lang.dtd | 7 +++++++
Open-ILS/xul/staff_client/chrome/content/util/browser.js | 16 ++++++++++++++++
.../xul/staff_client/chrome/content/util/browser.xul | 10 ++++++----
.../xul/staff_client/chrome/content/util/rbrowser.xul | 10 ++++++----
4 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 0761614058..023bdfdfb7 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -52,6 +52,13 @@
<!ENTITY common.true "True">
<!ENTITY common.false "False">
+<!ENTITY common.browser.forward.label "Go Forward">
+<!ENTITY common.browser.forward.accesskey "d">
+<!ENTITY common.browser.backward.label "Go Back">
+<!ENTITY common.browser.backward.accesskey "B">
+<!ENTITY common.browser.reload.label "Reload">
+<!ENTITY common.browser.reload.accesskey "l">
+
<!ENTITY common.textbox.cut "Cut">
<!ENTITY common.textbox.copy "Copy">
<!ENTITY common.textbox.paste "Paste">
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.js b/Open-ILS/xul/staff_client/chrome/content/util/browser.js
index 707cc84262..cba980b68e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.js
@@ -72,6 +72,19 @@ util.browser.prototype = {
obj.error.sdump('D_ERROR',err);
}
}
+ ],
+ 'cmd_reload' : [
+ ['command'],
+ function() {
+ try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ var n = obj.getWebNavigation();
+ n.reload( Components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE );
+ } catch(E) {
+ var err = 'cmd_reload: ' + E;
+ obj.error.sdump('D_ERROR',err);
+ }
+ }
]
}
}
@@ -99,6 +112,7 @@ util.browser.prototype = {
'get_content' : function() {
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
if (this.controller.view.browser_browser.contentWindow.wrappedJSObject) {
return this.controller.view.browser_browser.contentWindow.wrappedJSObject;
} else {
@@ -133,6 +147,7 @@ util.browser.prototype = {
'getWebNavigation' : function() {
try {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var wn = this.controller.view.browser_browser.webNavigation;
var s = this.url + '\n' + this.get_content().location.href + '\n';
s += ('getWebNavigation() = ' + wn + '\n');
@@ -144,6 +159,7 @@ util.browser.prototype = {
},
'updateNavButtons' : function() {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
var obj = this;
var s = obj.url + '\n' + obj.get_content().location.href + '\n';
try {
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
index c0479294a3..d0a8428277 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/browser.xul
@@ -99,14 +99,16 @@
<commandset id="util_browser_cmds">
<command id="cmd_broken" />
<command id="cmd_print" />
- <command id="cmd_back" />
- <command id="cmd_forward" />
+ <command id="cmd_back" label="&common.browser.backward.label;" accesskey="&common.browser.backward.accesskey;" />
+ <command id="cmd_reload" label="&common.browser.reload.label;" accesskey="&common.browser.reload.accesskey;" />
+ <command id="cmd_forward" label="&common.browser.forward.label;" accesskey="&common.browser.forward.accesskey;" />
</commandset>
<vbox flex="1">
<hbox>
- <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
- <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+ <button id="back" command="cmd_back" disabled="true" hidden="true"/>
+ <button id="reload" command="cmd_reload" disabled="false" hidden="false"/>
+ <button id="forward" command="cmd_forward" disabled="true" hidden="true"/>
<spacer flex="1"/>
<label id="debug" value="Debug" disabled="true" onclick="var m = (this.getAttribute('tooltiptext')+'\n'); dump(m); alert(m);"/>
<button id="browser_print" label="Print Page" command="cmd_print" hidden="true"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
index 133336202d..9bb38a9b0d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/util/rbrowser.xul
@@ -99,14 +99,16 @@
<commandset id="util_browser_cmds">
<command id="cmd_broken" />
<command id="cmd_print" />
- <command id="cmd_back" />
- <command id="cmd_forward" />
+ <command id="cmd_back" label="&common.browser.backward.label;" accesskey="&common.browser.backward.accesskey;" />
+ <command id="cmd_reload" label="&common.browser.reload.label;" accesskey="&common.browser.reload.accesskey;" />
+ <command id="cmd_forward" label="&common.browser.forward.label;" accesskey="&common.browser.forward.accesskey;" />
</commandset>
<vbox flex="1">
<hbox>
- <button id="back" label="Go Back" command="cmd_back" accesskey="b" disabled="true" hidden="true"/>
- <button id="forward" label="Go Forward" command="cmd_forward" accesskey="d" disabled="true" hidden="true"/>
+ <button id="back" command="cmd_back" disabled="true" hidden="true"/>
+ <button id="reload" command="cmd_reload" disabled="false" hidden="false"/>
+ <button id="forward" command="cmd_forward" disabled="true" hidden="true"/>
<spacer flex="1"/>
<button id="browser_print" label="Print Page" oldcommand="cmd_print" hidden="true"
oncommand="netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect'); if (g.browser.alt_print) { JSAN.use('util.print'); var p = new util.print(); p.NSPrint(g.browser.get_content(),false,{}); } else { g.browser.get_content().print(); }"
--
2.11.0