[open-ils-commits] r13142 - in trunk/Open-ILS/xul/staff_client/chrome: content/main locale/en-US (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue May 12 09:55:00 EDT 2009
Author: erickson
Date: 2009-05-12 09:54:59 -0400 (Tue, 12 May 2009)
New Revision: 13142
Modified:
trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
Log:
plugged in the rest of the admin menu entries
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-05-12 13:43:05 UTC (rev 13141)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-05-12 13:54:59 UTC (rev 13142)
@@ -347,5 +347,7 @@
'XUL_ACQ_PICKLIST' : '/eg/acq/picklist/list',
'XUL_ACQ_UPLOAD' : '/eg/acq/picklist/upload',
'XUL_ACQ_PO' : '/eg/acq/po/search',
- 'EG_WEB_BASE' : '/eg'
+ 'EG_WEB_BASE' : '/eg',
+ 'XUL_LOCAL_ADMIN_BASE' : '/xul/server/admin',
+ 'XUL_REPORTS' : '/reports/oils_rpt.xhtml'
}
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2009-05-12 13:43:05 UTC (rev 13141)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2009-05-12 13:54:59 UTC (rev 13142)
@@ -78,7 +78,25 @@
);
}
+ function open_admin_page(path, labelKey, addSes) {
+ // tab label
+ labelKey = labelKey || 'menu.cmd_open_conify.tab';
+ label = offlineStrings.getString(labelKey);
+
+ // URL
+ var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_LOCAL_ADMIN_BASE + '/' + path);
+ if(addSes) loc += window.escape('?ses=' + ses());
+
+ obj.set_tab(
+ loc,
+ {'tab_name' : label, 'browser' : false },
+ {'no_xulG' : false, 'show_print_button' : false}
+ );
+ }
+
+
+
var cmd_map = {
'cmd_broken' : [
['oncommand'],
@@ -438,57 +456,62 @@
['oncommand'],
function() {
var loc = urls.XUL_REMOTE_BROWSER + '?url=' +
- window.escape(urls.VANDELAY+'?ses='+window.escape(ses()));
+ window.escape(urls.EG_WEB_BASE + '/vandelay/vandelay');
obj.set_tab(
loc,
{'tab_name' : offlineStrings.getString('menu.cmd_open_vandelay.tab'), 'browser' : false },
{'no_xulG' : false, 'show_print_button' : false }
);
+ }
+ ],
+ 'cmd_local_admin_reports' : [
+ ['oncommand'],
+ function() {
+ var loc = urls.XUL_REMOTE_BROWSER + '?url=' + window.escape(urls.XUL_REPORTS + '?ses=' + ses());
+ obj.set_tab(
+ loc,
+ {'tab_name' : offlineStrings.getString('menu.cmd_local_admin_reports.tab'), 'browser' : false },
+ {'no_xulG' : false, 'show_print_button' : false }
+ );
}
],
+ 'cmd_local_admin_transit_list' : [
+ ['oncommand'],
+ function() { open_admin_page('transit_list.xul', 'menu.cmd_local_admin_transit_list.tab'); }
+ ],
+ 'cmd_local_admin_cash_reports' : [
+ ['oncommand'],
+ function() { open_admin_page('cash_reports.xhtml', 'menu.cmd_local_admin_cash_reports.tab', true); }
+ ],
'cmd_local_admin_fonts_and_sounds' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('font_settings.xul', 'menu.cmd_local_admin_fonts_and_sounds.tab'); }
],
'cmd_local_admin_printer' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('printer_settings.html', 'menu.cmd_local_admin_printer.tab', true); }
],
'cmd_local_admin_closed_dates' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('closed_dates.xhtml', 'menu.cmd_local_admin_closed_dates.tab', true); }
],
'cmd_local_admin_copy_locations' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('copy_locations.xhtml', 'menu.cmd_local_admin_copy_locations.tab', true); }
],
'cmd_local_admin_lib_settings' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('org_unit_settings.xhtml', 'menu.cmd_local_admin_lib_settings.tab', true); }
],
'cmd_local_admin_non_cat_types' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('non_cat_types.xhtml', 'menu.cmd_local_admin_non_cat_types.tab', true); }
],
'cmd_local_admin_stat_cats' : [
['oncommand'],
- function() {
- alert(123);
- }
+ function() { open_admin_page('stat_cat_editor.xhtml', 'menu.cmd_local_admin_stat_cats.tab', true); }
],
'cmd_local_admin_standing_penalty' : [
['oncommand'],
@@ -547,21 +570,6 @@
function() { open_conify_page('config/circ_modifier'); }
],
-
- 'cmd_open_conify' : [
- ['oncommand'],
- function() {
- var loc = urls.XUL_REMOTE_BROWSER + '?url=' +
- window.escape(urls.CONIFY+'/admin.html?ses='+window.escape(ses()));
- obj.set_tab(
- loc,
- {'tab_name' : offlineStrings.getString('menu.cmd_open_conify.tab'), 'browser' : false },
- {'no_xulG' : false, 'show_print_button' : false }
- );
-
- }
- ],
-
'cmd_reprint' : [
['oncommand'],
function() {
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2009-05-12 13:43:05 UTC (rev 13141)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2009-05-12 13:54:59 UTC (rev 13142)
@@ -73,7 +73,6 @@
<command id="cmd_test" />
<command id="cmd_broken" disabled="true" />
<command id="cmd_open_vandelay" />
- <command id="cmd_open_conify" />
<command id="cmd_acq_view_picklist" />
<command id="cmd_acq_upload" />
@@ -92,6 +91,9 @@
<command id="cmd_local_admin_idl_field_doc"/>
<command id="cmd_local_admin_action_trigger"/>
<command id="cmd_local_admin_survey"/>
+ <command id="cmd_local_admin_reports"/>
+ <command id="cmd_local_admin_cash_reports"/>
+ <command id="cmd_local_admin_transit_list"/>
<!-- server admin menu commands -->
<command id="cmd_server_admin_org_type"/>
@@ -264,6 +266,9 @@
<menuitem label="&staff.main.menu.admin.local_admin.conify.idl_field_doc.label;" command="cmd_local_admin_idl_field_doc"/>
<menuitem label="&staff.main.menu.admin.local_admin.conify.action_trigger.label;" command="cmd_local_admin_action_trigger"/>
<menuitem label="&staff.main.menu.admin.local_admin.conify.survey.label;" command="cmd_local_admin_survey"/>
+ <menuitem label="&staff.server.admin.index.reports;" command="cmd_local_admin_reports"/>
+ <menuitem label="&staff.server.admin.index.cash_reports;" command="cmd_local_admin_cash_reports"/>
+ <menuitem label="&staff.server.admin.index.transit_list;" command="cmd_local_admin_transit_list"/>
</menupopup>
</menu>
<menu id="main.menu.admin.server" label="&staff.main.menu.admin.server_admin.label;">
@@ -282,11 +287,7 @@
<menuseparator />
<menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
- <menuitem label="&staff.server.admin.index.conify;" command="cmd_open_conify"/>
<menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
- <!--
- <menuitem label="&staff.main.menu.admin.survey_wizard.label;" accesskey="&staff.main.menu.admin.survey_wizard.accesskey;" command="cmd_survey_wizard"/>
- -->
<menuitem label="&staff.main.menu.admin.toggle_buttonbar.label;" accesskey="&staff.main.menu.admin.toggle_buttonbar.accesskey;" command="cmd_toggle_buttonbar"/>
<menuseparator />
<menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
Modified: trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2009-05-12 13:43:05 UTC (rev 13141)
+++ trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2009-05-12 13:54:59 UTC (rev 13142)
@@ -204,3 +204,13 @@
list.actions.csv_to_file.accesskey=F
list.actions.save_column_configuration.label=Save Column Configuration
list.actions.save_column_configuration.accesskey=S
+menu.cmd_local_admin_fonts_and_sounds.tab=Global Font and Sound Settings
+menu.cmd_local_admin_printer.tab=Printer Settings Editor
+menu.cmd_local_admin_closed_dates.tab=Closed Dates Editor
+menu.cmd_local_admin_copy_locations.tab=Copy Locations Editor
+menu.cmd_local_admin_lib_settings.tab=Library Settings Editor
+menu.cmd_local_admin_non_cat_types.tab=Non-cataloged Types Editor
+menu.cmd_local_admin_stat_cats.tab=Statistical Categories Editor
+menu.cmd_local_admin_reports.tab=Reports
+menu.cmd_local_admin_cash_reports.tab=Cash Reports
+menu.cmd_local_admin_transit_list.tab=Transits
More information about the open-ils-commits
mailing list