shuber 2004/08/19 21:46:40 CEST
Modified files:
src/view/jsp/include html_file_clipping.inc layout_process.inc
sitemap.inc
Log:
- Removed jData from engine map.
- Corrected display of moved page in Live mode, they now display only at the active
position.
Revision Changes Path
1.3 +0 -4
corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc.diff?r1=1.2&r2=1.3&f=h
1.2 +0 -4
corporate_portal_templates/src/view/jsp/include/layout_process.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/layout_process.inc.diff?r1=1.1&r2=1.2&f=h
1.6 +9 -7 corporate_portal_templates/src/view/jsp/include/sitemap.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/sitemap.inc.diff?r1=1.5&r2=1.6&f=h
Index: html_file_clipping.inc
===================================================================
RCS file:
/cvs/corporate_portal_templates/src/view/jsp/include/html_file_clipping.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- html_file_clipping.inc 15 Mar 2004 14:27:39 -0000 1.2
+++ html_file_clipping.inc 19 Aug 2004 19:46:39 -0000 1.3
@@ -199,10 +199,6 @@
}
%>
<%
- if(jData == null) {
- HashMap tempEngineMap = (HashMap)request.getAttribute(
"org.jahia.engines.EngineHashMap");
- jData = (JahiaData)tempEngineMap.get( "jData" );
- }
jData.fields().declareField( "theFILE", "FILE", FieldTypes.FILE, "/" );
JahiaFileFieldWrapper jffw =
(JahiaFileFieldWrapper)jData.fields().getField("theFILE");
Index: layout_process.inc
===================================================================
RCS file: /cvs/corporate_portal_templates/src/view/jsp/include/layout_process.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layout_process.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ layout_process.inc 19 Aug 2004 19:46:39 -0000 1.2
@@ -8,10 +8,6 @@
<%@ page import="org.jahia.services.applications.*"%>
<%
JahiaData layoutJahiaData = (JahiaData) request.getAttribute(
"org.jahia.data.JahiaData" );
- if(layoutJahiaData == null) {
- HashMap tempEngineMap = (HashMap) request.getAttribute(
"org.jahia.engines.EngineHashMap" );
- layoutJahiaData = (JahiaData) tempEngineMap.get( "jData" );
- }
ParamBean layoutParamBean = layoutJahiaData.params();
// PortletsAPI Default Parameters
Index: sitemap.inc
===================================================================
RCS file: /cvs/corporate_portal_templates/src/view/jsp/include/sitemap.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sitemap.inc 28 Jun 2004 10:34:03 -0000 1.5
+++ sitemap.inc 19 Aug 2004 19:46:39 -0000 1.6
@@ -102,6 +102,14 @@
if (contentPage == null) {
continue;
}
+
+ // now we test if the page has moved and if we are in normal mode.
+ if (jData.gui().isNormalMode()) {
+ if ((contentPage.hasSameParentID() != ContentPage.SAME_PARENT) &&
+ (contentPage.hasSameParentID() != treeJahiaSiteMap.getParentPageID(i)))
{
+ continue;
+ }
+ }
reachablePage = contentPage.isReachable(jParams.getOperationMode(),
jParams.getEntryLoadRequest().getFirstLocale(true).toString(),
jParams.getUser());
@@ -264,13 +272,7 @@
%>
<td align="center">
<a href="<%=contentPage.getURL(jParams,
languageCode)%>">
- <%
- if (contentPage.hasSameParentID() ==
treeJahiaSiteMap.getParentPageID(i)) {
- %><i>Page moved</i><%
- } else {
- %><jahia:displayIcon src="vuIcon" alt="x"
align="absmiddle" /><%
- }
- %>
+ <jahia:displayIcon src="vuIcon" alt="x"
align="absmiddle" />
</a>
</td>
<%
