From d9689ac43df080041b22fa7728563145f66f6510 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 23 Dec 2008 21:41:37 +0000 Subject: [PATCH] Move this from chrome to remote, where it belongs git-svn-id: svn://svn.open-ils.org/ILS/trunk@11675 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/Makefile.am | 1 - .../chrome/content/main/constants.js | 2 +- .../chrome/locale/en-US/offline.properties | 6 +---- .../server/locale/en-US/patron.properties | 4 +++ .../main}/verify_credentials.js | 13 +++++----- .../main}/verify_credentials.xul | 26 +++++++------------ 6 files changed, 23 insertions(+), 29 deletions(-) rename Open-ILS/xul/staff_client/{chrome/content/auth => server/main}/verify_credentials.js (84%) rename Open-ILS/xul/staff_client/{chrome/content/auth => server/main}/verify_credentials.xul (71%) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index e5d1e51819..ea489c35d3 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -34,7 +34,6 @@ build_dir: # Convert chrome to remote for server localization chrome2remote: - @sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/auth/verify_credentials.xul @sed -i 's/chrome:\/\/open_ils_staff_client\/locale\//\/xul\/server\/locale\/<\!--#echo var=locale-->\//' build/server/main/simple_auth.xul @for loc in $(CHROME_LOCALES); do \ cp -fr chrome/locale/$$loc build/server/locale/. ; \ diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js index 8a2179e600..85fda94b9c 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js @@ -309,7 +309,7 @@ const urls = { 'XUL_STAT_CAT_EDIT' : '/xul/server/admin/stat_cat_editor.xhtml', 'XUL_SURVEY_WIZARD' : 'chrome://open_ils_staff_client/content/admin/survey_wizard.xul', 'XUL_USER_BUCKETS' : '/xul/server/patron/user_buckets.xul', - 'XUL_VERIFY_CREDENTIALS' : 'chrome://open_ils_staff_client/content/auth/verify_credentials.xul', + 'XUL_VERIFY_CREDENTIALS' : '/xul/server/main/verify_credentials.xul', 'XUL_VOLUME_BUCKETS' : '/xul/server/cat/volume_buckets.xul', 'XUL_VOLUME_COPY_CREATOR' : '/xul/server/cat/volume_copy_creator.xul', 'XUL_VOLUME_EDITOR' : '/xul/server/cat/volume_editor.xul', diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties index 9c85e1be70..6094502295 100644 --- a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties +++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties @@ -131,12 +131,8 @@ menu.cmd_public_opac.tab=OPAC menu.cmd_extension_manager.tab=Extension Manager menu.cmd_theme_manager.tab=Theme Manager menu.cmd_shutdown.prompt=Exit Evergreen completely? -menu.cmd_verify_credentials.tabname=Verify Credentials -menu.cmd_verify_credentials.correct_credentials=Success testing credentials! -menu.cmd_verify_credentials.incorrect_credentials=Failure testing credentials! -menu.cmd_verify_credentials.name_feedback=Username: <%1$s> -menu.cmd_verify_credentials.barcode_feedback=Barcode: <%1$s> menu.spawn_search.msg=Editor would like to search for: %1$s +menu.cmd_verify_credentials.tabname=Verify Credentials menu.close_all_tabs.error=Error closing all tabs menu.new_tab.tab=Tab main.session_cookie.error=Error setting session cookie: %1$s diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index d873ccddd6..c7d4e3392d 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -249,5 +249,9 @@ staff.patron.user_buckets.tab_name=User Buckets staff.patron.user_edit.save_user.depth_required=Depth is required on the %1$s permission. staff.patron.user_edit.save_user.user_modified_successfully=User %1$s [%2$s] successfully modified.\n%3$s permissions and %4$s work locations updated. staff.patron.user_edit.display_perm.select_one=-- Select One -- +staff.patron.cmd_verify_credentials.correct_credentials=Success testing credentials! +staff.patron.cmd_verify_credentials.incorrect_credentials=Failure testing credentials! +staff.patron.cmd_verify_credentials.name_feedback=Username: <%1$s> +staff.patron.cmd_verify_credentials.barcode_feedback=Barcode: <%1$s> web.staff.patron.ue.session_no_defined=User session is not defined web.staff.patron.ue.uedit_show_search.search_would_be=Search would be:\n%1$s diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.js b/Open-ILS/xul/staff_client/server/main/verify_credentials.js similarity index 84% rename from Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.js rename to Open-ILS/xul/staff_client/server/main/verify_credentials.js index cca01789af..fd04fca8e3 100644 --- a/Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.js +++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.js @@ -1,10 +1,11 @@ function verify_init() { try { - offlineStrings = document.getElementById('offlineStrings'); + commonStrings = document.getElementById('commonStrings'); + patronStrings = document.getElementById('patronStrings'); if (typeof JSAN == 'undefined') { throw( - offlineStrings.getString('common.jsan.missing') + commonStrings.getString('common.jsan.missing') ); } @@ -41,20 +42,20 @@ function verify_init() { success_msg.appendChild( document.createTextNode( String(req) == '1' ? - offlineStrings.getString('menu.cmd_verify_credentials.correct_credentials') : - offlineStrings.getString('menu.cmd_verify_credentials.incorrect_credentials') + patronStrings.getString('staff.patron.cmd_verify_credentials.correct_credentials') : + patronStrings.getString('staff.patron.cmd_verify_credentials.incorrect_credentials') ) ); var name_msg = document.createElement('description'); hbox.appendChild(name_msg); name_msg.appendChild( document.createTextNode( - offlineStrings.getFormattedString('menu.cmd_verify_credentials.name_feedback',[name]) + patronStrings.getFormattedString('staff.patron.cmd_verify_credentials.name_feedback',[name]) ) ); var barcode_msg = document.createElement('description'); hbox.appendChild(barcode_msg); barcode_msg.appendChild( document.createTextNode( - offlineStrings.getFormattedString('menu.cmd_verify_credentials.barcode_feedback',[barcode]) + patronStrings.getFormattedString('staff.patron.cmd_verify_credentials.barcode_feedback',[barcode]) ) ); var date_msg = document.createElement('description'); hbox.appendChild(date_msg); diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.xul b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul similarity index 71% rename from Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.xul rename to Open-ILS/xul/staff_client/server/main/verify_credentials.xul index d17818f18f..2d18e9074f 100644 --- a/Open-ILS/xul/staff_client/chrome/content/auth/verify_credentials.xul +++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul @@ -6,14 +6,17 @@ - + - + +]> + @@ -21,22 +24,13 @@ - -