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

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 (file)
index 669cc15..0000000
--- 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 2f90176..67c1aff 100644 (file)
--- 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 64709c9..908dbb3 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
+++ b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
@@ -11,4 +11,11 @@
        <!-- The org tree -->
        <xi:include href="orgtree.xml"/> 
 
+       <!-- ============================================================================= -->
+       <!-- Register the alternate canvases  -->
+       <script language='javascript'>
+               config.ids.altcanvas.login              = config.ids.login.box;
+               config.ids.altcanvas.org_tree    = config.ids.common.org_container;
+       </script>
+
 </div>

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 0fabdda..6c32992 100644 (file)
--- 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 @@
 <!-- Javascript shared across all pages -->
 
 <div xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
+
        <script language='javascript' src='../../../common/js/utils.js'> </script>
        <script language='javascript' src='../../../common/js//config.js'> </script>
        <script language='javascript' src='../../../common/js/CGI.js'> </script>
@@ -21,7 +22,5 @@
        <script language='javascript' src='../../../common/js/init.js'> </script>
        <script language='javascript' src='../../../common/js/added_content.js'> </script>
 
-       <!-- our config settings -->
-       <script language='javascript' src='../js/config.js'> </script>
 </div>
 

diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml
index 6ced600..61eca7b 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/login.xml
@@ -4,6 +4,16 @@
 
 <div id='login_box' class='hide_me color_1'>
 
+       <script language='javascript'>
+               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";
+       </script>
+
        <div class='login_text'>
                <span> Login in with your username and password. </span>
        </div>

diff --git a/Open-ILS/web/opac/skin/default/xml/logo.xml b/Open-ILS/web/opac/skin/default/xml/logo.xml
index 3ef9349..3111ff5 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/logo.xml
+++ b/Open-ILS/web/opac/skin/default/xml/logo.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0'?>
 <div id='logo_div'>
+       <script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
        <img id='top_left_logo' border='0' class='logo'> </img>
 </div>

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 755c7aa..08b8aed 100644 (file)
--- 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 @@
 
 <div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
+       <script language='javascript'>
+               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";
+       </script>
+
+
        <table id='search_nav_links'>
                <tbody>
                        <tr>

diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml
index 9d77ca6..a3dd334 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/searchbar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/searchbar.xml
@@ -8,9 +8,22 @@
        <!-- load my js -->
        <script language='javascript' src='../js/search_bar.js'> </script>
 
-       <!--
-       <a onclick="scaleFont(prompt('scale fonts...'));">CLICK</a>
-       -->
+       <script language='javascript'>
+               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';
+       </script>
 
 
        <div id='searchbar_main' class='color_1'>

diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml
index ea0fc2c..01d12d4 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml
+++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml
@@ -5,8 +5,6 @@
 
 <div id="sidebar_div" class="sidebar_div" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-       <script language='javascript' src='../js/sidebar.js'> </script>
-
        <div class='sidebar_chunk color_1'>
 
                <div title="&navigate.home.title;" 
@@ -87,7 +85,45 @@
                        </li>
                </ul>
        </div>
-       
+
+
+       <!-- ============================================================================= -->
+       <!-- Our javascript -->
+       <script language='javascript' src='../js/sidebar.js'> </script>
+
+       <script language='javascript'>
+               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';
+       </script>
 
 </div>