Author: bpapez
Date: Thu Sep 6 15:32:44 2007
New Revision: 6
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D6&repname=3Dd=
oc_templates
Log:
Make the basic 4 templates (Taglib, Scriptlet, EL&JSTL, JavaBean) extendabl=
e, so that other test templates make use of the common setup
Added:
trunk/src/jsp/chapter2/allfields-wa.jsp
trunk/src/jsp/chapter2/allfields.jsp
- copied, changed from r2, trunk/src/jsp/chapter2/fs.inc
Removed:
trunk/src/jsp/chapter2/fs.inc
trunk/src/jsp/chapter2/fs.jsp
Modified:
trunk/src/jsp/chapter1/el-jstl/maincontent_el-jstl.inc
trunk/src/jsp/chapter1/el-jstl/submenu_el-jstl.jsp
trunk/src/jsp/chapter1/javabean/leftmenu_javabean.jsp
trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp
trunk/src/jsp/chapter1/scriptlet/maincontent_scriptlet.inc
trunk/src/jsp/chapter1/taglib/maincontent.inc
trunk/src/jsp/chapter1/taglib/submenu.jsp
trunk/src/jsp/chapter1/template_el-jstl.jsp
trunk/src/jsp/chapter1/template_javabean.jsp
trunk/src/jsp/chapter1/template_scriptlet.jsp
trunk/src/jsp/chapter1/template_taglib.jsp
trunk/src/jsp/common/css/web.css
Modified: trunk/src/jsp/chapter1/el-jstl/maincontent_el-jstl.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/el-jstl/maincontent_el-jstl.inc&rev=3D6&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/el-jstl/maincontent_el-jstl.inc (original)
+++ trunk/src/jsp/chapter1/el-jstl/maincontent_el-jstl.inc Thu Sep 6 15:32=
:44 2007
@@ -3,11 +3,11 @@
%>
<content:declareContainerList name=3D'mainContentContainerList' title=3D'M=
ain Content'>
<content:declareContainer>
- <content:declareField name=3D'title' title=3D'Title' type=3D'SmallText=
'/>
- <content:declareField name=3D'content' title=3D'Content' type=3D'BigTe=
xt'/>
- <content:declareField name=3D'image' title=3D'Image' type=3D'File'/>
- <content:declareField name=3D'align' title=3D'Image align' type=3D'Sha=
redSmallText' value=3D'<jahia_multivalue[left:right:default]>left'/>
- <content:declareField name=3D'date' title=3D'Date' type=3D'Date' value=
=3D'<jahia_calendar[dd mon yyyy / HH:MM]>'/>
+ <content:declareField name=3D'contentTitle' title=3D'Title' type=3D'Sm=
allText'/>
+ <content:declareField name=3D'contentText' title=3D'Content' type=3D'B=
igText'/>
+ <content:declareField name=3D'contentImage' title=3D'Image' type=3D'Fi=
le'/>
+ <content:declareField name=3D'contentAlign' title=3D'Image align' type=
=3D'SharedSmallText' value=3D'<jahia_multivalue[left:right:default]>left'/>
+ <content:declareField name=3D'contentDate' title=3D'Date' type=3D'Date=
' value=3D'<jahia_calendar[dd MMM yyyy / HH:mm]>'/>
</content:declareContainer>
</content:declareContainerList>
=
@@ -18,15 +18,15 @@
<jahiaHtml:actionMenu name=3D"mainContentContainerList" namePostFix=3D"" r=
esourceBundle=3D"jahiatemplates.Doc_templates">
<content:container id=3D'mainContentContainer'>
<jahiaHtml:actionMenu name=3D"mainContentContainer" namePostFix=3D"" r=
esourceBundle=3D"jahiatemplates.Doc_templates">
- <content:textField name=3D'title' display=3D"false" valueId=3D"title" =
defaultValue=3D"" diffActive=3D"true"/>
+ <content:textField name=3D'contentTitle' display=3D"false" valueId=3D"=
title" defaultValue=3D"" diffActive=3D"true"/>
<c:if test=3D'${!empty title}'>
<h2>${title}</h2>
</c:if>
<p>
<c:if test=3D"${!empty mainContentContainer.fields['image']}">
- <c:set var=3D"image" value=3D"${mainContentContainer.fields['i=
mage'].object}"/>
+ <c:set var=3D"image" value=3D"${mainContentContainer.fields['c=
ontentImage'].object}"/>
<c:if test=3D"${image !=3D null && image.image}">
- <content:textField name=3D'align' display=3D"false" valueI=
d=3D"align" defaultValue=3D""/>
+ <content:textField name=3D'contentAlign' display=3D"false"=
valueId=3D"align" defaultValue=3D""/>
<img src=3D"${image.downloadUrl}" border=3D"0"
alt=3D"${image.fileFieldTitle}"
<c:if test=3D"${align !=3D null && align !=3D 'defaul=
t'}">
@@ -35,8 +35,8 @@
/>
</c:if>
</c:if>
- <content:bigTextField name=3D'content' defaultValue=3D"" diffActiv=
e=3D"true"/>
- <content:textField name=3D'date' display=3D"false" valueId=3D"date=
" defaultValue=3D"" diffActive=3D"true"/>
+ <content:bigTextField name=3D'contentText' defaultValue=3D"" diffA=
ctive=3D"true"/>
+ <content:textField name=3D'contentDate' display=3D"false" valueId=
=3D"date" defaultValue=3D"" diffActive=3D"true"/>
<c:if test=3D'${!empty date}'>
<br/><em>${date}</em>
</c:if>
Modified: trunk/src/jsp/chapter1/el-jstl/submenu_el-jstl.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/el-jstl/submenu_el-jstl.jsp&rev=3D6&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/el-jstl/submenu_el-jstl.jsp (original)
+++ trunk/src/jsp/chapter1/el-jstl/submenu_el-jstl.jsp Thu Sep 6 15:32:44 =
2007
@@ -12,7 +12,7 @@
<div class=3D'isFirst'>
</c:if>
=
- <div class=3D'${"level" + params.level)'> =
+ <div class=3D'${"level" + params.level)'>
<a href=3D'<logic:notEmpty name=3D"leftLink"><bean:write name=3D"lef=
tLink" property=3D"url"/></logic:notEmpty>'
class=3D'${"link" + params.level)
<c:if test=3D"${!empty leftLink && leftLink.id =3D=3D currentP=
age.id}">
@@ -33,11 +33,10 @@
n.d.
</c:otherwise>
</c:choose> =
- =
- <c:if test=3D"${currentRequest.editMode && (empty leftLink || para=
ms.isNotALink)}">
- <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=3D"=
.leftLink" resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=3D"f=
alse"/>
- </c:if>
</a>
+ <c:if test=3D"${currentRequest.editMode && (empty leftLink || params=
.isNotALink)}">
+ <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=3D".l=
eftLink" resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=3D"fal=
se"/>
+ </c:if> =
</div>
=
<c:if test=3D"${params.isFirst}"> =
Modified: trunk/src/jsp/chapter1/javabean/leftmenu_javabean.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/javabean/leftmenu_javabean.jsp&rev=3D6&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/javabean/leftmenu_javabean.jsp (original)
+++ trunk/src/jsp/chapter1/javabean/leftmenu_javabean.jsp Thu Sep 6 15:32:=
44 2007
@@ -34,13 +34,12 @@
<logic:equal name=3D"navItem" property=3D"markedForDelete" value=
=3D"true">
</span>
</logic:equal> =
- =
- <logic:equal name=3D"navItem" property=3D"addActionMenu" value=
=3D"true">
- <bean:define id=3D"leftMenuContainer" name=3D"navItem" propert=
y=3D"contentBean"/>
- <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=
=3D".leftLink" =
- resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSe=
t=3D"false"/> =
- </logic:equal>
</a>
+ <logic:equal name=3D"navItem" property=3D"addActionMenu" value=3D"=
true">
+ <bean:define id=3D"leftMenuContainer" name=3D"navItem" property=
=3D"contentBean"/>
+ <jahiaHtml:actionMenu name=3D"leftMenuContainer" namePostFix=3D"=
.leftLink" =
+ resourceBundle=3D"jahiatemplates.Doc_templates" useFieldSet=
=3D"false"/> =
+ </logic:equal> =
</logic:notEmpty> =
</div>
=
Modified: trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/scriptlet/leftmenu_scriptlet.jsp&rev=3D6&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/leftmenu_scriptlet.jsp (original)
+++ trunk/src/jsp/chapter1/scriptlet/leftmenu_scriptlet.jsp Thu Sep 6 15:3=
2:44 2007
@@ -24,13 +24,14 @@
JahiaContainer navigationContainer =3D (JahiaContainer) na=
vigationContainers.nextElement();
//ContainerBean navigationContainerBean =3D new ContainerB=
ean(navigationContainer,jData.params());
JahiaPage leftLink =3D (JahiaPage) navigationContainer.get=
FieldObject( "leftLink" );
+ if (isFirst) {
+ out.print("<div class=3D'isFirst'>");
+ }
=
+ out.print("<div class=3D'level" + level + "'>");
+ =
if (leftLink !=3D null) {
- if (isFirst) {
- out.print("<div class=3D'isFirst'>");
- }
- out.print("<div class=3D'level" + level + "'>");
- out.print("<a href=3D'" +
leftLink.getURL(jData.getProcess=
ingContext()) + "'");
+ out.print("<a href=3D'" +
leftLink.getURL(jData.getProcessin=
gContext()) + "'");
if (leftLink.getID() =3D=3D jData.page().getID()) out.=
print(" class=3D'current link" + level + "'");
else out.print(" class=3D'link" + level
+ "'");
=
@@ -43,40 +44,25 @@
out.print("</span>");
}
out.print("</a>");
- if (editMode && isNotALink) {
- jData.gui().html().drawBeginActionMenu(new Contain=
erBean(navigationContainer,jData.getProcessingContext()),
- null, null, false, ".leftLink", "jahiatemplate=
s.Corporate_portal_templates_v2", null, out);
- }
- out.println("</div>");
- if (isFirst) {
- out.print("</div>");
- }
-
- isFirst =3D false;
- // displays sub links
- if (jData.gui().isPageInPath(leftLink.getID())) {
- getPageSubTree(jData , rootPageId, leftLink.getID(=
),
- pageContext,level+1,isFirst,isNotALink,logger);
- }
} else {
// no navlink
- if (isFirst) {
- out.print("<div class=3D'isFirst'>");
- }
- out.print("<div class=3D'level" + level + "'>");
out.print("<a href=3D'' class=3D'link" + level + "'");
out.print(">n.d.</a>");
- if (editMode) {
- jData.gui().html().drawBeginActionMenu(new Contain=
erBean(navigationContainer,jData.getProcessingContext()),
- null, null, false, ".leftLink", "jahiatemplate=
s.Doc_templates", null, out);
- }
- out.println("</div>");
- if (isFirst) {
- out.print("</div>");
- }
- isFirst =3D false;
-
}
+ if (editMode && isNotALink) {
+ jData.gui().html().drawBeginActionMenu(new ContainerBe=
an(navigationContainer,jData.getProcessingContext()),
+ null, null, false, ".leftLink", "jahiatemplates.Co=
rporate_portal_templates_v2", null, out);
+ } =
+ out.println("</div>");
+ if (isFirst) {
+ out.print("</div>");
+ }
+ =
+ // displays sub links
+ if (leftLink !=3D null && jData.gui().isPageInPath(leftLin=
k.getID())) {
+ getPageSubTree(jData , rootPageId, leftLink.getID(),
+ pageContext,level+1,false,isNotALink,logger);
+ } =
}
if (editMode && isNotALink) {
int mylevel =3D level + 1;
Modified: trunk/src/jsp/chapter1/scriptlet/maincontent_scriptlet.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/scriptlet/maincontent_scriptlet.inc&rev=3D6&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/maincontent_scriptlet.inc (original)
+++ trunk/src/jsp/chapter1/scriptlet/maincontent_scriptlet.inc Thu Sep 6 1=
5:32:44 2007
@@ -1,15 +1,15 @@
<%
-jData.containers().declareField( "title", "Title", FieldTypes.SMALLTEXT, "=
" );
-jData.containers().declareField( "content", "Content", FieldTypes.BIGTEXT,=
"" );
-jData.containers().declareField( "image", "Image", FieldTypes.FILE, "" );
-jData.containers().declareField( "align", "Image align", FieldTypes.SMALLT=
EXT_SHARED_LANG, "<jahia_multivalue[left:right:default]>left" );
-jData.containers().declareField( "date", "Date", FieldTypes.DATE, "<jahia_=
calendar[dd mon yyyy / HH:MM]>" );
+jData.containers().declareField( "contentTitle", "Title", FieldTypes.SMALL=
TEXT, "" );
+jData.containers().declareField( "contentText", "Content", FieldTypes.BIGT=
EXT, "" );
+jData.containers().declareField( "contentImage", "Image", FieldTypes.FILE,=
"" );
+jData.containers().declareField( "contentAlign", "Image align", FieldTypes=
.SMALLTEXT_SHARED_LANG, "<jahia_multivalue[left:right:default]>left" );
+jData.containers().declareField( "contentDate", "Date", FieldTypes.DATE, "=
<jahia_calendar[dd MMM yyyy / HH:mm]>" );
Vector mainContentFields =3D new Vector();
-mainContentFields.add( "title" );
-mainContentFields.add( "content" );
-mainContentFields.add( "image" );
-mainContentFields.add( "align" );
-mainContentFields.add( "date" );
+mainContentFields.add( "contentTitle" );
+mainContentFields.add( "contentText" );
+mainContentFields.add( "contentImage" );
+mainContentFields.add( "contentAlign" );
+mainContentFields.add( "contentDate" );
jData.containers().declareContainer( "mainContentContainerList", "Main Con=
ten", mainContentFields );
%>
<!-- end main content declaration -->
@@ -25,11 +25,11 @@
while (mainContentContainerEnum.hasMoreElements()) {
JahiaContainer mainContentContainer =3D (JahiaContainer)mainContentCon=
tainerEnum.nextElement();
ContainerBean mainContentContainerBean =3D new ContainerBean(mainConte=
ntContainer,jParams);
- String title =3D mainContentContainer.getFieldValue("title","");
- String content =3D mainContentContainer.getFieldValue("content","");
- JahiaFileField image =3D (JahiaFileField) mainContentContainer.getFiel=
dObject("image");
- String align =3D mainContentContainer.getFieldValue("align","left");
- String date =3D mainContentContainer.getFieldValue("date","");
+ String title =3D mainContentContainer.getFieldValue("contentTitle","");
+ String content =3D mainContentContainer.getFieldValue("contentText",""=
);
+ JahiaFileField image =3D (JahiaFileField) mainContentContainer.getFiel=
dObject("contentImage");
+ String align =3D mainContentContainer.getFieldValue("contentAlign","le=
ft");
+ String date =3D mainContentContainer.getFieldValue("contentDate","");
=
jData.gui().html().drawBeginActionMenu(mainContentContainerBean , null=
, null,
true, "", "jahiatemplates.Doc_templates", null, out);
Modified: trunk/src/jsp/chapter1/taglib/maincontent.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/taglib/maincontent.inc&rev=3D6&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/maincontent.inc (original)
+++ trunk/src/jsp/chapter1/taglib/maincontent.inc Thu Sep 6 15:32:44 2007
@@ -3,11 +3,11 @@
%>
<content:declareContainerList name=3D'mainContentContainerList' title=3D'M=
ain Content'>
<content:declareContainer>
- <content:declareField name=3D'title' title=3D'Title' type=3D'SmallText=
'/>
- <content:declareField name=3D'content' title=3D'Content' type=3D'BigTe=
xt'/>
- <content:declareField name=3D'image' title=3D'Image' type=3D'File'/>
- <content:declareField name=3D'align' title=3D'Image align' type=3D'Sha=
redSmallText' value=3D'<jahia_multivalue[left:right:default]>left'/>
- <content:declareField name=3D'date' title=3D'Date' type=3D'Date' value=
=3D'<jahia_calendar[dd mon yyyy / HH:MM]>'/>
+ <content:declareField name=3D'contentTitle' title=3D'Title' type=3D'Sm=
allText'/>
+ <content:declareField name=3D'contentText' title=3D'Content' type=3D'B=
igText'/>
+ <content:declareField name=3D'contentImage' title=3D'Image' type=3D'Fi=
le'/>
+ <content:declareField name=3D'contentAlign' title=3D'Image align' type=
=3D'SharedSmallText' value=3D'<jahia_multivalue[left:right:default]>left'/>
+ <content:declareField name=3D'contentDate' title=3D'Date' type=3D'Date=
' value=3D'<jahia_calendar[dd MMM yyyy / HH:mm]>'/>
</content:declareContainer>
</content:declareContainerList>
=
@@ -18,16 +18,16 @@
<jahiaHtml:actionMenu name=3D"mainContentContainerList" namePostFix=3D"" r=
esourceBundle=3D"jahiatemplates.Doc_templates">
<content:container id=3D'mainContentContainer'>
<jahiaHtml:actionMenu name=3D"mainContentContainer" namePostFix=3D"" r=
esourceBundle=3D"jahiatemplates.Doc_templates">
- <content:textField name=3D'title' display=3D"false" valueId=3D"title" =
defaultValue=3D"" diffActive=3D"true"/>
+ <content:textField name=3D'contentTitle' display=3D"false" valueId=3D"=
title" defaultValue=3D"" diffActive=3D"true"/>
<logic:notEmpty name=3D'title'>
<h2><bean:write name=3D'title' filter=3D'false'/></h2>
</logic:notEmpty>
<p>
<logic:present name=3D'mainContentContainer' property=3D'field(ima=
ge)'>
- <bean:define id=3D"image" name=3D"mainContentContainer" proper=
ty=3D'field(image).object'/>
+ <bean:define id=3D"image" name=3D"mainContentContainer" proper=
ty=3D'field(contentImage).object'/>
<logic:present name=3D"image">
<logic:equal name=3D"image" property=3D"image" value=3D"tr=
ue">
- <content:textField name=3D'align' display=3D"false" valueI=
d=3D"align" defaultValue=3D""/>
+ <content:textField name=3D'contentAlign' display=3D"false"=
valueId=3D"align" defaultValue=3D""/>
<img src=3D"<bean:write name=3D'image' property=3D'dow=
nloadUrl'/>"
border=3D"0"
alt=3D"<bean:write name=3D'image' property=3D'fil=
eFieldTitle' filter=3D'false'/>"
@@ -41,8 +41,8 @@
</logic:equal>
</logic:present>
</logic:present>
- <content:bigTextField name=3D'content' defaultValue=3D"" diffActiv=
e=3D"true"/>
- <content:textField name=3D'date' display=3D"false" valueId=3D"date=
" defaultValue=3D"" diffActive=3D"true"/>
+ <content:bigTextField name=3D'contentText' defaultValue=3D"" diffA=
ctive=3D"true"/>
+ <content:textField name=3D'contentDate' display=3D"false" valueId=
=3D"date" defaultValue=3D"" diffActive=3D"true"/>
<logic:notEmpty name=3D'date'>
<br/><em><bean:write name=3D'date' filter=3D'false'/></em>
</logic:notEmpty>
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=3D6&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 15:32:44 2007
@@ -16,7 +16,7 @@
<div class=3D'isFirst'>
</logic:equal>
=
- <div class=3D'level<%=3Drequest.getParameter("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"> =
@@ -25,7 +25,7 @@
</logic:equal>
</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"contentObject.marke=
dForDelete" value=3D"true">
@@ -43,18 +43,17 @@
<logic:empty name=3D"leftLink">
n.d.
</logic:empty>
- =
- <logic:equal name=3D"currentRequest" property=3D"editMode" 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:empty>
- </logic:equal>
</a>
+ <logic:equal name=3D"currentRequest" property=3D"editMode" 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"f=
alse"/>
+ </logic:empty>
+ </logic:equal> =
</div>
=
<logic:equal parameter=3D"isFirst" value=3D"true"> =
Modified: trunk/src/jsp/chapter1/template_el-jstl.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/template_el-jstl.jsp&rev=3D6&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_el-jstl.jsp (original)
+++ trunk/src/jsp/chapter1/template_el-jstl.jsp Thu Sep 6 15:32:44 2007
@@ -26,12 +26,23 @@
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
- <div class=3D"maincontent">
- <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
- <%@ include file=3D"el-jstl/pagetitle_el-jstl.inc"%>
- <%@ include file=3D"el-jstl/maincontent_el-jstl.inc"%>
- <%@ include file=3D"el-jstl/bottom_el-jstl.inc"%>
- <content:logButton logoutTitle=3D''/>
+ <div class=3D"mainContent">
+ <div class=3D"commonDesc">
+ <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
+ <%@ include file=3D"el-jstl/pagetitle_el-jstl.inc"%>
+ <%@ include file=3D"el-jstl/maincontent_el-jstl.inc"%>
+ </div> =
+ =
+ <c:if test=3D"${!empty params.workAreaJSP}">
+ <div class=3D"embeddedPart">
+ <jsp:include page=3D'<%=3Drequest.getParameter("workAreaJSP") =
%>' flush=3D'true'/>
+ </div> =
+ </c:if> =
+ =
+ <div class=3D"footer"> =
+ <%@ include file=3D"el-jstl/bottom_el-jstl.inc"%>
+ <content:logButton logoutTitle=3D''/>
+ </div> =
</div>
</div>
</div> =
Modified: trunk/src/jsp/chapter1/template_javabean.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/template_javabean.jsp&rev=3D6&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_javabean.jsp (original)
+++ trunk/src/jsp/chapter1/template_javabean.jsp Thu Sep 6 15:32:44 2007
@@ -26,12 +26,23 @@
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
- <div class=3D"maincontent">
- <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
- <%@ include file=3D"taglib/pagetitle.inc"%>
- <%@ include file=3D"taglib/maincontent.inc"%>
- <%@ include file=3D"taglib/bottom.inc"%>
- <content:logButton logoutTitle=3D''/>
+ <div class=3D"mainContent">
+ <div class=3D"commonDesc">
+ <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
+ <%@ include file=3D"taglib/pagetitle.inc"%>
+ <%@ include file=3D"taglib/maincontent.inc"%>
+ </div> =
+ =
+ <logic:notEqual parameter=3D"workAreaJSP" value=3D"">
+ <div class=3D"embeddedPart">
+ <jsp:include page=3D'<%=3Drequest.getParameter("workAreaJSP") =
%>' flush=3D'true'/>
+ </div> =
+ </logic:notEqual> =
+ =
+ <div class=3D"footer"> =
+ <%@ include file=3D"taglib/bottom.inc"%>
+ <content:logButton logoutTitle=3D''/>
+ </div> =
</div>
</div>
</div> =
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=3D6&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 15:32:44 2007
@@ -30,12 +30,23 @@
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
- <div class=3D"maincontent">
- <%@ include file=3D"scriptlet/pagepath_scriptlet.inc"%>
- <%@ include file=3D"scriptlet/pagetitle_scriptlet.inc"%>
- <%@ include file=3D"scriptlet/maincontent_scriptlet.inc"%>
- <%@ include file=3D"scriptlet/bottom_scriptlet.inc"%>
- <%@ include file=3D"scriptlet/login_scriptlet.inc"%>
+ <div class=3D"mainContent">
+ <div class=3D"commonDesc">
+ <%@ include file=3D"scriptlet/pagepath_scriptlet.inc"%>
+ <%@ include file=3D"scriptlet/pagetitle_scriptlet.inc"%>
+ <%@ include file=3D"scriptlet/maincontent_scriptlet.inc"%>
+ </div> =
+ =
+ <%if (request.getParameter("workAreaJSP") !=3D null) {%>
+ <div class=3D"embeddedPart">
+ <jsp:include page=3D'<%=3Drequest.getParameter("workAreaJSP") =
%>' flush=3D'true'/>
+ </div> =
+ <%}%> =
+ =
+ <div class=3D"footer"> =
+ <%@ include file=3D"scriptlet/bottom_scriptlet.inc"%>
+ <%@ include file=3D"scriptlet/login_scriptlet.inc"%>
+ </div> =
</div>
</div>
</div> =
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=3D6&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 15:32:44 2007
@@ -26,12 +26,23 @@
</div>
</div>
<div id=3D"contentMiddleAndRight"> =
- <div class=3D"maincontent">
- <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
- <%@ include file=3D"taglib/pagetitle.inc"%>
- <%@ include file=3D"taglib/maincontent.inc"%>
- <%@ include file=3D"taglib/bottom.inc"%>
- <content:logButton logoutTitle=3D''/>
+ <div class=3D"mainContent">
+ <div class=3D"commonDesc">
+ <content:currentPagePath separator=3D' > ' maxchar=3D'40'/>
+ <%@ include file=3D"taglib/pagetitle.inc"%>
+ <%@ include file=3D"taglib/maincontent.inc"%>
+ </div> =
+ =
+ <logic:notEqual parameter=3D"workAreaJSP" value=3D"">
+ <div class=3D"embeddedPart">
+ <jsp:include page=3D'<%=3Drequest.getParameter("workAreaJSP") =
%>' flush=3D'true'/>
+ </div> =
+ </logic:notEqual> =
+ =
+ <div class=3D"footer">
+ <%@ include file=3D"taglib/bottom.inc"%>
+ <content:logButton logoutTitle=3D''/>
+ </div> =
</div>
</div>
</div> =
Added: trunk/src/jsp/chapter2/allfields-wa.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter2/allfields-wa.jsp&rev=3D6&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/allfields-wa.jsp (added)
+++ trunk/src/jsp/chapter2/allfields-wa.jsp Thu Sep 6 15:32:44 2007
@@ -0,0 +1,103 @@
+<%@ include file=3D"..\chapter1\taglib\declarations.inc"%>
+
+<content:declareContainerList name=3D"testContainerList" title=3D"Test con=
tainer list">
+ <content:declareContainer>
+ <content:declareField name=3D"Integer" title=3D"Integer" type=3D"I=
nteger" value=3D""/>
+ <content:declareField name=3D"SmallText" title=3D"SmallText" type=
=3D"SmallText" value=3D""/>
+ <content:declareField name=3D"BigText" title=3D"BigText" type=3D"B=
igText" value=3D""/>
+ <content:declareField name=3D"Date" title=3D"Date" type=3D"Date" v=
alue=3D"<jahia_calendar[dd.MM.yyyy HH:mm]>"/>
+ <content:declareField name=3D"Page" title=3D"Page" type=3D"Page" v=
alue=3D""/>
+ <content:declareField name=3D"File" title=3D"File" type=3D"File" v=
alue=3D""/>
+ <content:declareField name=3D"Float" title=3D"Float" type=3D"Float=
" value=3D""/>
+ <content:declareField name=3D"Boolean" title=3D"Boolean" type=3D"B=
oolean" value=3D"true"/>
+ <content:declareField name=3D"color" title=3D"Color" type=3D"Small=
Text" value=3D"#ffffff"/>
+ <content:declareField name=3D"SharedSmallText" title=3D"SharedSmal=
lText" type=3D"SharedSmallText" value=3D""/>
+ <content:declareField name=3D"SharedSmallText_single" title=3D"Sha=
redSmallText_single" type=3D"SharedSmallText" value=3D"<jahia_multivalue_si=
ngle[val1:val2:val3]>val2"/>
+ <content:declareField name=3D"SharedSmallText_multiple" title=3D"S=
haredSmallText_multiple" type=3D"SharedSmallText" value=3D"<jahia_multivalu=
e_multiple[val1:val2:val3]>val2"/>
+ </content:declareContainer>
+</content:declareContainerList>
+
+<content:containerList name=3D"testContainerList" id=3D"testContainerList">
+ <content:container id=3D"testContainer">
+ <jahiaHtml:actionMenu name=3D"testContainer" namePostFix=3D"" useF=
ieldSet=3D"true"
+ resourceBundle=3D"jahiatemplates.Doc_templates">
+
+ <strong>Integer</strong>:<br/>
+ <content:integerField name=3D'Integer'/>
+ <br/><br/>
+
+ <strong>SmallText</strong>:<br/>
+ <content:textField name=3D'SmallText'/>
+ <br/><br/>
+
+ <strong>BigText</strong>:<br/>
+ <content:bigTextField name=3D'BigText'/>
+ <br/><br/>
+
+ <strong>Date</strong>:<br/>
+ <content:dateField name=3D'Date'/>
+ <br/><br/>
+
+ <strong>Page</strong>:<br/>
+ <content:pageField valueId=3D"Page" name=3D'Page'>
+ <logic:notEmpty name=3D"Page">
+ <a href=3D"<bean:write name=3D'Page' property=3D'url'/>">
+ <bean:write name=3D"Page" property=3D"title" filter=3D=
"false"/>
+ </a>
+ </logic:notEmpty>
+ </content:pageField>
+ <br/><br/>
+
+ <strong>File</strong>:<br/>
+ <content:fileField name=3D'File' valueId=3D'FileField' id=3D'FileB=
ean'/>
+ <logic:present name=3D'FileField'>
+ <logic:equal name=3D'FileField' property=3D'downloadable' valu=
e=3D'true'>
+ <logic:equal name=3D'FileField' property=3D'image' value=
=3D'true'>
+ <img border=3D"0" width=3D"112" height=3D"83"
+ src=3D"<bean:write name=3D'FileField' property=3D=
'downloadUrl'/>"
+ alt=3D"<bean:write name=3D'FileField' property=3D=
'fileFieldTitle'/>"/>
+ </logic:equal>
+ <logic:equal name=3D'FileField' property=3D'image' value=
=3D'false'>
+ <a href=3D"<bean:write name=3D'FileField' property=3D'=
downloadUrl'/>">
+ <bean:write name=3D'FileField' property=3D'fileFi=
eldTitle'/>
+ </a>
+ </logic:equal>
+ </logic:equal>
+ </logic:present>
+ <br/><br/>
+
+ <strong>Float</strong>:<br/>
+ <content:floatField name=3D'Float'/>
+ <br/><br/>
+
+ <strong>Boolean</strong>:<br/>
+ <content:booleanField name=3D'Boolean'/>
+ <br/><br/>
+
+ <strong>Boolean</strong>:<br/>
+ <content:booleanField name=3D'Boolean'/>
+ <br/><br/>
+
+ <strong>Color</strong>:<br/>
+ <content:colorField name=3D'color'/>
+ <br/><br/>
+
+ <strong>SharedSmallText</strong>:<br/>
+ <content:sharedLangTextField name=3D'SharedSmallText'/>
+ <br/><br/>
+
+ <strong>SharedSmallText_single</strong>:<br/>
+ <content:sharedLangTextField name=3D'SharedSmallText_single'/>
+ <br/><br/>
+
+ <strong>SharedSmallText_multiple</strong>:<br/>
+ <content:sharedLangTextField name=3D'SharedSmallText_multiple'/>
+ <br/><br/>
+
+ </jahiaHtml:actionMenu>
+ <br/>
+ </content:container>
+
+ <jahiaHtml:actionMenu name=3D"testContainerList" namePostFix=3D"" useF=
ieldSet=3D"false"
+ resourceBundle=3D"jahiatemplates.Doc_templates"/>
+</content:containerList>
\ No newline at end of file
Copied: trunk/src/jsp/chapter2/allfields.jsp (from r2, trunk/src/jsp/chapte=
r2/fs.inc)
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfields.jsp&rev=3D6&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.inc (original)
+++ trunk/src/jsp/chapter2/allfields.jsp Thu Sep 6 15:32:44 2007
@@ -1,101 +1,3 @@
-<content:declareContainerList name=3D"testContainerList" title=3D"Test con=
tainer list">
- <content:declareContainer>
- <content:declareField name=3D"Integer" title=3D"Integer" type=3D"I=
nteger" value=3D""/>
- <content:declareField name=3D"SmallText" title=3D"SmallText" type=
=3D"SmallText" value=3D""/>
- <content:declareField name=3D"BigText" title=3D"BigText" type=3D"B=
igText" value=3D""/>
- <content:declareField name=3D"Date" title=3D"Date" type=3D"Date" v=
alue=3D"<jahia_calendar[dd.MM.yyyy HH:mm]>"/>
- <content:declareField name=3D"Page" title=3D"Page" type=3D"Page" v=
alue=3D""/>
- <content:declareField name=3D"File" title=3D"File" type=3D"File" v=
alue=3D""/>
- <content:declareField name=3D"Float" title=3D"Float" type=3D"Float=
" value=3D""/>
- <content:declareField name=3D"Boolean" title=3D"Boolean" type=3D"B=
oolean" value=3D"true"/>
- <content:declareField name=3D"color" title=3D"Color" type=3D"Small=
Text" value=3D"#ffffff"/>
- <content:declareField name=3D"SharedSmallText" title=3D"SharedSmal=
lText" type=3D"SharedSmallText" value=3D""/>
- <content:declareField name=3D"SharedSmallText_single" title=3D"Sha=
redSmallText_single" type=3D"SharedSmallText" value=3D"<jahia_multivalue_si=
ngle[val1:val2:val3]>val2"/>
- <content:declareField name=3D"SharedSmallText_multiple" title=3D"S=
haredSmallText_multiple" type=3D"SharedSmallText" value=3D"<jahia_multivalu=
e_multiple[val1:val2:val3]>val2"/>
- </content:declareContainer>
-</content:declareContainerList>
-
-<content:containerList name=3D"testContainerList" id=3D"testContainerList">
- <content:container id=3D"testContainer">
- <jahiaHtml:actionMenu name=3D"testContainer" namePostFix=3D"" useF=
ieldSet=3D"true"
- resourceBundle=3D"jahiatemplates.Doc_templates">
-
- <strong>Integer</strong>:<br/>
- <content:integerField name=3D'Integer'/>
- <br/><br/>
-
- <strong>SmallText</strong>:<br/>
- <content:textField name=3D'SmallText'/>
- <br/><br/>
-
- <strong>BigText</strong>:<br/>
- <content:bigTextField name=3D'BigText'/>
- <br/><br/>
-
- <strong>Date</strong>:<br/>
- <content:dateField name=3D'Date'/>
- <br/><br/>
-
- <strong>Page</strong>:<br/>
- <content:pageField valueId=3D"Page" name=3D'Page'>
- <logic:notEmpty name=3D"Page">
- <a href=3D"<bean:write name=3D'Page' property=3D'url'/>">
- <bean:write name=3D"Page" property=3D"title" filter=3D=
"false"/>
- </a>
- </logic:notEmpty>
- </content:pageField>
- <br/><br/>
-
- <strong>File</strong>:<br/>
- <content:fileField name=3D'File' valueId=3D'FileField' id=3D'FileB=
ean'/>
- <logic:present name=3D'FileField'>
- <logic:equal name=3D'FileField' property=3D'downloadable' valu=
e=3D'true'>
- <logic:equal name=3D'FileField' property=3D'image' value=
=3D'true'>
- <img border=3D"0" width=3D"112" height=3D"83"
- src=3D"<bean:write name=3D'FileField' property=3D=
'downloadUrl'/>"
- alt=3D"<bean:write name=3D'FileField' property=3D=
'fileFieldTitle'/>"/>
- </logic:equal>
- <logic:equal name=3D'FileField' property=3D'image' value=
=3D'false'>
- <a href=3D"<bean:write name=3D'FileField' property=3D'=
downloadUrl'/>">
- <bean:write name=3D'FileField' property=3D'fileFi=
eldTitle'/>
- </a>
- </logic:equal>
- </logic:equal>
- </logic:present>
- <br/><br/>
-
- <strong>Float</strong>:<br/>
- <content:floatField name=3D'Float'/>
- <br/><br/>
-
- <strong>Boolean</strong>:<br/>
- <content:booleanField name=3D'Boolean'/>
- <br/><br/>
-
- <strong>Boolean</strong>:<br/>
- <content:booleanField name=3D'Boolean'/>
- <br/><br/>
-
- <strong>Color</strong>:<br/>
- <content:colorField name=3D'color'/>
- <br/><br/>
-
- <strong>SharedSmallText</strong>:<br/>
- <content:sharedLangTextField name=3D'SharedSmallText'/>
- <br/><br/>
-
- <strong>SharedSmallText_single</strong>:<br/>
- <content:sharedLangTextField name=3D'SharedSmallText_single'/>
- <br/><br/>
-
- <strong>SharedSmallText_multiple</strong>:<br/>
- <content:sharedLangTextField name=3D'SharedSmallText_multiple'/>
- <br/><br/>
-
- </jahiaHtml:actionMenu>
- <br/>
- </content:container>
-
- <jahiaHtml:actionMenu name=3D"testContainerList" namePostFix=3D"" useF=
ieldSet=3D"false"
- resourceBundle=3D"jahiatemplates.Doc_templates"/>
-</content:containerList>
\ No newline at end of file
+<jsp:include page=3D"../chapter1/template_taglib.jsp" flush=3D"true">
+ <jsp:param name=3D"workAreaJSP" value=3D'../chapter2/allfields-wa.jsp'/>
+</jsp:include>
\ No newline at end of file
Modified: trunk/src/jsp/common/css/web.css
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/common/=
css/web.css&rev=3D6&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/common/css/web.css (original)
+++ trunk/src/jsp/common/css/web.css Thu Sep 6 15:32:44 2007
@@ -92,19 +92,14 @@
/* NAV */
/* ------------------------------------------------ */
#navigation {
- width: 240px;
- background: #f1efe2 url(../img/nav_top.gif) no-repeat right top;
- margin-top:15px;
- padding-top:27px;
-}
+ background: #f1efe2 url(../img/nav_top.gif) no-repeat right top;
+ }
#navigation .navdeco {
background: #f1efe2 url(../img/nav_bottom.gif) no-repeat right bottom;
padding-bottom:27px;
}
#navigation .shortcuts {
padding:10px;
- width: 220px !important;
- width/**/:240px;
color:white;
}
#navigation h1 {
@@ -217,3 +212,7 @@
#navigation div.level7 a.current {
font-weight:bold;
}
+
+.embeddedPart {
+ padding-top:18px;
+}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
