first blind attempt at myopac

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 5f6ddd2..c4e6918 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -151,6 +151,10 @@
         config.ids.login.cancel        = "login_cancel_button";
         config.ids.altcanvas.login            = config.ids.login.box;
 
+        config.ids.altcanvas.myopac_reload = 'myopac_reloading';
+        config.ids.myopac = {};
+        config.css.myopac = {};
+        config.names.myopac = {};
 
         <!--#if expr="$OILS_PAGE='rresult.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar_extras.js');
@@ -214,6 +218,17 @@
 
         <!--#endif--> <!-- if rdetail.xml -->
 
+
+        <!--#if expr="$OILS_PAGE='myopac.xml'"-->
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js');
+        openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js');
+
+        $('myopac_holds_actions_none').selected = true;
+
+        <!--#endif-->
+
+
         <!--#if expr="$OILS_PAGE='advanced.xml'"-->
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js');
         openils.Util.requireLegacy('<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js');

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
index d4c6d3f..881f5e4 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_bookbags.xml
@@ -1,8 +1,6 @@
 
 <div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
-
        <div id='myopac_delete_bookbag_warn' class='hide_me'>
                &myopac.delete.bookbag;
        </div>

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
index 5d00be1..8fbe700 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
@@ -1,13 +1,9 @@
 
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-    <!--
-       <script language='javascript' type='text/javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
-    -->
-
    <table width='100%'><tbody>
       <tr>
-         <td aligh='left' class='data_grid'>
+         <td align='left' class='data_grid'>
                <!--
                Total items out: <b id='mo_items_out_count' style='padding-right: 20px;'>0</b>
                -->

diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
index 4d5b46d..4696b83 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
@@ -1,8 +1,6 @@
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
-
        <table width='100%'>
         <tbody><tr><td width='100%' align='right'>
             <select id='myopac_holds_actions' onchange='myopacDoHoldAction();'>
@@ -13,7 +11,6 @@
                 <option value='cancel'>&myopac.holds.cancel_selected;</option>
             </select>
         </td></tr></tbody>
-        <script language='javascript' type='text/javascript'>$('myopac_holds_actions_none').selected = true;</script>
     </table>
 
     <span id='myopac.holds.cancel.confirm' class='hide_me'>&myopac.holds.cancel.confirm;</span>

diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
index e7d86ac..1a58225 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
+++ b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
@@ -1,16 +1,7 @@
 <div id='canvas_main' class='canvas hide_me'>
 
-       <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js'></script>
-
-       <script language='javascript' type='text/javascript'> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
        <div id='myopac_reloading' class='hide_me canvas'> &common.loading; </div>
 
-       <script language='javascript' type='text/javascript'>
-               config.ids.myopac = {};
-               config.css.myopac = {};
-               config.names.myopac = {};
-       </script>
-
        <br/>
        <table style='width: 98%; text-align: center;'>
                <tbody>