Author: cmailleux
Date: Mon Sep 24 17:16:58 2007
New Revision: 792
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D792&repname=
=3Dcorporate_portal_templates_v2
Log:
Remove fragment or redistribute them
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/double.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/top.inc&rev=3D792&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/top.inc Mon Sep 24 17:16:58=
2007
@@ -34,7 +34,7 @@
var chatOnline =3D "<%=3Dchatstatus%>";//default state of the chat
var currentUserKey =3D "<%=3Duser.getUserKey()%>";//our userkey
</script>
-<jesi:fragment aclGroup=3D"true">
+<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<%
=
if (contentPage.getPageTemplate(entryLoadRequest).getSourcePath().indexOf(=
"webdav") !=3D -1 ) {
@@ -289,7 +289,7 @@
<%@ include file=3D"/jsp/jahia/topbar/topmenu.inc"%>
</div>
<% } %>
-</jesi:fragment>
+</jesi:fragment> =
=
<jesi:codeblock execute=3D"template" onerror=3D"ignore">
=
@@ -318,7 +318,6 @@
<div id=3D"toplinks"><%@ include file=3D"/jsp/jahia/topbar/operationbutton=
s.inc"%></div>
</jesi:fragment>
=
-<jesi:fragment aclGroup=3D"true">
<div id=3D"header">
<div id=3D"logo">
<logic:present name=3D"logo">
@@ -354,6 +353,7 @@
<%@ include file=3D"topmenu.inc" %>
</div>
</div>
+
<div id=3D"pagebody">
<%
if (! isFullScreen) {
@@ -410,4 +410,4 @@
<div id=3D"content" <%if (isFullScreen) {%> style=3D"width: 984px;"<%}=
%> >
<jsp:include page=3D"splash/splash.jsp" flush=3D"true"/>
<%if (isFullScreen) {%> </div><%}%>
-</jesi:fragment>
+
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/double.jsp&rev=3D792&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/double.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/double.jsp Mon Sep 24 17:16:58 2007
@@ -22,17 +22,13 @@
</div>
<div class=3D"leftcol">
<jsp:include page=3D"common/pagetitle.jsp" flush=3D"true"/>
- <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"common/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"leftcol"/>
</jsp:include>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"leftcol"/>
<jsp:param name=3D"displayDetails" value=3D"true"/>
</jsp:include>
- </jesi:fragment>
</div>
<div class=3D"rightcol">
<logic:equal name=3D"currentRequest" property=3D"logged" value=3D"fals=
e">
@@ -58,17 +54,13 @@
</div>
</div>
</logic:equal>
- <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"common/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"rightcol"/>
</jsp:include>
- </jesi:fragment>
- <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"box/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"rightcol"/>
<jsp:param name=3D"displayDetails" value=3D"false"/>
</jsp:include>
- </jesi:fragment>
</div>
<%@ include file=3D"common/bottom.inc"%>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
