Author: cmailleux
Date: Wed Oct 3 15:25:56 2007
New Revision: 801
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D801&repname=
=3Dcorporate_portal_templates_v2
Log:
Rollback changes made for container cache
This changes are still available in branch 5.1 of templates
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/site_settings.inc
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/box/dav.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/dav.inc&rev=3D801&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/box/dav.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/dav.inc Wed Oct 3 15:25:56 20=
07
@@ -23,7 +23,7 @@
boolean displaySubDir =3D true;
%>
<content:containerList name=3D'<%=3D"davContainerList" + id%>' id=3D"davCo=
ntainerList">
- <content:container id=3D"davContainer" cache=3D"false">
+ <content:container id=3D"davContainer">
<content:sharedLangTextField name=3D'mountPoint' id=3D"mountPo=
intBean"
defaultValue=3D"" display=3D"false" valueId=3D"mountPointValue=
"/>
<content:booleanField name=3D'displaySubDir' defaultValue=3D"t=
rue" display=3D"false" valueId=3D"displaySubDirValue"/>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/groupsContainer.inc&rev=3D801&repname=3Dcorporate_porta=
l_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/box/groupsContainer.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc Wed Oct 3=
15:25:56 2007
@@ -14,11 +14,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%
- //remove cache on this datas
- ContainerTag.disableCache(pageContext);
-
-
+--%>
+<%
JahiaContainerList gcontlist =3D jData.containers().getContainerList("=
groupsContainer" + id);
JahiaContainer thegboxcontainer =3D null;
if (gcontlist.getFullSize() =3D=3D 0) {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/savedsearch.inc&rev=3D801&repname=3Dcorporate_portal_te=
mplates_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/box/savedsearch.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc Wed Oct 3 15:=
25:56 2007
@@ -16,7 +16,7 @@
limitations under the License.
--%><bean:parameter id=3D"displayDetails" name=3D"displayDetails" value=3D=
"false"/>
<content:containerList name=3D'<%=3D"savedSearch" + id%>' id=3D"savedSearc=
h" parentContainerName=3D"boxContainer">
- <content:container id=3D"savedSearchContainer" cache=3D"off">
+ <content:container id=3D"savedSearchContainer">
<jahiaHtml:actionMenu name=3D"savedSearchContainer" namePostFix=3D=
".savedSearch"
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"
useFieldSet=3D"true">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/usersContainer.inc&rev=3D801&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/box/usersContainer.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc Wed Oct 3 =
15:25:56 2007
@@ -1,4 +1,4 @@
-<%@ page import=3D"org.jahia.taglibs.container.ContainerTag" %><%--
+<%--
Copyright 2002-2006 Jahia Ltd
=
Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
@@ -14,9 +14,8 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><%
- //remove cache on this datas
- ContainerTag.disableCache(pageContext);
+--%>
+<%
JahiaContainerList ucontlist =3D jData.containers().getContainerList("=
usersContainer" + id);
JahiaContainer theuboxcontainer =3D null;
if (ucontlist.getFullSize() =3D=3D 0) {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/site_settings.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/site_settings.inc&rev=3D801&repname=3Dcorporate_port=
al_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/common/site_settings.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/site_settings.inc Wed Oct =
3 15:25:56 2007
@@ -108,7 +108,7 @@
<bean:define id=3D"isSiteSettingAvaliable" value=3D"false" scope=3D"reques=
t"/>
=
<content:absoluteContainerList id=3D"siteSettingsList" name=3D"siteSetting=
s" pageLevel=3D"1">
- <content:container id=3D"siteSettings" cache=3D"off">
+ <content:container id=3D"siteSettings">
<content:textField valueId=3D"footerText" name=3D"footerText" diff=
Active=3D"true" display=3D"false" defaultValue=3D""/>
<logic:present name=3D"siteSettings" property=3D"field(logo)">
<bean:define id=3D"logo" name=3D"siteSettings" property=3D"fie=
ld(logo).object"/>
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=3D801&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 Wed Oct 3 15:25:56=
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" alwaysInvalidate=3D"true">
+<jesi:fragment aclGroup=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,6 +318,7 @@
<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">
@@ -353,7 +354,6 @@
<%@ 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=3D801&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 Wed Oct 3 15:25:56 2007
@@ -22,13 +22,17 @@
</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">
@@ -54,13 +58,17 @@
</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
