[gatein-commits] gatein SVN: r1654 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace.

[do-not-reply at jboss.org]

Author: mwringe
Date: 2010-02-11 23:08:07 -0500 (Thu, 11 Feb 2010)
New Revision: 1654

Modified:
   portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
   portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl
Log:
Move the javascript to the UIPortalApplicationChildren since it needs to be at the end of the page for the javascript to work properly.

Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl	2010-02-12 03:35:04 UTC (rev 1653)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplication.gtmpl	2010-02-12 04:08:07 UTC (rev 1654)
@@ -106,12 +106,6 @@
       rcontext.getJavascriptManager().addOnLoadJavascript('eXo.core.DOMUtil.hideElements');
       //rcontext.getJavascriptManager().addOnResizeJavascript('eXo.core.UIMaskLayer.resizeMaskLayer');
     %>
-   <script type="text/javascript">
-      <%=rcontext.getJavascriptManager().getJavascript()%>
-        eXo.core.Browser.onLoad();
-      <%=rcontext.getJavascriptManager().getCustomizedOnLoadScript();%>
-      <%if(canKeepState && uicomponent.isSessionOpen) {%> eXo.session.itvInit() ;<%}%>
-    </script>
  
 	<div class="$uicomponent.skin" id="UIPortalApplication" style="!height: 100%;">
     	

Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl	2010-02-12 03:35:04 UTC (rev 1653)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/workspace/UIPortalApplicationChildren.gtmpl	2010-02-12 04:08:07 UTC (rev 1654)
@@ -1,4 +1,34 @@
+<%
+  import org.exoplatform.portal.application.PortalRequestContext ;
+        import org.exoplatform.webui.core.UIComponent;
+        import java.util.Iterator;
+        import org.exoplatform.portal.webui.portal.UIPortal ;
+        import org.exoplatform.portal.config.model.PortalProperties ;
+
+  def rcontext = _ctx.getRequestContext() ;
+  String docBase =  rcontext.getRequestContextPath() ;
+  String skin = uicomponent.getSkin();
+  def portalSkins = uicomponent.getPortalSkins() ;
+  def portletSkins = uicomponent.getPortletSkins() ;
+  def scriptsPaths = uicomponent.getJavascriptURLs();
+  def lang = uicomponent.getLocale().getLanguage();
+  def title = rcontext.getTitle();
+  def metaInformation = rcontext.getMetaInformation();
+%>
+
+      <% 
+        UIPortal portal = uicomponent.findFirstComponentOfType(UIPortal.class);
+        String sessionAliveLevel = (portal == null ? null : portal.sessionAlive) ;
+        boolean canKeepState = sessionAliveLevel == null ? false : !sessionAliveLevel.equals(PortalProperties.SESSION_NEVER) ;
+      %>
+
           <%uicomponent.renderChildren();%>
         </div>
+        <script type="text/javascript">
+      <%=rcontext.getJavascriptManager().getJavascript()%>
+        eXo.core.Browser.onLoad();
+      <%=rcontext.getJavascriptManager().getCustomizedOnLoadScript();%>
+      <%if(canKeepState && uicomponent.isSessionOpen) {%> eXo.session.itvInit() ;<%}%>
+    </script>
   </body>
 </html>