projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b550380)
Move onload attribute methods from OPAC pages to Dojo.addOnLoad().
authordbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 23 Feb 2009 06:12:41 +0000 (06:12 +0000)
committerdbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 23 Feb 2009 06:12:41 +0000 (06:12 +0000)
Tabify things a little bit for consistency.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12273 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/web/opac/skin/default/xml/body.xml patch | blob | history
Open-ILS/web/opac/skin/default/xml/common/js_common.xml patch | blob | history
Open-ILS/web/opac/skin/default/xml/home/index_body.xml patch | blob | history

diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
index 4e4b221..ec290b6 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/body.xml
@@ -1,7 +1,4 @@
-<!--
-<body onload='init();' style='height: 100%; border: 2px solid black;'>
--->
-<body class="tundra" onload='init();'>
+<body class="tundra">
        <table width='100%'>
                <tbody>
                        <tr>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
index 508b4cd..c817f9e 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
@@ -31,28 +31,34 @@
                        OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
                <!--#endif -->
 
+               <!-- builds the "Now searching: <org_unit>" text on the home page -->
+               function home_init() {
+                       getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED})); 
+                       getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
+               }
        </script>
 
-    <!-- enable Dojo date picker -->
-    <script language='javascript' type="text/javascript">
+       <!-- enable Dojo date picker -->
+       <script language='javascript' type="text/javascript">
 
-        var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
+               var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
 
-        var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
-        if (!locale) locale = '<!--#echo var="locale"-->';
+               var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+               if (!locale) locale = '<!--#echo var="locale"-->';
 
-        djConfig.locale = locale.toLowerCase();
+               djConfig.locale = locale.toLowerCase();
 
-    </script>
+       </script>
 
-    <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
+       <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
 
-    <script language="javascript" type="text/javascript">
-        dojo.require("dijit._Calendar");
-        dojo.require("dijit.form.DateTextBox");
-        dojo.require("dojo.date.locale");
-        dojo.require("dojo.date.stamp");
-        dojo.require("dojo.parser");
-        dojo.require("openils.I18N");
-        dojo.require("dijit.form.FilteringSelect");
-    </script>
+       <script language="javascript" type="text/javascript">
+               dojo.addOnLoad(init);
+               dojo.require("dijit._Calendar");
+               dojo.require("dijit.form.DateTextBox");
+               dojo.require("dijit.form.FilteringSelect");
+               dojo.require("dojo.date.locale");
+               dojo.require("dojo.date.stamp");
+               dojo.require("dojo.parser");
+               dojo.require("openils.I18N");
+       </script>
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
index 16c3738..7bc4784 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
+++ b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
@@ -1,4 +1,4 @@
-<body class="tundra" onload='init(); getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED})); getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));'>
+<body class="tundra">
 
        <noscript>
                <style type="text/css">#toptable { display: none; }</style>
@@ -23,15 +23,16 @@
        </table>
        <script language='javascript' type='text/javascript'>isFrontPage = true;</script>
        <script language="javascript" type='text/javascript'>
-        try { 
-            document.getElementById('toptable').style.display = 'table'; 
-        } catch(e) {
-            try {
-                document.getElementById('toptable').style.display = ''; 
-            } catch(ee) {}
-        }
-    </script>
-               <!--#include virtual='../footer.xml'-->
+               dojo.addOnLoad(home_init);
+               try { 
+                       document.getElementById('toptable').style.display = 'table'; 
+               } catch(e) {
+                       try {
+                               document.getElementById('toptable').style.display = ''; 
+                       } catch(ee) {}
+               }
+       </script>
+       <!--#include virtual='../footer.xml'-->
 </body>
 
 
Evergreen ILS