From eed365762286e8a9dc4c0097bfd07dbe0651f388 Mon Sep 17 00:00:00 2001 From: erickson Date: Tue, 30 Aug 2005 13:34:59 +0000 Subject: [PATCH] moved id, css, name, etc. variables into their respective XML files instead of a global config file removed the global config file git-svn-id: svn://svn.open-ils.org/ILS/trunk@1764 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/skin/default/js/config.js | 133 ------------------ Open-ILS/web/opac/skin/default/js/sidebar.js | 2 + .../web/opac/skin/default/xml/altcanvas.xml | 7 + .../web/opac/skin/default/xml/js_common.xml | 3 +- Open-ILS/web/opac/skin/default/xml/login.xml | 10 ++ Open-ILS/web/opac/skin/default/xml/logo.xml | 1 + .../opac/skin/default/xml/result_common.xml | 28 ++++ .../web/opac/skin/default/xml/searchbar.xml | 19 ++- .../web/opac/skin/default/xml/sidebar.xml | 42 +++++- 9 files changed, 104 insertions(+), 141 deletions(-) delete mode 100644 Open-ILS/web/opac/skin/default/js/config.js diff --git a/Open-ILS/web/opac/skin/default/js/config.js b/Open-ILS/web/opac/skin/default/js/config.js deleted file mode 100644 index 669cc15ed9..0000000000 --- a/Open-ILS/web/opac/skin/default/js/config.js +++ /dev/null @@ -1,133 +0,0 @@ -/* ---------------------------------------------------------------------------- */ -/* Set up ID's, CSS, etc. */ -/* ---------------------------------------------------------------------------- */ -config.ids.common.top_logo = "top_left_logo"; - -config.css.color_1 = "color_1"; -config.css.color_2 = "color_2"; -config.css.color_3 = "color_3"; - -config.themes.def = "Default"; -config.themes.test = "ColorTest"; - -/* result */ -config.ids.result = {}; -config.css.result = {}; -config.names.result = {}; -config.ids.result.offset_start = "offset_start"; -config.ids.result.offset_end = "offset_end"; -config.ids.result.result_count = "result_count"; -config.ids.result.next_link = 'next_link'; -config.ids.result.prev_link = 'prev_link'; -config.ids.result.home_link = 'search_home_link'; -config.ids.result.end_link = 'end_link'; -config.ids.result.main_table = 'result_table'; -config.ids.result.row_template = 'result_table_template'; -config.ids.result.num_pages = 'num_pages'; -config.ids.result.current_page = 'current_page'; -config.css.result.nav_active = "nav_link_active"; -config.ids.result.top_div = "result_table_div"; -config.ids.result.nav_links = "search_nav_links"; -config.ids.result.info = "result_info_div"; -config.css.result.cc_cell_even = "copy_count_cell_even"; - -config.names.result.item_jacket = "item_jacket"; -config.names.result.item_title = "item_title"; -config.names.result.item_author = "item_author"; -config.names.result.counts_row = "counts_row"; -config.names.result.count_cell = "copy_count_cell"; - -/* login page */ -config.ids.login = {}; -config.css.login = {}; -config.ids.login.box = "login_box"; -config.ids.login.username = "login_username"; -config.ids.login.password = "login_password"; -config.ids.login.button = "login_button"; -config.ids.login.cancel = "login_cancel_button"; - - -/* searchbar ids and css */ -config.ids.searchbar = {}; -config.css.searchbar = {}; -config.ids.searchbar.text = 'search_box'; -config.ids.searchbar.submit = 'search_submit'; -config.ids.searchbar.type_selector = 'search_type_selector'; -config.ids.searchbar.depth_selector = 'depth_selector'; -config.ids.searchbar.form_selector = 'form_selector'; -config.ids.searchbar.extra_row = 'searchbar_extra'; -config.ids.searchbar.main_row = 'searchbar_main_row'; -config.ids.searchbar.table = 'searchbar_table'; -config.ids.searchbar.tag = 'search_tag_link'; -config.ids.searchbar.tag_on = 'searchbar_tag_on'; -config.ids.searchbar.tag_off = 'searchbar_tag_off'; -config.ids.searchbar.location_tag = 'search_location_tag_link'; - - -/* sidebar */ -config.ids.sidebar = {}; -config.css.sidebar = {}; -config.names.sidebar = {}; -config.css.sidebar.item = {}; -config.ids.sidebar.home = 'home_link_div'; -config.ids.sidebar.advanced = 'advanced_link_div'; -config.ids.sidebar.myopac = 'myopac_link_div'; -config.ids.sidebar.prefs = 'prefs_link_div'; -config.ids.sidebar.mresult = 'mresult_link_div'; -config.ids.sidebar.rresult = 'result_link_div'; -config.ids.sidebar.rdetail = "rdetail_link_div"; -config.ids.sidebar.login = 'login_link'; -config.ids.sidebar.logout = 'logout_link'; -config.ids.sidebar.logoutbox = 'logout_link_div'; -config.ids.sidebar.loginbox = 'login_link_div'; -config.ids.sidebar.logged_in_as = 'logged_in_as_div'; -config.ids.sidebar.username_dest = 'username_dest'; -config.ids.sidebar.subject = 'subject_sidebar'; -config.ids.sidebar.subject_item = 'subject_item'; -config.ids.sidebar.author = 'author_sidebar'; -config.ids.sidebar.author_item = 'author_item'; -config.ids.sidebar.series = 'series_sidebar'; -config.ids.sidebar.series_item = 'series_item'; - -config.ids.sidebar.home_link = 'home_link' -config.ids.sidebar.advanced_link = 'advanced_link' -config.ids.sidebar.myopac_link = 'myopac_link' - -config.names.sidebar.subject_item = 'subject_item'; -config.names.sidebar.author_item = 'author_item'; -config.names.sidebar.series_item = 'series_item'; - -/* record detail */ -/* -config.ids.rdetail = {}; -config.ids.rdetail.details_body = 'rdetail_details_body'; -config.ids.rdetail.title = 'rdetail_title'; -config.ids.rdetail.author = 'rdetail_author'; -config.ids.rdetail.isbn = 'rdetail_isbn'; -config.ids.rdetail.edition = 'rdetail_edition'; -config.ids.rdetail.pubdate = 'rdetail_pubdate'; -config.ids.rdetail.publisher = 'rdetail_publisher'; -config.ids.rdetail.tor = 'rdetail_tor'; -config.ids.rdetail.abstr = 'rdetail_abstract'; -config.ids.rdetail.image = 'rdetail_image'; -*/ - - -/* XUL */ -/* -config.ids.xul.marc_editor_link = "marc_editor_link"; -config.ids.xul.copy_browser_link = "copy_browser_link"; -config.ids.xul.marc_editor = "marc_editor_div"; -config.ids.xul.copy_browser = "copy_browser_div"; -*/ - - -/* ---------------------------------------------------------------------------- */ -/* These are pages that may replace the canvas */ -/* ---------------------------------------------------------------------------- */ -config.ids.altcanvas.login = config.ids.login.box; -config.ids.altcanvas.org_tree = config.ids.common.org_container; - - - - diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js index 2f90176fe8..67c1affbeb 100644 --- a/Open-ILS/web/opac/skin/default/js/sidebar.js +++ b/Open-ILS/web/opac/skin/default/js/sidebar.js @@ -62,3 +62,5 @@ function setSidebarLinks() { G.ui.sidebar.advanced_link.setAttribute("href", buildOPACLink({page:ADVANCED})); G.ui.sidebar.myopac_link.setAttribute("href", buildOPACLink({page:MYOPAC}, false, true)); } + + diff --git a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml index 64709c9a9e..908dbb3a1a 100644 --- a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml +++ b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml @@ -11,4 +11,11 @@ + + + + diff --git a/Open-ILS/web/opac/skin/default/xml/js_common.xml b/Open-ILS/web/opac/skin/default/xml/js_common.xml index 0fabdda7a5..6c329924ba 100644 --- a/Open-ILS/web/opac/skin/default/xml/js_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/js_common.xml @@ -3,6 +3,7 @@
+ @@ -21,7 +22,5 @@ - -
diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml index 6ced600799..61eca7ba3d 100644 --- a/Open-ILS/web/opac/skin/default/xml/login.xml +++ b/Open-ILS/web/opac/skin/default/xml/login.xml @@ -4,6 +4,16 @@
+ + diff --git a/Open-ILS/web/opac/skin/default/xml/logo.xml b/Open-ILS/web/opac/skin/default/xml/logo.xml index 3ef934960d..3111ff5b95 100644 --- a/Open-ILS/web/opac/skin/default/xml/logo.xml +++ b/Open-ILS/web/opac/skin/default/xml/logo.xml @@ -1,4 +1,5 @@
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result_common.xml index 755c7aaff7..08b8aeda48 100644 --- a/Open-ILS/web/opac/skin/default/xml/result_common.xml +++ b/Open-ILS/web/opac/skin/default/xml/result_common.xml @@ -3,6 +3,34 @@
+ + + diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml index 9d77ca6f53..a3dd334d17 100644 --- a/Open-ILS/web/opac/skin/default/xml/searchbar.xml +++ b/Open-ILS/web/opac/skin/default/xml/searchbar.xml @@ -8,9 +8,22 @@ - +
diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml index ea0fc2c1f4..01d12d4b4c 100644 --- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml +++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml @@ -5,8 +5,6 @@