Disable JSPac in staff client

This includes removing the toggle option for TPac usage.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Conflicts:

	Open-ILS/web/opac/locale/en-US/lang.dtd

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index b4fa6f4..b913618 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -3615,9 +3615,8 @@
 <!ENTITY staff.client.portal.receipts "Edit Receipt Templates">
 <!ENTITY staff.client.portal.copyright "Copyright &copy; 2006-2013 Georgia Public Library Service, and others">
 <!ENTITY staff.client.portal.poweredby "Powered by">
-<!ENTITY staff.client.portal.toggle_tpac "Toggle Template Toolkit OPAC Use">
-<!ENTITY staff.client.portal.toggle_tpac.message_on "The use of the Template Toolkit OPAC has been enabled. You may need to restart the staff client for this to take effect.">
-<!ENTITY staff.client.portal.toggle_tpac.message_off "The use of the Template Toolkit OPAC has been disabled. You may need to restart the staff client for this to take effect.">
+<!ENTITY staff.client.portal.open_new_tab.description "Open in a new tab">
+<!ENTITY staff.client.portal.search.button "Search">
 <!ENTITY staff.item.batch.hold.groupbox_caption "Request Details">
 <!ENTITY staff.item.batch.hold.hold_type_menu.label "Hold Type">
 <!ENTITY staff.item.batch.hold.hold_type_menu.accesskey "T">

diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
index 807f2f0..205b79d 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
@@ -604,17 +604,10 @@ function set_opac() {
         content_params.get_barcode = xulG.get_barcode;
         content_params.get_barcode_and_settings = xulG.get_barcode_and_settings;
 
-        var secure_opac = true; // default to secure
-        var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
-        if (prefs.prefHasUserValue('oils.secure_opac')) {
-            secure_opac = prefs.getBoolPref('oils.secure_opac');
-        }
-        dump('secure_opac = ' + secure_opac + '\n');
-
         if (opac_url) {
-            content_params.url = xulG.url_prefix( opac_url, secure_opac );
+            content_params.url = xulG.url_prefix( opac_url, true );
         } else {
-            content_params.url = xulG.url_prefix( 'browser', secure_opac );
+            content_params.url = xulG.url_prefix( 'browser', true );
         }
         browser_frame = bottom_pane.set_iframe( xulG.url_prefix('XUL_BROWSER?name=Catalog'), {}, content_params);
         /* // Remember to use the REMOTE_BROWSER if we ever try to move this to remote xul again

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 d3eb6e2..7a877b3 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -25,13 +25,6 @@ if (!LOCALE) {
     LOCALE = 'en-US';
 }
 
-var use_tpac = false;
-try {
-    use_tpac = pref.getBoolPref('oils.use_tpac');
-} catch (E) {
-    dump("Failed to get TPac preference: " + E + "\n");
-}
-
 const MODE_RDONLY   = 0x01;
 const MODE_WRONLY   = 0x02;
 const MODE_CREATE   = 0x08;
@@ -379,12 +372,12 @@ var api = {
 
 var urls = {
 
-    'opac' : 'oils://remote/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
-    'opac_rdetail' : 'oils://remote/opac/' + LOCALE + '/skin/default/xml/rdetail.xml?r=',
-    'opac_rresult' : 'oils://remote/opac/' + LOCALE + '/skin/default/xml/rresult.xml',
-    'opac_rresult_metarecord' : 'oils://remote/opac/' + LOCALE + '/skin/default/xml/rresult.xml?m=',
+    'opac' : 'oils://remote/eg/opac/advanced',
+    'opac_rdetail' : 'oils://remote/eg/opac/record/',
+    'opac_rresult' : 'oils://remote/eg/opac/results',
+    'opac_rresult_metarecord' : 'oils://remote/eg/opac/results?metarecord=',
     'org_tree' : '/opac/common/js/' + LOCALE + '/OrgTree.js',
-    'browser' : 'oils://remote/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
+    'browser' : 'oils://remote/eg/opac/advanced',
     'fieldmapper' : '/opac/common/js/fmall.js',
     'xsl_marc2html' : '/opac/extras/xsl/oilsMARC21slim2HTML.xsl',
     'ac_jacket_small' : '/opac/extras/ac/jacket/small/',
@@ -524,12 +517,3 @@ var urls = {
     'XUL_SERIAL_BATCH_RECEIVE': 'oils://remote/xul/server/serial/batch_receive.xul',
     'EG_TRIGGER_EVENTS' : 'oils://remote/eg/actor/user/event_log'
 }
-
-if(use_tpac) {
-    urls['opac'] = 'oils://remote/eg/opac/advanced';
-    urls['opac_rdetail'] = 'oils://remote/eg/opac/record/';
-    urls['opac_rresult'] = 'oils://remote/eg/opac/results';
-    urls['opac_rresult_metarecord'] = 'oils://remote/eg/opac/results?metarecord=';
-    urls['browser'] = urls.opac;
-    pref.setBoolPref('oils.secure_opac',true);
-}

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index 499184d..52280b3 100644 (file)
--- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
+++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
@@ -27,9 +27,6 @@ pref("open-ils.menu.toolbar.mode", "");
 pref("open-ils.menu.toolbar.labelbelow", false);
 pref("open-ils.toolbar.defaultnewtab", false);
 
-// Template Toolkit Opac Enabled in Staff Client
-pref("oils.use_tpac", false);
-
 // Copy location name first in copy editor
 pref("oils.copy_editor.copy_location_name_first", false);
 

diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 015c8e5..ce7aead 100644 (file)
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -247,23 +247,6 @@
                         else
                                 xulG.set_tab(loc, {}, content_params);
                 }
-                function toggle_tpac(mode) {
-                    var use_tpac = false;
-                    var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
-                    try {
-                        use_tpac = prefs.getBoolPref('oils.use_tpac');
-                    } catch (E) {
-                        dump('Failed to get current use_tpac setting - Assuming false: ' + E);
-                    }
-                    use_tpac = !use_tpac;
-                    prefs.setBoolPref('oils.use_tpac', use_tpac);
-                    var message = document.getElementById('tpac_toggled_on');
-                    if(!use_tpac) {
-                        message = document.getElementById('tpac_toggled_off');
-                    }
-                    message = message.textContent;
-                    alert(message);
-                }
                 // ]]>
   </script>
   <style type="text/css">
@@ -553,18 +536,8 @@
               "#" onclick=
               "try { receipt_editor(false); } catch(E) { alert(E); }; return false;">&staff.client.portal.receipts;</a></td>
             </tr>
-
-            <tr>
-              <td height="50"><img src="skin/media/images/portal/book.png" height="48" width="48"
-              onclick="try { toggle_tpac(); } catch(E) { alert(E) }; return false;" alt="&staff.client.portal.toggle_tpac;" /></td>
-
-              <td><a href="#"
-              onclick="try { toggle_tpac(); } catch(E) { alert(E); }; return false;">&staff.client.portal.toggle_tpac;</a></td>
-            </tr>
           </table>
         </div>
-        <span style="display:none" id="tpac_toggled_on">&staff.client.portal.toggle_tpac.message_on;</span>
-        <span style="display:none" id="tpac_toggled_off">&staff.client.portal.toggle_tpac.message_off;</span>
       </td>
     </tr>
   </table>