[open-ils-commits] r18883 - branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-11-30 15:35:09 -0500 (Tue, 30 Nov 2010)
New Revision: 18883

Modified:
   branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
Log:
Enable GET params to be added properly in buildOPACLink()

Symptom was that the "?l=#" parameter wasn't being added to the
home screen "Advanced Search" link. Cause was that the
dojo.addOnLoad(init) call was being made after the
dojo.addOnLoad(home_init) call, which depended on globals being
set by init(). This started happening when the JavaScript was
shifted around in an attempt to kill the white screen of death.

There may be other similar issues in other interfaces; keep
your eyes open!


Modified: branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
===================================================================
--- branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml	2010-11-30 20:12:06 UTC (rev 18882)
+++ branches/rel_2_0/Open-ILS/web/opac/skin/default/xml/home/index_body.xml	2010-11-30 20:35:09 UTC (rev 18883)
@@ -21,17 +21,6 @@
 			</tr>
 		</tbody>
 	</table>
-	<script language='javascript' type='text/javascript'>isFrontPage = true;</script>
-	<script language="javascript" type='text/javascript'>
-		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'-->
     <center>
         <div id='gcfPrompt' class='hide_me'>
@@ -53,7 +42,18 @@
     </script>
 
     <script language="javascript" type="text/javascript">
+        isFrontPage = true;
         dojo.addOnLoad(init);
+        dojo.addOnLoad(home_init);
+
+        try { 
+            dojo.style(dojo.byId('toptable'), 'display', 'table'); 
+        } catch(e) {
+            try {
+                dojo.style(dojo.byId('toptable'), 'display', ''); 
+            } catch(ee) {}
+        }
+
         dojo.require("dijit._Calendar");
         dojo.require("dijit.form.DateTextBox");
         dojo.require("dijit.form.FilteringSelect");