Author: bpapez
Date: Thu Sep 6 10:02:18 2007
New Revision: 3
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D3&repname=3Dd=
oc_templates
Log:
Fix leftmenu functionality (scriptlet and taglib version)
Added:
trunk/ant.build.properties.example
- copied, changed from r2, trunk/ant.build.properties
trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp
- copied, changed from r2, trunk/src/jsp/chapter1/scriptlet/menu_scri=
ptlet.jsp
trunk/src/jsp/chapter1/scriptlet/top_scriptlet.inc
trunk/src/jsp/chapter1/taglib/leftmenu.inc
- copied, changed from r2, trunk/src/jsp/chapter1/taglib/menu.inc
trunk/src/jsp/chapter1/taglib/top.inc
Removed:
trunk/ant.build.properties
trunk/src/jsp/chapter1/scriptlet/menu_scriptlet.jsp
trunk/src/jsp/chapter1/taglib/menu.inc
Modified:
trunk/ (props changed)
trunk/src/jsp/chapter1/scriptlet/declarations_scriptlet.inc
trunk/src/jsp/chapter1/taglib/bottom.inc
trunk/src/jsp/chapter1/taglib/declarations.inc
trunk/src/jsp/chapter1/taglib/submenu.jsp
trunk/src/jsp/chapter1/template_scriptlet.jsp
trunk/src/jsp/chapter1/template_taglib.jsp
trunk/src/jsp/chapter2/fs.jsp
Copied: trunk/ant.build.properties.example (from r2, trunk/ant.build.proper=
ties)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/ant.build.prope=
rties.example&rev=3D3&repname=3Ddoc_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
--- trunk/ant.build.properties (original)
+++ trunk/ant.build.properties.example Thu Sep 6 10:02:18 2007
@@ -1,6 +1,6 @@
# Change this file and rename it to ant.build.properties
build.base=3Dbuild
-tomcat.home=3DC:/Runtime_environments/5x/tomcat
+tomcat.home=3DD:/rd/runtime/jahia5x/tomcat
classes=3D${tomcat.home}/webapps/jahia/WEB-INF/classes
lib=3D${tomcat.home}/webapps/jahia/WEB-INF/lib
=
Modified: trunk/src/jsp/chapter1/scriptlet/declarations_scriptlet.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/scriptlet/declarations_scriptlet.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/scriptlet/declarations_scriptlet.inc (original)
+++ trunk/src/jsp/chapter1/scriptlet/declarations_scriptlet.inc Thu Sep 6 =
10:02:18 2007
@@ -15,8 +15,6 @@
<%@ page import=3D"org.jahia.services.usermanager.*" %>
<%@ page import=3D"org.jahia.services.version.*" %>
=
-<%@ include file=3D"/jsp/jahia/javascript/serverconfig_js.inc"%>
-
<%
Logger logger =3D Logger.getLogger(getClass());
JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.Jahi=
aData" );
@@ -30,15 +28,4 @@
ContentPage contentPage =3D ContentPage.getPage(jData.page().getID());
String contextURL =3D jData.gui().drawHttpJspContext(request);
int homePageId =3D jData.getProcessingContext().getSite().getHomePageID();
-%>
-<script type=3D"text/javascript" src=3D"<%=3DjParams.settings().getJsHttpP=
ath()%>"></script>
-<link rel=3D"stylesheet" href=3D"<%=3DcontextURL%>/../common/css/web.css" =
type=3D"text/css"/>
-<link rel=3D"stylesheet" href=3D"<%=3DjahiaContextPath%>/jsp/jahia/css/cor=
e_css.jsp" type=3D"text/css"></link>
-<%
-if (jData.gui().isEditMode()) {
- %>
- <link rel=3D"stylesheet" href=3D"<%=3DcontextURL%>/../common/css/actio=
ns.css" type=3D"text/css"/>
- <script language=3D"javascript1.2" src=3D"<%=3DcontextURL%>/../common/=
javascript/actions.js" type=3D"text/javascript"></script>
- <%
-}
%>
\ No newline at end of file
Copied: trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp (from r2, t=
runk/src/jsp/chapter1/scriptlet/menu_scriptlet.jsp)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/scriptlet/leftmenu_scriptlet.jsp&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/scriptlet/menu_scriptlet.jsp (original)
+++ trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp Thu Sep 6 10:0=
2:18 2007
@@ -1,30 +1,4 @@
-<%@ page import=3D"org.jahia.data.beans.ContainerListBean"%>
-<%@ page import=3D"org.jahia.data.containers.JahiaContainer"%>
-<%@ page import=3D"org.jahia.data.JahiaData"%>
-<%@ page import=3D"java.io.IOException"%>
-<%@ page import=3D"org.jahia.services.pages.JahiaPage"%>
-<%@ page import=3D"org.jahia.data.beans.ContainerBean"%>
-<%@ page import=3D"org.jahia.data.containers.JahiaContainerList"%>
-<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
-<%@ page import=3D"java.util.*"%>
-<%@ page import=3D"org.apache.log4j.Logger"%>
-<%--
-Copyright 2002-2006 Jahia Ltd
-
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
-Version 1.0 (the "License"), or (at your option) any later version; you may
-not use this file except in compliance with the License. You should have
-received a copy of the License along with this program; if not, you may ob=
tain
-a copy of the License at
-
- http://www.jahia.org/license/
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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.
---%>
+<%@ include file=3D"declarations_scriptlet.inc"%>
=
<%!
public void getPageSubTree( JahiaData jData,
@@ -117,21 +91,13 @@
}
%>
<%
- JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.=
JahiaData" );
- Logger logger =3D Logger.getLogger(getClass());
-
jData.containers().declareField( "leftLink", "Left Link", FieldTypes.P=
AGE, "" );
Vector leftMenuFields =3D new Vector();
leftMenuFields.add( "leftLink" );
jData.containers().declareContainer( "leftMenuContainerList", "Left Me=
nu", leftMenuFields ); =
=
int startFromPageId =3D jData.gui().getLevelID(1);
- JahiaContainerList leftMenuContainerList =3D jData.containers().getAb=
soluteContainerList( "leftMenuContainerList", startFromPageId );
- if (leftMenuContainerList.getFullSize() =3D=3D 0) {
- %><[EMAIL PROTECTED] import=3D"org.jahia.data.fields.FieldTypes"%>
-
-<div id=3D"navedit"></div><%
- }
+ =
getPageSubTree( jData , startFromPageId, startFromPageId, pageContext,=
1,true,true,logger);
=
%>
Added: trunk/src/jsp/chapter1/scriptlet/top_scriptlet.inc
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter1/scriptlet/top_scriptlet.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/scriptlet/top_scriptlet.inc (added)
+++ trunk/src/jsp/chapter1/scriptlet/top_scriptlet.inc Thu Sep 6 10:02:18 =
2007
@@ -0,0 +1,13 @@
+<%@ include file=3D"/jsp/jahia/javascript/serverconfig_js.inc"%>
+
+<script type=3D"text/javascript" src=3D"<%=3DjParams.settings().getJsHttpP=
ath()%>"></script>
+<link rel=3D"stylesheet" href=3D"<%=3DcontextURL%>/../common/css/web.css" =
type=3D"text/css"/>
+<link rel=3D"stylesheet" href=3D"<%=3DjahiaContextPath%>/jsp/jahia/css/cor=
e_css.jsp" type=3D"text/css"></link>
+<%
+if (jData.gui().isEditMode()) {
+ %>
+ <link rel=3D"stylesheet" href=3D"<%=3DcontextURL%>/../common/css/actio=
ns.css" type=3D"text/css"/>
+ <script language=3D"javascript1.2" src=3D"<%=3DcontextURL%>/../common/=
javascript/actions.js" type=3D"text/javascript"></script>
+ <%
+}
+%>
\ No newline at end of file
Modified: trunk/src/jsp/chapter1/taglib/bottom.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/taglib/bottom.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/taglib/bottom.inc (original)
+++ trunk/src/jsp/chapter1/taglib/bottom.inc Thu Sep 6 10:02:18 2007
@@ -7,12 +7,17 @@
</content:declareContainerList>
</logic:equal> =
<p>
+
+<logic:equal name=3D"currentPage" property=3D"level" value=3D"0">
+ <content:containerList name=3D"containerListFooter"/>
+</logic:equal>
+
<content:absoluteContainerList name=3D"containerListFooter" id=3D"containe=
rListFooter" pageLevel=3D"1">
<content:container id=3D"footerContainer">
<content:bigTextField name=3D'footer' defaultValue=3D'' id=3D'footer' =
diffActive=3D'true'/>
<logic:equal name=3D"currentPage" property=3D"level" value=3D"0"> =
<jahiaHtml:actionMenu name=3D"footerContainer" namePostFix=3D"" reso=
urceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=3D"false"/>
- </logic:equal> =
+ </logic:equal>
</content:container>
-</content:absoluteContainerList> =
+</content:absoluteContainerList>
</p>
Modified: trunk/src/jsp/chapter1/taglib/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/taglib/declarations.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/taglib/declarations.inc (original)
+++ trunk/src/jsp/chapter1/taglib/declarations.inc Thu Sep 6 10:02:18 2007
@@ -20,18 +20,6 @@
<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
=
-<content:JSTools/>
-
-<%@ include file=3D"/jsp/jahia/javascript/serverconfig_js.inc"%>
-
-
-<link rel=3D"stylesheet" href=3D"<content:contextURL/>/../common/css/web.c=
ss" type=3D"text/css"/>
-<link rel=3D"stylesheet" href=3D"<content:serverHttpPath/>/jsp/jahia/css/c=
ore_css.jsp" type=3D"text/css"></link>
-<logic:equal name=3D"currentRequest" property=3D"editMode" value=3D"true">
- <link rel=3D"stylesheet" href=3D"<content:contextURL/>/../common/css/a=
ctions.css" type=3D"text/css"/>
- <script language=3D"javascript1.2" src=3D"<content:contextURL/>/../com=
mon/javascript/actions.js" type=3D"text/javascript"></script>
-</logic:equal>
-
<%
Logger logger =3D Logger.getLogger(getClass());
JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.Jahi=
aData" );
Copied: trunk/src/jsp/chapter1/taglib/leftmenu.inc (from r2, trunk/src/jsp/=
chapter1/taglib/menu.inc)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/taglib/leftmenu.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/taglib/menu.inc (original)
+++ trunk/src/jsp/chapter1/taglib/leftmenu.inc Thu Sep 6 10:02:18 2007
@@ -4,8 +4,8 @@
</content:declareContainer>
</content:declareContainerList>
=
-<jsp:include page=3D"menu.jsp" flush=3D"true">
- <jsp:param name=3D"currentPageId" value=3D"<bean:write name=3D'currentSi=
te' property=3D'homepageID'/>"/>
+<jsp:include page=3D"../chapter1/taglib/submenu.jsp" flush=3D"true">
+ <jsp:param name=3D"currentPageId" value=3D'<%=3DjParams.getSite().getHom=
ePageID() %>'/>
<jsp:param name=3D"level" value=3D"1"/>
<jsp:param name=3D"isFirst" value=3D"true"/>
<jsp:param name=3D"isNotALink" value=3D"true"/>
Modified: trunk/src/jsp/chapter1/taglib/submenu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/taglib/submenu.jsp&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/taglib/submenu.jsp (original)
+++ trunk/src/jsp/chapter1/taglib/submenu.jsp Thu Sep 6 10:02:18 2007
@@ -1,74 +1,40 @@
-<%@ page import=3D"org.jahia.data.beans.ContainerListBean"%>
-<%@ page import=3D"org.jahia.data.containers.JahiaContainer"%>
-<%@ page import=3D"org.jahia.data.JahiaData"%>
-<%@ page import=3D"java.io.IOException"%>
-<%@ page import=3D"org.jahia.services.pages.JahiaPage"%>
-<%@ page import=3D"org.jahia.data.beans.ContainerBean"%>
-<%@ page import=3D"org.jahia.data.containers.JahiaContainerList"%>
-<%@ page import=3D"org.jahia.exceptions.JahiaException"%>
-<%@ page import=3D"java.util.*"%>
-<%@ page import=3D"org.apache.log4j.Logger"%>
-<%--
-Copyright 2002-2006 Jahia Ltd
+<%@ include file=3D"declarations.inc"%>
+<bean:define id=3D"isNotALink" value=3D"<%=3Drequest.getParameter("isNotAL=
ink")%>"/>
=
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
-Version 1.0 (the "License"), or (at your option) any later version; you may
-not use this file except in compliance with the License. You should have
-received a copy of the License along with this program; if not, you may ob=
tain
-a copy of the License at
-
- http://www.jahia.org/license/
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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.
---%>
-<%
- JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.=
JahiaData" );
- Logger logger =3D Logger.getLogger(getClass());
- =
- int startFromPageId =3D jData.gui().getLevelID(1);
- JahiaContainerList leftMenuContainerList =3D jData.containers().getAb=
soluteContainerList( "leftMenuContainerList", startFromPageId );
- if (leftMenuContainerList.getFullSize() =3D=3D 0) {
- %><[EMAIL PROTECTED] import=3D"org.jahia.data.fields.FieldTypes"%>
-
-<div id=3D"navedit"></div><%
- }
- getPageSubTree( jData , startFromPageId, startFromPageId, pageContext,=
1,true,true,logger);
-
-%>
-
-
-
-<content:absoluteContainerList name=3D'leftMenuContainerList' id=3D'leftMe=
nuContainerList' pageId=3D"<bean:write name=3D"currentPageId"/>">
-<content:container id=3D"leftMenuContainer">
+<content:absoluteContainerList name=3D'leftMenuContainerList' id=3D'leftMe=
nuContainerList' pageId=3D'<%=3Drequest.getParameter("currentPageId") %>'>
=
+ <logic:equal name=3D"isNotALink" value=3D"true">
+ <logic:notEmpty name=3D"leftMenuContainerList" property=3D"contentCont=
ainerList.pickedObject">
+ <bean:define id=3D"isNotALink" value=3D"false"/>
+ </logic:notEmpty> =
+ </logic:equal>
+ =
+ <content:container id=3D"leftMenuContainer">
<content:pageField valueId=3D"leftLink" name=3D'leftLink'/>
+ =
<logic:equal parameter=3D"isFirst" value=3D"true"> =
<div class=3D'isFirst'>
</logic:equal>
- <div class=3D'level<bean:write name=3D"level"/>'> =
- <a href=3D"<logic:notEmpty name=3D"leftLink"><bean:write name=3D'lef=
tLink' property=3D'url'/></logic:notEmpty>"
- class=3D'link<bean:write name=3D"level"/>
+ =
+ <div class=3D'level<%=3Drequest.getParameter("level")%>'> =
+ <a href=3D'<logic:notEmpty name=3D"leftLink"><bean:write name=3D"lef=
tLink" property=3D"url"/></logic:notEmpty>'
+ class=3D'link<%=3Drequest.getParameter("level")%>
<logic:notEmpty name=3D"leftLink"> =
- <logic:equal name=3D"leftLink" property=3D"id" value=3D"<%=
=3DjData.page().getID()%>">
+ <logic:equal name=3D"leftLink" property=3D"id" value=3D"<%=
=3DInteger.toString(jData.page().getID())%>">
current
</logic:equal>
- </logicNotEmpty> =
+ </logic:notEmpty> =
'>
- =
=
<logic:notEmpty name=3D"leftLink">
<logic:equal name=3D"currentRequest" property=3D"editMode" value=
=3D"true">
- <logic:equal name=3D"leftLink" property=3D"contentPage.markedF=
orDelete" value=3D"true">
+ <logic:equal name=3D"leftLink" property=3D"contentObject.marke=
dForDelete" value=3D"true">
<span class=3D'markForDelete'>
</logic:equal>
</logic:equal>
<bean:write name=3D'leftLink' property=3D'highLightDiffTitle'/>
<logic:equal name=3D"currentRequest" property=3D"editMode" value=
=3D"true">
- <logic:equal name=3D"leftLink" property=3D"contentPage.markedF=
orDelete" value=3D"true">
+ <logic:equal name=3D"leftLink" property=3D"contentObject.marke=
dForDelete" value=3D"true">
</span>
</logic:equal>
</logic:equal> =
@@ -78,41 +44,40 @@
n.d.
</logic:empty>
=
- <logic:equal name=3D"isNotALink" value=3D"false">
- <logic:empty name=3D"leftLink">
- <bean:define name=3D"isNotALink" value=3D"true"/>
- </logic:empty>
- <logic:notEmpty name=3D"leftLink">
- <logic:present name=3D"leftMenuContainerList" property=3D"cont=
entContainerList.pickedObject">
- <bean:define name=3D"isNotALink" value=3D"true"/>
- </logic:present =
- </logic:notEmpty> =
- </logic:equal>
- =
<logic:equal name=3D"currentRequest" property=3D"editMode" value=
=3D"true">
- <logic:equal name=3D"isNotALink" value=3D"true">
+ <logic:notEmpty name=3D"leftLink">
+ <logic:equal name=3D"isNotALink" value=3D"true">
+ <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=
=3D".leftLink" resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=
=3D"false"/>
+ </logic:equal>
+ </logic:notEmpty>
+ <logic:empty name=3D"leftLink">
<jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=
=3D".leftLink" resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=
=3D"false"/>
- </logic:equal>
+ </logic:empty>
</logic:equal>
</a>
- </div> =
+ </div>
+ =
<logic:equal parameter=3D"isFirst" value=3D"true"> =
</div>
- </logic:equal> =
- <jsp:include page=3D"taglib/menu.jsp" flush=3D"true">
- <jsp:param name=3D"currentPageId" value=3D"<bean:write name=3D'leftL=
ink' property=3D'id'/>"/>
- <jsp:param name=3D"level" value=3D"<%=3DInteger.parseInt((String)pag=
eContext.getAttribute("level")) + 1 %>"/>
- <jsp:param name=3D"isFirst" value=3D"false"/>
- <jsp:param name=3D"isNotALink" value=3D"<bean:write name=3D'isNotALi=
nk'/>"/>
- </jsp:include>
+ </logic:equal>
+ =
+ <logic:notEmpty name=3D"leftLink">
+ <logic:equal name=3D"leftLink" property=3D"inCurrentPagePath" value=
=3D"true">
+ <jsp:include page=3D"submenu.jsp" flush=3D"true">
+ <jsp:param name=3D"currentPageId" value=3D"<%=3D((PageBean)pageC=
ontext.findAttribute("leftLink")).getId() %>"/>
+ <jsp:param name=3D"level" value=3D"<%=3DInteger.parseInt(request=
.getParameter("level")) + 1 %>"/>
+ <jsp:param name=3D"isFirst" value=3D"false"/>
+ <jsp:param name=3D"isNotALink" value=3D"<%=3DpageContext.findAtt=
ribute("isNotALink")%>"/>
+ </jsp:include>
+ </logic:equal> =
+ </logic:notEmpty>
+ =
</content:container>
<logic:equal name=3D"currentRequest" property=3D"editMode" value=3D"true">
<logic:equal name=3D"isNotALink" value=3D"true">
- <div class=3D'level<%=3DInteger.parseInt((String)pageContext.getAttrib=
ute("level")) + 1 %> nostyle'>
- <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=3D".lef=
tLink" resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=3D"false=
"/>
+ <div class=3D'level<%=3DInteger.parseInt(request.getParameter("level")=
) + 1 %> nostyle'>
+ <jahiaHtml:actionMenu name=3D"leftMenuContainerList" namePostFix=3D"=
.leftLinks" labelKey=3D"add.leftLinks" resourceBundle=3D"jahiatemplates.Doc=
_templates" useFieldSet=3D"false"/>
</div> =
</logic:equal>
</logic:equal>
-<jahiaHtml:actionMenu name=3D"leftMenuContainerList" namePostFix=3D".leftL=
inks" labelKey=3D"add.leftLinks" resourceBundle=3D"jahiatemplates.Doc_templ=
ates" useFieldSet=3D"false">
-</jahiaHtml:actionMenu>
-</content:containerList>
\ No newline at end of file
+</content:absoluteContainerList>
\ No newline at end of file
Added: trunk/src/jsp/chapter1/taglib/top.inc
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter1/taglib/top.inc&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/taglib/top.inc (added)
+++ trunk/src/jsp/chapter1/taglib/top.inc Thu Sep 6 10:02:18 2007
@@ -0,0 +1,10 @@
+<content:JSTools/>
+
+<%@ include file=3D"/jsp/jahia/javascript/serverconfig_js.inc"%>
+
+<link rel=3D"stylesheet" href=3D"<content:contextURL/>/../common/css/web.c=
ss" type=3D"text/css"/>
+<link rel=3D"stylesheet" href=3D"<content:serverHttpPath/>/jsp/jahia/css/c=
ore_css.jsp" type=3D"text/css"></link>
+<logic:equal name=3D"currentRequest" property=3D"editMode" value=3D"true">
+ <link rel=3D"stylesheet" href=3D"<content:contextURL/>/../common/css/a=
ctions.css" type=3D"text/css"/>
+ <script language=3D"javascript1.2" src=3D"<content:contextURL/>/../com=
mon/javascript/actions.js" type=3D"text/javascript"></script>
+</logic:equal>
\ No newline at end of file
Modified: trunk/src/jsp/chapter1/template_scriptlet.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/template_scriptlet.jsp&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/template_scriptlet.jsp (original)
+++ trunk/src/jsp/chapter1/template_scriptlet.jsp Thu Sep 6 10:02:18 2007
@@ -3,6 +3,7 @@
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
<%@ include file=3D"scriptlet/declarations_scriptlet.inc"%>
+ <%@ include file=3D"scriptlet/top_scriptlet.inc"%>
<title><%=3DcurrentPage.getTitle()%></title>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-=
8" />
</head>
@@ -25,7 +26,7 @@
<div id=3D"content">
<div id=3D"contentLeft">
<div id=3D"navigation">
- <jsp:include page=3D"scriptlet/menu_scriptlet.jsp" flush=3D"true"/>
+ <jsp:include page=3D"scriptlet/leftmenu_scriptlet.jsp" flush=3D"tr=
ue"/>
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
Modified: trunk/src/jsp/chapter1/template_taglib.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/template_taglib.jsp&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter1/template_taglib.jsp (original)
+++ trunk/src/jsp/chapter1/template_taglib.jsp Thu Sep 6 10:02:18 2007
@@ -3,6 +3,7 @@
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
<%@ include file=3D"taglib/declarations.inc"%>
+ <%@ include file=3D"taglib/top.inc"%> =
<title><bean:write name=3D'currentPage' property=3D'title' filter=3D'f=
alse'/></title>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-=
8" />
</head>
@@ -21,7 +22,7 @@
<div id=3D"content">
<div id=3D"contentLeft">
<div id=3D"navigation">
- <%@ include file=3D"taglib/menu.inc"%>
+ <%@ include file=3D"taglib/leftmenu.inc"%>
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
Modified: trunk/src/jsp/chapter2/fs.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/fs.jsp&rev=3D3&repname=3Ddoc_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
--- trunk/src/jsp/chapter2/fs.jsp (original)
+++ trunk/src/jsp/chapter2/fs.jsp Thu Sep 6 10:02:18 2007
@@ -3,6 +3,7 @@
<html xmlns=3D"http://www.w3.org/1999/xhtml";>
<head>
<%@ include file=3D"..\chapter1\taglib\declarations.inc"%>
+ <%@ include file=3D"..\chapter1\taglib\top.inc"%>
<title><bean:write name=3D'currentPage' property=3D'title' filter=3D'f=
alse'/></title>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-=
8" />
</head>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
