From 796f3b49b99d5237f6367f81a30983f5b74ca4cc Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Thu, 23 Jun 2011 18:04:28 -0400 Subject: [PATCH] config ui trivial improvements, scratching out a place for a browse UI --- Open-ILS/examples/fm_IDL.xml | 2 +- Open-ILS/web/Makefile.am | 2 +- .../web/js/ui/default/cat/authority/list.js | 2 +- Open-ILS/web/opac/common/js/config.js | 4 ++ Open-ILS/web/opac/locale/en-US/lang.dtd | 2 + Open-ILS/web/opac/locale/en-US/opac.dtd | 2 + Open-ILS/web/opac/skin/default/js/advanced.js | 11 +++++- .../web/opac/skin/default/js/authbrowse.js | 1 + .../skin/default/xml/common/js_common.xml | 2 +- .../opac/skin/default/xml/common/sidebar.xml | 25 +++++++++++++ .../opac/skin/default/xml/page_authbrowse.xml | 6 +++ Open-ILS/web/opac/skin/default/xml/setenv.xml | 3 ++ .../conify/global/cat/authority/thesaurus.tt2 | 37 ++++++++++++++++++- .../staff_client/chrome/content/main/menu.js | 4 ++ .../chrome/content/main/menu_frame_menus.xul | 2 + 15 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 Open-ILS/web/opac/skin/default/js/authbrowse.js create mode 100644 Open-ILS/web/opac/skin/default/xml/page_authbrowse.xml diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 052c802206..e89d46ecf3 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -1853,7 +1853,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + diff --git a/Open-ILS/web/Makefile.am b/Open-ILS/web/Makefile.am index 38c7ac8fff..92d1fd8cdc 100644 --- a/Open-ILS/web/Makefile.am +++ b/Open-ILS/web/Makefile.am @@ -52,7 +52,7 @@ webcore-install: cp @top_srcdir@/Open-ILS/xsl/*.xsl $(DESTDIR)$(XSLDIR) cp -r $(DESTDIR)$(WEBDIR)/opac/skin/default/* $(DESTDIR)$(WEBDIR)/opac/skin/craftsman/ cp -r @top_srcdir@/Open-ILS/web/opac/skin/craftsman/* $(DESTDIR)$(WEBDIR)/opac/skin/craftsman/ - for i in mresult.xml rresult.xml rdetail.xml advanced.xml myopac.xml cnbrowse.xml; do \ + for i in mresult.xml rresult.xml rdetail.xml advanced.xml myopac.xml cnbrowse.xml authbrowse.xml; do \ cd $(DESTDIR)$(WEBDIR)/opac/skin/default/xml/ && rm -f $$i && $(LN_S) index.xml $$i; \ done for i in mresult.xml rresult.xml rdetail.xml advanced.xml myopac.xml cnbrowse.xml; do \ diff --git a/Open-ILS/web/js/ui/default/cat/authority/list.js b/Open-ILS/web/js/ui/default/cat/authority/list.js index c602139037..591bfb8d6d 100644 --- a/Open-ILS/web/js/ui/default/cat/authority/list.js +++ b/Open-ILS/web/js/ui/default/cat/authority/list.js @@ -326,7 +326,7 @@ function displayRecords(parms) { dojo.query("#authlist-div div").orphan(); - var url = '/opac/extras/browse/marcxml/' + var url = '/opac/extras/browse/marcxml/authority.' + dijit.byId('authAxis').attr('value') // + '/' + dijit.byId('authOU').attr('value') + '/1' // replace with preceding line if OUs gain some meaning diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index 3c4c52de11..21b20fa2d8 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -47,6 +47,8 @@ var PARAM_PUBD_AFTER = 'pda'; var PARAM_PUBD_BETWEEN = 'pdt'; var PARAM_PUBD_DURING = 'pdd'; var PARAM_NOPERSIST_SEARCH = 'nps'; +var PARAM_AUTHORITY_BROWSE_AXIS = "ax"; +var PARAM_AUTHORITY_BROWSE_TERM = "bt"; /* URL param values (see comments above) */ var TERM; @@ -113,6 +115,7 @@ var HOME = "home"; var BBAGS = "bbags"; var REQITEMS = "reqitems"; var CNBROWSE = "cnbrowse"; +var AUTHBROWSE = "authbrowse"; /* search type (STYPE) options */ var STYPE_AUTHOR = "author"; @@ -225,6 +228,7 @@ config.page[RDETAIL] = "rdetail.xml"; config.page[BBAGS] = "bbags.xml"; config.page[REQITEMS] = "reqitems.xml"; config.page[CNBROWSE] = "cnbrowse.xml"; +config.page[AUTHBROWSE] = "authbrowse.xml"; /* themes */ config.themes = {}; diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 923621584e..7cbb97d37b 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -789,6 +789,8 @@ + + diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd index d5be2c2ac3..e60841dda5 100644 --- a/Open-ILS/web/opac/locale/en-US/opac.dtd +++ b/Open-ILS/web/opac/locale/en-US/opac.dtd @@ -411,6 +411,7 @@ Please see a librarian to renew your account."> + diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml index 39c0a94d9d..e7352a501f 100644 --- a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml +++ b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml @@ -106,6 +106,31 @@ + + @@ -37,9 +43,38 @@ dojo.i18n.getLocalization("openils.authority", "authority"); var cgi, pcrud; + var control_set; + + function get_control_set(rowidx, item) { + if (item) { + /* I'm /sure/ there's a better way to do the following */ + this._tmp = openils.widget.AutoGrid.defaultGetter; + var ordinary = this._tmp(rowidx, item); + delete this._tmp; + + if (control_set) { + return ordinary; + } else { + var id = this.grid.store.getValue(item, "control_set"); + return { + "id": id, "text": ordinary + }; + } + } + } + + function format_control_set(f) { + if (typeof f == "object") { + return '' + f.text + ""; + } else { + return f; + } + + } function my_init() { - var control_set; var where = {"code": {"!=": null}}; cgi = new openils.CGI(); diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js index e0e1453768..5420b7ee6a 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js @@ -967,6 +967,10 @@ main.menu.prototype = { ['oncommand'], function(event) { open_eg_web_page('conify/global/cat/authority/browse_axis', null, event); } ], + 'cmd_server_admin_authority_thesaurus': [ + ['oncommand'], + function(event) { open_eg_web_page('conify/global/cat/authority/thesaurus', null, event); } + ], 'cmd_server_admin_booking_resource': [ ['oncommand'], function(event) { open_eg_web_page('conify/global/booking/resource', null, event); } diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul index 8f59ae8855..2218ae8c53 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul @@ -201,6 +201,7 @@ /> + @@ -527,6 +528,7 @@ + -- 2.43.2