more google frame cleanup; load cookie early on; removed the long-unused rdetail...

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 b833bec..0827797 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
@@ -33,6 +33,7 @@
     dojo.require("dojo.date.locale");
     dojo.require("dojo.date.stamp");
     dojo.require("dojo.parser");
+    dojo.require("dojo.cookie");
     dojo.require("openils.widget.FacetSidebar"); // pulls in Searcher and I18N
 
     function skin_init() {

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 25306f0..a81a72d 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
@@ -24,25 +24,11 @@
        <!--#include virtual='../footer.xml'-->
     <center>
         <div id='gcfPrompt' class='hide_me'>
-            <script>dojo.require('dojo.cookie')</script>;
             <div><span>&common.googlechromeframe.why;</span></div>
             <button onclick='CFInstall.check({preventPrompt: false, mode: "popup"});'>&common.googlechromeframe.install;</button>
             <button onclick='dojo.cookie("noGCF", "true", {path:"/", expires: 365}); hideMe($("gcfPrompt"));'>&common.googlechromeframe.dontask;</button>
         </div>
     </center>
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
-    <script><![CDATA[ 
-        dojo.addOnLoad(function() {
-            CFInstall.check({
-                preventPrompt: true,
-                onmissing: function() {
-                    if (dojo.cookie("noGCF") != "true")
-                        unHideMe($('gcfPrompt'));
-                }
-            });
-        });
-        ]]>
-    </script>
 
     <!--#include virtual='../common/js_common_postbody.xml'-->
 </body>

diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
deleted file mode 100644 (file)
index ff17d17..0000000
--- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<!-- record details alternate canvases -->
-<div class=''>
-
-       <!--
-       <script language='javascript' type='text/javascript'>
-               config.ids.rdetail.view_marc_div = 'view_marc_div';
-               config.ids.altcanvas.view_marc_div = config.ids.rdetail.view_marc_div; 
-               config.ids.rdetail.hide_marc = "rdetail_hide_marc";
-               config.ids.rdetail.view_marc_box = "rdetail_view_marc_box";
-       </script>
-
-       <div class='hide_me canvas' id='view_marc_div'> 
-               <div>
-                       <table width='100%'><tbody><tr>
-                               <td class='color_1' align='left' style='padding-left: 7px;text-decoration: underline;'>
-                                       <a href="javascript:void(0);" id='rdetail_hide_marc'>&rdetail.detailMain.hideMarc;</a>
-                               </td>
-                       </tr></tbody></table>
-               </div>
-               <br/>
-               <div id='rdetail_view_marc_box'> </div>
-               <br/><br/>
-       </div>
-       -->
-       
-</div>
-