Author: xlawrence
Date: Tue Nov 6 14:02:58 2007
New Revision: 13
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D13&repname=3D=
corporate_portal_templates_v3
Log:
fixed sitemap
Modified:
trunk/src/jsp/common/declarations.jspf
trunk/src/jsp/common/header.jspf
trunk/src/jsp/sitemap.jsp
Modified: trunk/src/jsp/common/declarations.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
declarations.jspf&rev=3D13&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/declarations.jspf (original)
+++ trunk/src/jsp/common/declarations.jspf Tue Nov 6 14:02:58 2007
@@ -62,6 +62,7 @@
org.apache.slide.webdav.util.URLUtil,
org.apache.lucene.queryParser.QueryParser,
org.jahia.taglibs.esi.JesiConst,
+ org.jahia.taglibs.ajax.ComplexTreeInclude,
org.jahia.ajax.usersession.userSettings,
org.jahia.services.acl.JahiaACLManagerService,
org.jahia.services.acl.JahiaBaseACL,
Modified: trunk/src/jsp/common/header.jspf
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
header.jspf&rev=3D13&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/common/header.jspf (original)
+++ trunk/src/jsp/common/header.jspf Tue Nov 6 14:02:58 2007
@@ -37,6 +37,8 @@
<link href=3D"<content:contextURL/>/shared/css/editMode.css" rel=3D"styl=
esheet" type=3D"text/css" />
<%}%>
<%}%>
+ <!-- The tag will only output something, if the servlet path ends with "=
sitemap.jsp" -->
+ <ajax:zimbraInclude templateUsage=3D"true" />
</head>
<body>
<a name=3D"top"></a>
Modified: trunk/src/jsp/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/sitemap=
.jsp&rev=3D13&repname=3Dcorporate_portal_templates_v3
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/sitemap.jsp (original)
+++ trunk/src/jsp/sitemap.jsp Tue Nov 6 14:02:58 2007
@@ -1,59 +1,15 @@
-<%
-String typeSiteMap =3D request.getParameter("type");
-
-if(typeSiteMap !=3D null && typeSiteMap.equals("ListAll")){%>
-<jsp:include page=3D"include/listPagesJahia.jsp" flush=3D"true" />
-<%}else if(typeSiteMap !=3D null && typeSiteMap.equals("nav")) {%>
-<jsp:include page=3D"../../../intellogix/shared/nav/navigation.jsp" flush=
=3D"true" />
-<%}else{%>
-<%@ include file=3D"include/header.jsp"%>
-<%@ taglib uri=3D"ajaxLib" prefix=3D"ajax" %>
-<% if (request.getServletPath().endsWith("sitemap.jsp")) { %>
-<ajax:zimbraInclude/>
-<% } %>
-<%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude"%>
-
-<c:if test=3D"${!thePrint}">
-<%@ include file=3D"include/banner.jsp"%>
-</c:if>
-<div id=3D"content">
- <c:if test=3D"${!thePrint}">
- <center>
- <table width=3D"760" cellspacing=3D"0" cellpadding=3D"0" border=3D"0">
- <tr>
- <td valign=3D"top" width=3D"10">
- <img src=3D"<jahia:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"1" border=3D"0" alt=3D"" /><br />
- </td>
- <td valign=3D"top" width=3D"533" align=3D"left">
- </c:if>
- <table cellspacing=3D"0" cellpadding=3D"0" border=3D"0" width=3D=
"100%" class=3D"titleWithLink">
- <tr>
- <td valign=3D"top">
- <h1><jahia:resourceBundle resourceBundle=3D"<%=3DresourceB=
undleName%>" resourceName=3D"siteMap" defaultValue=3D"Plan du site"/></h1>
- </td>
- </tr>
- </table>
- <%
- final String title =3D getResourceBundle ("siteMap", "Plan d=
u site", jData);
- final String entryPoint =3D jData.params().getSite().getHome=
ContentPage().getObjectKey().toString();
- %>
- <!-- main column (start) -->
- <ajax:complexTreeInclude divID=3D"tree1" style=3D"<%=3DComplexTr=
eeInclude.SITEMAP_STYLE%>" title=3D"<%=3Dtitle%>" entryPointKey=3D"<%=3Dent=
ryPoint%>"/>
- <!-- main column (end) -->
- <c:if test=3D"${!thePrint}">
- </td>
- <td valign=3D"top" width=3D"26">
- <img src=3D"<jahia:contextURL/>/images/pix.gif" width=3D"26" hei=
ght=3D"1" border=3D"0" alt=3D"" /><br />
- </td>
- <td valign=3D"top" width=3D"191" align=3D"left">
- <!-- right column (start) -->
-
- <!-- right column (end) -->
- </td>
- </tr>
- </table>
- </center>
- </c:if>
-</div>
-<%@ include file=3D"include/footer.jsp"%>
-<%}%>
\ No newline at end of file
+<%@ include file=3D"common/top_declarations.jspf"%>
+<%@ include file=3D"common/header.jspf"%>
+<%@ include file=3D"common/menu.jspf"%>
+<%@ include file=3D"common/pub.jspf"%>
+ <div id=3D"main">
+ <div id=3D"column-left"> </div>
+ <div id=3D"column-main">
+ <div id=3D"content">
+ <% final String entryPoint =3D
jData.params().getSite().getHomeCont=
entPage().getObjectKey().toString(); %>
+ <ajax:complexTreeInclude divID=3D"tree1"
style=3D"<%=3DComplexTreeIn=
clude.SITEMAP_STYLE%>" title=3D"Site Map" entryPointKey=3D"<%=3DentryPoint%=
>"/> =
+ </div>
+ </div>
+ <div id=3D"main-bottom"></div>
+ </div>
+<%@ include file=3D"common/footer.jspf"%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
