Author: cmailleux
Date: Wed Oct 10 16:09:11 2007
New Revision: 1251
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1251&repname=
=3Dcorporate_portal_templates
Log:
Add some expiration for news (15minutes) and webapps (0s) correct a bug in=
advancedsearch
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/advsearchresult.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_news.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/news_list.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/searchresult.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple_form_generator.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/sitemap.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/advsearchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/advsearchresult.jsp&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/advsearchresult.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/advsearchresult.jsp Wed Oct 1=
0 16:09:11 2007
@@ -21,8 +21,6 @@
<jesi:control cache=3D"no"/>
=
<%@ include file=3D"include/header.inc"%>
-
-<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
=
<%@ page import=3D"org.jahia.data.search.*" %>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/home.jsp&rev=3D1251&repname=3Dcorporate_portal_templat=
es
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/view/jsp/home.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp Wed Oct 10 16:09:11 =
2007
@@ -45,32 +45,38 @@
<br/>
</jesi:fragment>
=
-<jesi:fragment aclGroup=3D"true">
+
<table width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
<td valign=3D"top" width=3D"33%">
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"1"/>
<jsp:param name=3D"displayDetails" value=3D"false"/>
</jsp:include>
+ </jesi:fragment>
</td>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"12" hei=
ght=3D"12" alt=3D""/></td>
<td valign=3D"top" width=3D"33%">
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"2"/>
</jsp:include>
+ </jesi:fragment>
</td>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"12" hei=
ght=3D"12" alt=3D""/></td>
<td valign=3D"top" width=3D"33%">
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"3"/>
</jsp:include>
+ </jesi:fragment>
</td>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
</tr>
</table>
-</jesi:fragment>
+
=
=
<jesi:fragment absolute=3D"true" group=3D'<%=3D"footer_TemplateId_"+jDat=
a.page().getPageTemplateID()%>' > =
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_declaration=
s.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_declarations.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/box_declarations.inc =
(original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_declarations.inc =
Wed Oct 10 16:09:11 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-0-SP-BRANCH/src/view/jsp/include/box_news.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_news.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/box_news.inc (origina=
l)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_news.inc Wed Oct =
10 16:09:11 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-0-SP-BRANCH/src/view/jsp/include/box_newslast5.i=
nc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_newslast5.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/box_newslast5.inc (or=
iginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5.inc Wed=
Oct 10 16:09:11 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-0-SP-BRANCH/src/view/jsp/include/box_newslast5_c=
ached.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_newslast5_cached.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_newslast5_cached.=
inc Wed Oct 10 16:09:11 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-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_webapps.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc (orig=
inal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc Wed O=
ct 10 16:09:11 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>
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<logic:present name=3D"webapp" property=3D"object">
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/top_banner.inc&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/include/top_banner.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc Wed Oc=
t 10 16:09:11 2007
@@ -18,19 +18,11 @@
--%>
=
<%
-
- //check if this ESI fragment operation should be ignored
- String doNotCache =3D (String) request.getAttribute("ignore_fragment_i=
n_top_header.inc");
- String ignoreFragmentTag =3D "no";
- if (doNotCache!=3Dnull) {
- ignoreFragmentTag =3D "yes";
- }
-
if (!thePrint) {
%><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" ignore=3D"<%=3DignoreFragmentTag%>" >
+ <jesi:fragment aclGroup=3D"true">
<%@ include file=3D"admin_menu.inc"%>
</jesi:fragment>
</td></tr><%
@@ -38,7 +30,7 @@
}
=
%>
-<jesi:fragment aclGroup=3D"true" ignore=3D"<%=3DignoreFragmentTag%>" >
+<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<% if (!thePrint) { %>
<tr>
<td>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/news_list.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/news_list.jsp&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/news_list.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/news_list.jsp Wed Oct 10 16:0=
9:11 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-0-SP-BRANCH/src/view/jsp/searchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/searchresult.jsp&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/searchresult.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/searchresult.jsp Wed Oct 10 1=
6:09:11 2007
@@ -20,8 +20,6 @@
<jesi:control cache=3D"no"/>
=
<%@ include file=3D"include/header.inc"%>
-
-<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
=
<%@ page import=3D"org.jahia.data.search.*" %>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple_form_generator.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/simple_form_generator.jsp&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/simple_form_generator.jsp (or=
iginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple_form_generator.jsp Wed=
Oct 10 16:09:11 2007
@@ -15,8 +15,6 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%@ include file=3D"include/header.inc"%>
-
-<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
=
=
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/sitemap.jsp&rev=3D1251&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-0-SP-BRANCH/src/view/jsp/sitemap.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/sitemap.jsp Wed Oct 10 16:09:=
11 2007
@@ -22,7 +22,6 @@
=
<%@ include file=3D"include/header.inc"%>
=
-<% request.setAttribute("ignore_fragment_in_top_header.inc","true");%>
<%@ include file=3D"include/top_banner.inc"%>
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
