Author: pvollenweider
Date: Fri Oct 19 10:35:03 2007
New Revision: 1259
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1259&repname=
=3Dcorporate_portal_templates
Log:
Sync JAHIA-5-1-SP-BRANCH with JAHIA-5-0-SP-BRANCH
Modified:
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/advsearchresult.jsp
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_declarations.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_news.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_webapps.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/declarations.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/top_banner.inc
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/news_list.jsp
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/searchresult.jsp
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/sitemap.jsp
branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/template_css.jsp
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/advsearchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/advsearchresult.jsp&rev=3D1259&repname=3Dcorporate_por=
tal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/advsearchresult.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/advsearchresult.jsp Fri Oct 1=
9 10:35:03 2007
@@ -18,13 +18,13 @@
<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
<%-- Don't cache the engines with ESI: --%>
-<jesi:control cache=3D"no"/>
+<jesi:template aclGroup=3D"true" >
=
<%@ include file=3D"include/header.inc"%>
=
<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
-
+<jesi:fragment cache=3D"no">
<%@ page import=3D"org.jahia.data.search.*" %>
<%@ page import=3D"org.jahia.engines.search.*" %>
<%@ page import=3D"org.jahia.services.search.*" %>
@@ -278,4 +278,6 @@
<% } %>
</div>
<br/>
+</jesi:fragment>
<%@ include file=3D"include/footer.inc"%>
+</jesi:template>
\ No newline at end of file
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_declaration=
s.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/box_declarations.inc&rev=3D1259&repname=3Dcorp=
orate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/box_declarations.inc =
(original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_declarations.inc =
Fri Oct 19 10:35:03 2007
@@ -246,7 +246,7 @@
bundleKey=3D"<%=3DresBundleID%>"
type=3D"Date"
aliasNames=3D"boxNewDate"
- value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>"
+ value=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]=
>"
/>
<content:declareField name=3D'newsEndDate'
title=3D"End date"
@@ -254,7 +254,7 @@
bundleKey=3D"<%=3DresBundleID%>"
type=3D"Date"
aliasNames=3D"boxNewEndDate"
- value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>"
+ value=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]=
>"
/>
</content:declareContainer>
</content:declareContainerList>
@@ -290,14 +290,14 @@
titleKey=3D"startDate"
bundleKey=3D"<%=3DresBundleID%>"
type=3D"Date"
- value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>"
+ value=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]=
>"
/>
<content:declareField name=3D'newsEndDate_Last5'
title=3D"End date"
titleKey=3D"endDate"
bundleKey=3D"<%=3DresBundleID%>"
type=3D"Date"
- value=3D"<jahia_calendar[dd.MM.yyyy / hh:mm]=
>"
+ value=3D"<jahia_calendar[dd.MM.yyyy / HH:mm]=
>"
/>
</content:declareContainer>
=
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_news.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/box_news.inc&rev=3D1259&repname=3Dcorporate_po=
rtal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/box_news.inc (origina=
l)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_news.inc Fri Oct =
19 10:35:03 2007
@@ -1,3 +1,36 @@
+<%@ page import=3D"org.jahia.bin.Jahia" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerBean" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerListBean" %>
+<%@ page import=3D"org.jahia.data.beans.PageBean" %>
+<%@ page import=3D"org.jahia.data.containers.JahiaContainer" %>
+<%@ page import=3D"org.jahia.data.containers.JahiaContainerDefinition" %>
+<%@ page import=3D"org.jahia.data.containers.JahiaContainerList" %>
+<%@ page import=3D"org.jahia.data.fields.FieldTypes" %>
+<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
+<%@ page import=3D"org.jahia.exceptions.JahiaException" %>
+<%@ page import=3D"org.jahia.gui.GuiBean" %>
+<%@ page import=3D"org.jahia.layout.PortletBean" %>
+<%@ page import=3D"org.jahia.layout.PortletBeanSet" %>
+<%@ page import=3D"org.jahia.layout.PortletBeanSpanningGrid" %>
+<%@ page import=3D"org.jahia.layout.PortletSetPersistanceManager" %>
+<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.resourcebundle.ResourceBundleMarker" %>
+<%@ page import=3D"org.jahia.services.categories.Category" %>
+<%@ page import=3D"org.jahia.services.containers.ContentContainer" %>
+<%@ page import=3D"org.jahia.services.containers.ContentContainerList" %>
+<%@ page import=3D"org.jahia.services.fields.ContentPageField" %>
+<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
+<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
+<%@ page import=3D"org.jahia.services.version.EntryLoadRequest" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiConst" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiFragmentTag" %>
+<%@ page import=3D"java.lang.Integer" %>
+<%@ page import=3D"java.lang.Long" %>
+<%@ page import=3D"java.lang.NumberFormatException" %>
+<%@ page import=3D"java.lang.Object" %>
+<%@ page import=3D"java.lang.String" %>
+<%@ page import=3D"java.lang.System" %>
+<%@ page import=3D"java.util.*" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -15,7 +48,14 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
-JahiaContainerList newsContainerList =3D theContainer.getContainerList( "n=
ewsContainer" + id);
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("900");
+ }
+ %>
+<content:containerList name=3D'<%=3D"newsContainer" + id%>' id=3D"newsCont=
ainerList" parentContainerName=3D"boxContainer"/>
+<%
+JahiaContainerList newsContainerList =3D ((ContainerListBean) pageContext.=
getAttribute("newsContainerList")).getJahiaContainerList();
Enumeration newsEnumeration =3D newsContainerList.getContainers();
long cacheExpirationDelay =3D Long.MAX_VALUE;
int newsCount =3D 0;
@@ -94,7 +134,7 @@
if (newsCount =3D=3D 0){
%><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_p=
ortal_templates" resourceName=3D"noNews"/><br/><%
}
-
-ContainerListBean newsContainerListBean =3D new ContainerListBean(newsCont=
ainerList,jData.params());
-jData.gui().html().drawBeginActionMenu(newsContainerListBean , null, theUR=
L + "/images/add.gif", false, "", "jahiatemplates.Corporate_portal_template=
s", "addNew", out);
%>
+<jahiaHtml:actionMenu name=3D"newsContainerList" namePostFix=3D"" resource=
Bundle=3D"jahiatemplates.Corporate_portal_templates"
+ useFieldSet=3D"false" actionIcon=3D'<%=3DtheURL + "/images/add.gif"%>'=
labelKey=3D"addNew">
+</jahiaHtml:actionMenu>
\ No newline at end of file
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5.i=
nc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/box_newslast5.inc&rev=3D1259&repname=3Dcorpora=
te_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/box_newslast5.inc (or=
iginal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5.inc Fri=
Oct 19 10:35:03 2007
@@ -42,6 +42,10 @@
<%@ page import=3D"org.apache.taglibs.cache.*" %>
=
<%
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("900");
+ }
//We first need to retrieve all elements forming the cache entry key
//(which are also used in box_newslast5.inc)
=
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5_c=
ached.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/box_newslast5_cached.inc&rev=3D1259&repname=3D=
corporate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc Fri Oct 19 10:35:03 2007
@@ -351,9 +351,6 @@
if (newsCount =3D=3D0){
%><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_p=
ortal_templates" resourceName=3D"noNews"/><br/><%
}
-ContainerListBean newsContainerListBean =3D new ContainerListBean(newsCont=
ainerList,jData.params());
-//jData.gui().html().drawBeginActionMenu(newsContainerListBean , null, the=
URL + "/images/add.gif", false, "", "jahiatemplates.Corporate_portal_templa=
tes", "addNew", out);
-
//------------------------------------------------------------------------=
----------------------------------------------
// END - DISPLAY NEWS E=
NTRIES
//------------------------------------------------------------------------=
----------------------------------------------
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/box_webapps.inc&rev=3D1259&repname=3Dcorporate=
_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/box_webapps.inc (orig=
inal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/box_webapps.inc Fri O=
ct 19 10:35:03 2007
@@ -14,7 +14,13 @@
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.
---%><content:containerList name=3D'<%=3D"webappsContainer" + id%>' id=3D"w=
ebappsContainerList" parentContainerName=3D"boxContainer">
+--%><%
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("0");
+ }
+ %>
+<content:containerList name=3D'<%=3D"webappsContainer" + id%>' id=3D"webap=
psContainerList" parentContainerName=3D"boxContainer">
<content:container cache=3D"false">
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<logic:present name=3D"webapp" property=3D"object">
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/declarations.inc&rev=3D1259&repname=3Dcorporat=
e_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/declarations.inc (ori=
ginal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/declarations.inc Fri =
Oct 19 10:35:03 2007
@@ -345,7 +345,7 @@
=
int linkPID =3D -1;
StringBuffer fullPath =3D new StringBuffer();
- JahiaPage aPage;
+ ContentPage aPage;
int count =3D 0;
if (link.getPageType() =3D=3D 0) {
linkPID =3D link.getID();
@@ -354,14 +354,14 @@
}
if (linkPID !=3D -1){
ContentPage contentPage =3D ContentPage.getPage(linkPID);
- Enumeration thePath =3D contentPage.getPagePath(jData.params().ge=
tEntryLoadRequest(),
+ Enumeration thePath =3D contentPage.getContentPagePath(jData.para=
ms().getEntryLoadRequest(),
jData.params().getOperationMode(),
- jData.params().getUser());
+ jData.params().getUser(),
JahiaPageService.PAGEPATH_BREAK_ON=
_RESTRICTED);
if ((thePath.hasMoreElements()) && (skipHome)){
thePath.nextElement();// skip home page
}
while (thePath.hasMoreElements()) {
- aPage =3D (JahiaPage) thePath.nextElement();
+ aPage =3D (ContentPage) thePath.nextElement();
if (aPage !=3D null) {
count++;
if (count > 1){
@@ -370,7 +370,7 @@
fullPath.append("<a href=3D\"");
fullPath.append(aPage.getURL(jData.params()));
fullPath.append("\">");
- fullPath.append(aPage.getTitle());
+ fullPath.append(aPage.getTitle(jData.params()));
fullPath.append("</a>");
}
}
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/top_banner.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/include/top_banner.inc&rev=3D1259&repname=3Dcorporate_=
portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/include/top_banner.inc (origi=
nal)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/include/top_banner.inc Fri Oc=
t 19 10:35:03 2007
@@ -30,7 +30,7 @@
%><table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" b=
order=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable"><%
if (jData.gui().isLogged()) {
%><tr><td>
- <jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
+ <jesi:fragment aclGroup=3D"true">
<%@ include file=3D"admin_menu.inc"%>
</jesi:fragment>
</td></tr><%
@@ -38,10 +38,11 @@
}
=
%>
-
+<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<% if (!thePrint) { %>
<tr>
<td>
+
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpaddi=
ng=3D"0">
<tr>
<td rowspan=3D"4" class=3D"adminmenu">
@@ -106,7 +107,6 @@
<%
}
%>
-
<table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" border=
=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable">
<%
if (!thePrint) {
@@ -138,7 +138,6 @@
}
}
%>
-<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<logic:equal name=3D"currentPage" property=3D"homePage" value=3D"false">
<tr>
<td class=3D"path" colspan=3D"2"><%
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/news_list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/news_list.jsp&rev=3D1259&repname=3Dcorporate_portal_te=
mplates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/news_list.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/news_list.jsp Fri Oct 19 10:3=
5:03 2007
@@ -28,7 +28,7 @@
</jesi:fragment>
<% if (!thePrint && hasLeft !=3D 0) { %><td class=3D"verticaleline"><i=
mg src=3D"<content:contextURL/>/images/pix.gif" width=3D"25" height=3D"12" =
alt=3D""/></td><% } %>
<td valign=3D"top" width=3D"100%">
- <jesi:fragment aclGroup=3D"true">
+ <jesi:fragment aclGroup=3D"true" expiration=3D"900">
<h1><%@ include file=3D"include/page_title_ctn.inc"%></h1>
<%@ include file=3D"include/news_list.inc"%>
</jesi:fragment>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/searchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/searchresult.jsp&rev=3D1259&repname=3Dcorporate_portal=
_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/searchresult.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/searchresult.jsp Fri Oct 19 1=
0:35:03 2007
@@ -17,13 +17,13 @@
--%><%-- TODO: We are not currently caching the engines with ESI, do it. -=
-%>
<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
<%-- Don't cache the engines with ESI: --%>
-<jesi:control cache=3D"no"/>
+<jesi:template aclGroup=3D"true" >
=
<%@ include file=3D"include/header.inc"%>
=
<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
-
+<jesi:fragment cache=3D"no">
<%@ page import=3D"org.jahia.data.search.*" %>
<%@ page import=3D"org.jahia.engines.search.*" %>
<%@ page import=3D"org.jahia.services.search.*" %>
@@ -546,5 +546,6 @@
</pg:pager>
=
</div>
-
+</jesi:fragment>
<%@ include file=3D"include/footer.inc"%>
+</jesi:template>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/sitemap.jsp&rev=3D1259&repname=3Dcorporate_portal_temp=
lates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/sitemap.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/sitemap.jsp Fri Oct 19 10:35:=
03 2007
@@ -15,16 +15,13 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude"%>
-<%-- TODO: We are not currently caching the engines with ESI, do it. --%>
<%@ taglib uri=3D"/WEB-INF/tld/jesi-tags" prefix=3D"jesi" %>
-<%-- Don't cache the engines with ESI: --%>
-<jesi:control cache=3D"no"/>
+<jesi:template aclGroup=3D"true" >
=
<%@ include file=3D"include/header.inc"%>
=
-<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
-
+<jesi:fragment cache=3D"no">
=
<%
final String title =3D JahiaResourceBundle.
@@ -49,4 +46,6 @@
</td>
</tr>
</table>
+</jesi:fragment>
<%@ include file=3D"include/footer.inc" %>
+</jesi:template>
Modified: branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/template_css.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-1-SP=
-BRANCH/src/view/jsp/template_css.jsp&rev=3D1259&repname=3Dcorporate_portal=
_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-1-SP-BRANCH/src/view/jsp/template_css.jsp (original)
+++ branches/JAHIA-5-1-SP-BRANCH/src/view/jsp/template_css.jsp Fri Oct 19 1=
0:35:03 2007
@@ -14,25 +14,23 @@
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.
---%><%@ page language=3D"java" contentType=3D"text/css" %><%@ taglib uri=
=3D"contentLib" prefix=3D"content" %><%@ include file=3D"include/colors_dec=
laration.inc"%><%
- org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger(g=
etClass());
+--%><%@ page language=3D"java" contentType=3D"text/css" %><%@ include file=
=3D"include/colors_declaration.inc"%><%
+// org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger=
(getClass());
=
org.jahia.settings.SettingsBean siteSetting =3D org.jahia.bin.Jahia.ge=
tSettings();
- if (siteSetting !=3D null) {
- if (siteSetting.isDevelopmentMode()) {
- logger.debug("We are in dev mode -> Disable browser cache for temp=
late_css.jsp");
- response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
+if (siteSetting !=3D null && siteSetting.isDevelopmentMode()) {
+ response.setHeader("Cache-Control","no-store, no-cache, must-revalidat=
e, max-age=3D0"); //HTTP 1.1
+ response.addHeader("Cache-Control","post-check=3D0, pre-check=3D0");
response.setHeader("Pragma","no-cache"); //HTTP 1.0
response.setDateHeader ("Expires", -1);
} else {
- logger.debug("We are in production mode -> Set browser cache for t=
emplate_css.jsp to 1 hour");
- long now =3D System.currentTimeMillis();
- response.setDateHeader("Expires", now + 3600000); // 1 hour
- response.addHeader("Cache-Control", "max-age=3D3600");
- }
- }
- logger.debug("Opening template_css.jsp");
- String theURL =3D request.getContextPath() + request.getServletPath() =
+ "/..";
+ response.setHeader("Cache-Control", "public, max-age=3D604800, post-ch=
eck=3D7200, pre-check=3D604800");
+ response.setHeader("Pragma", "");
+ response.setDateHeader("Expires", System.currentTimeMillis() + 604800 =
* 1000); // 7 days
+ }
+// logger.debug("Opening template_css.jsp");
+ String ctx =3D request.getContextPath();
+ String theURL =3D ctx + request.getServletPath() + "/..";
=
// COLORSET (SKINS)
String colorSet=3D(String) request.getParameter("colorSet");
@@ -1294,19 +1292,19 @@
=
table.searchResultListing th.sortable a {
padding-right: 5px;
- background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/=
images/arrow_off.png);
+ background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_of=
f.png);
background-repeat:no-repeat;
}
=
table.searchResultListing th.order1 a {
padding-right: 5px;
- background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/=
images/arrow_down.png);
+ background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_do=
wn.png);
background-repeat:no-repeat;
}
=
table.searchResultListing th.order2 a {
padding-right: 5px;
- background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/=
images/arrow_up.png);
+ background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_up=
.png);
background-repeat:no-repeat;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
