Author: bpapez
Date: Wed Sep 12 14:04:12 2007
New Revision: 9
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D9&repname=3Dd=
oc_templates
Log:
Enhance "All fields" template and add 4 levels of subcontainers
Modified:
trunk/src/java/jahiatemplates/Doc_templates.properties
trunk/src/jsp/chapter1/el-jstl/bottom_el-jstl.inc
trunk/src/jsp/chapter1/el-jstl/declarations_el-jstl.inc
trunk/src/jsp/chapter1/el-jstl/maincontent_el-jstl.inc
trunk/src/jsp/chapter1/el-jstl/pagetitle_el-jstl.inc
trunk/src/jsp/chapter1/el-jstl/submenu_el-jstl.jsp
trunk/src/jsp/chapter1/scriptlet/bottom_scriptlet.inc
trunk/src/jsp/chapter1/scriptlet/maincontent_scriptlet.inc
trunk/src/jsp/chapter1/taglib/bottom.inc
trunk/src/jsp/chapter1/taglib/declarations.inc
trunk/src/jsp/chapter1/taglib/maincontent.inc
trunk/src/jsp/chapter1/template_el-jstl.jsp
trunk/src/jsp/chapter2/allfields/display.inc
trunk/src/jsp/chapter2/allfields/workarea.jsp
trunk/src/jsp/common/css/web.css
trunk/src/jsp/templates.xml
Modified: trunk/src/java/jahiatemplates/Doc_templates.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/java/jahiat=
emplates/Doc_templates.properties&rev=3D9&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/java/jahiatemplates/Doc_templates.properties (original)
+++ trunk/src/java/jahiatemplates/Doc_templates.properties Wed Sep 12 14:04=
:12 2007
@@ -19,3 +19,18 @@
update.leftLinks =3D Settings
update.leftLink =3D Update
delete.leftLink =3D Delete
+
+containerListLevel =3D Container list level {0}
+SmallTextTitle =3D Small Text
+SharedSmallTextTitle =3D Shared Small Text
+SharedSmallTextSingleTitle =3D Shared Small Text Single
+SharedSmallTextMultipleTitle =3D Shared Small Text Multiple
+BigTextTitle =3D Big Text =
+IntegerTitle =3D Integer
+FloatTitle =3D Float
+BooleanTitle =3D Boolean
+ColorTitle =3D Color
+DateTitle =3D Date
+PageTitle =3D Page
+FileTitle =3D File
+ApplicationTitle =3D Application
Modified: trunk/src/jsp/chapter1/el-jstl/bottom_el-jstl.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/el-jstl/bottom_el-jstl.inc&rev=3D9&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/bottom_el-jstl.inc (original)
+++ trunk/src/jsp/chapter1/el-jstl/bottom_el-jstl.inc Wed Sep 12 14:04:12 2=
007
@@ -9,7 +9,7 @@
<content:containerList name=3D"containerListFooter"/>
</c:if>
=
-<p>
+<div class=3D"footer">
<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'/>
@@ -18,4 +18,4 @@
</c:if>
</content:container>
</content:absoluteContainerList>
-</p>
+</div>
Modified: trunk/src/jsp/chapter1/el-jstl/declarations_el-jstl.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/el-jstl/declarations_el-jstl.inc&rev=3D9&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/declarations_el-jstl.inc (original)
+++ trunk/src/jsp/chapter1/el-jstl/declarations_el-jstl.inc Wed Sep 12 14:0=
4:12 2007
@@ -21,6 +21,8 @@
<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
=
+<fmt:setBundle basename=3D"jahiatemplates.Doc_templates"/>
+
<%
Logger logger =3D Logger.getLogger(getClass());
JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.Jahi=
aData" );
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=3D9&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 Wed Sep 12 14:04=
:12 2007
@@ -20,15 +20,15 @@
<jahiaHtml:actionMenu name=3D"mainContentContainer" namePostFix=3D"" r=
esourceBundle=3D"jahiatemplates.Doc_templates">
<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>
+ <h2>${fn:escapeXml(title)}</h2>
</c:if>
- <p>
+ <div class=3D"mainContent">
<c:if test=3D"${!empty mainContentContainer.fields['image']}">
<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'contentAlign' display=3D"false"=
valueId=3D"align" defaultValue=3D""/>
<img src=3D"${image.downloadUrl}" border=3D"0"
- alt=3D"${image.fileFieldTitle}"
+ alt=3D"${fn:escapeXml(image.fileFieldTitle)}"
<c:if test=3D"${align !=3D null && align !=3D 'defaul=
t'}">
align=3D"${align}" class=3D"${align}"
</c:if>
@@ -38,9 +38,9 @@
<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>
+ <div class=3D"contentDate">${fn:escapeXml(date)}</div>
</c:if>
- </p>
+ </div>
</jahiaHtml:actionMenu>
</content:container>
</jahiaHtml:actionMenu>
Modified: trunk/src/jsp/chapter1/el-jstl/pagetitle_el-jstl.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/el-jstl/pagetitle_el-jstl.inc&rev=3D9&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/pagetitle_el-jstl.inc (original)
+++ trunk/src/jsp/chapter1/el-jstl/pagetitle_el-jstl.inc Wed Sep 12 14:04:1=
2 2007
@@ -1,5 +1,5 @@
<h1>
- ${currentPage.title}
+ ${fn:escapeXml(currentPage.title)}
<jahiaHtml:actionMenu name=3D"currentPage" namePostFix=3D"" resourceBu=
ndle=3D"jahiatemplates.Doc_templates" useFieldSet=3D"false">
</jahiaHtml:actionMenu>
</h1>
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=3D9&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 Wed Sep 12 14:04:12 =
2007
@@ -13,7 +13,7 @@
</c:if>
=
<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>'
+ <a href=3D'<c:if test=3D"${!empty leftLink}">${leftLink.url}</c:if>'
class=3D'${"link" + params.level)
<c:if test=3D"${!empty leftLink && leftLink.id =3D=3D currentP=
age.id}">
current
@@ -24,7 +24,7 @@
<c:if test=3D"${currentRequest.editMode && leftLink.contentObj=
ect.markedForDelete}">
<span class=3D'markForDelete'>
</c:if>
- ${leftLink.highLightDiffTitle}
+ ${fn:escapeXml(leftLink.highLightDiffTitle)}
<c:if test=3D"${currentRequest.editMode && leftLink.contentObj=
ect.markedForDelete}">
</span>
</c:if> =
Modified: trunk/src/jsp/chapter1/scriptlet/bottom_scriptlet.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
1/scriptlet/bottom_scriptlet.inc&rev=3D9&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/bottom_scriptlet.inc (original)
+++ trunk/src/jsp/chapter1/scriptlet/bottom_scriptlet.inc Wed Sep 12 14:04:=
12 2007
@@ -17,9 +17,9 @@
if (footerContainerListBean !=3D null && footerContainerListBean.getSize()=
> 0) {
FieldBean footerBean =3D footerContainerBean.getField("footer");
%>
- <p>
+ <div class=3D"footer">
<%=3DfooterBean.getValue()%>
- </p>
+ </div>
<%
}
if (jData.gui().getLevel() =3D=3D 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=3D9&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 Wed Sep 12 1=
4:04:12 2007
@@ -38,7 +38,7 @@
%><h2><%=3Dtitle%></h2><%
}
%>
- <p>
+ <div class=3D"maincontent">
<%
if (image !=3D null) {
if (image.isImage()) {
@@ -59,10 +59,10 @@
<%=3Dcontent%>
<%
if (! "".equals(date)){
- %><br/><em><%=3Ddate%></em><%
+ %><div class=3D"contentDate"><%=3Ddate%></div><%
}
%>
- </p>
+ </div>
<%
jData.gui().html().drawEndActionMenu(mainContentContainerBean , null, =
null,
true, "", "jahiatemplates.Doc_templates", null, out);
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=3D9&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 Wed Sep 12 14:04:12 2007
@@ -9,7 +9,7 @@
<content:containerList name=3D"containerListFooter"/>
</logic:equal> =
=
-<p>
+<div class=3D"footer">
<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'/>
@@ -18,4 +18,4 @@
</logic:equal>
</content:container>
</content:absoluteContainerList>
-</p>
+</div>
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=3D9&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 Wed Sep 12 14:04:12 2007
@@ -17,9 +17,13 @@
=
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %>
<%@ taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/c" prefix=3D"c" %>
+<%@ taglib uri=3D"/WEB-INF/etc/taglibs/jstl/fmt" prefix=3D"fmt" %>
<%@ taglib uri=3D"jahiaHtmlLib" prefix=3D"jahiaHtml" %>
<%@ taglib uri=3D"contentLib" prefix=3D"content" %>
=
+<fmt:setBundle basename=3D"jahiatemplates.Doc_templates"/>
+
<%
Logger logger =3D Logger.getLogger(getClass());
JahiaData jData =3D (JahiaData) request.getAttribute( "org.jahia.data.Jahi=
aData" );
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=3D9&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 Wed Sep 12 14:04:12 2007
@@ -22,7 +22,7 @@
<logic:notEmpty name=3D'title'>
<h2><bean:write name=3D'title' filter=3D'false'/></h2>
</logic:notEmpty>
- <p>
+ <div class=3D"mainContent">
<logic:present name=3D'mainContentContainer' property=3D'field(ima=
ge)'>
<bean:define id=3D"image" name=3D"mainContentContainer" proper=
ty=3D'field(contentImage).object'/>
<logic:present name=3D"image">
@@ -44,9 +44,9 @@
<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>
+ <div class=3D"contentDate"><bean:write name=3D'date' filter=3D=
'false'/></div>
</logic:notEmpty>
- </p>
+ </div>
</jahiaHtml:actionMenu>
</content:container>
</jahiaHtml:actionMenu>
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=3D9&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 Wed Sep 12 14:04:12 2007
@@ -4,7 +4,7 @@
<head>
<%@ include file=3D"el-jstl/declarations_el-jstl.inc"%>
<%@ include file=3D"el-jstl/top_el-jstl.inc"%> =
- <title>${currentPage.title}</title>
+ <title>${fn:escapeXml(currentPage.title)}</title>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-=
8" />
</head>
<body>
Modified: trunk/src/jsp/chapter2/allfields/display.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfields/display.inc&rev=3D9&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/display.inc (original)
+++ trunk/src/jsp/chapter2/allfields/display.inc Wed Sep 12 14:04:12 2007
@@ -1,71 +1,48 @@
-<strong>SmallText</strong>:<br/>
-<content:textField name=3D'SmallText'/>
-<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/>
-
-<strong>BigText</strong>:<br/>
-<content:bigTextField name=3D'BigText'/>
-<br/><br/>
-
-<strong>Integer</strong>:<br/>
-<content:integerField name=3D'Integer'/>
-<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>Color</strong>:<br/>
-<content:colorField name=3D'Color'/>
-<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"/>
+<div class=3D"fieldTitle"><fmt:message key=3D"SmallTextTitle"/>:</div>
+<div class=3D"fieldValue"><content:textField name=3D'SmallText'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"SharedSmallTextTitle"/>:</di=
v>
+<div class=3D"fieldValue"><content:sharedLangTextField name=3D'SharedSmall=
Text'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"SharedSmallTextSingleTitle"/=
>:</div>
+<div class=3D"fieldValue"><content:sharedLangTextField name=3D'SharedSmal=
lText_single'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"SharedSmallTextMultipleTitle=
"/>:</div>
+<div class=3D"fieldValue"><content:sharedLangTextField name=3D'SharedSmal=
lText_multiple'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"BigTextTitle"/>:</div>
+<div class=3D"fieldValue"><content:bigTextField name=3D'BigText'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"IntegerTitle"/>:</div>
+<div class=3D"fieldValue"><content:integerField name=3D'Integer'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"FloatTitle"/>:</div>
+<div class=3D"fieldValue"><content:floatField name=3D'Float'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"BooleanTitle"/>:</div>
+<div class=3D"fieldValue"><content:booleanField name=3D'Boolean'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"ColorTitle"/>:</div>
+<div class=3D"fieldValue"><content:colorField name=3D'Color'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"DateTitle"/>:</div>
+<div class=3D"fieldValue"><content:dateField name=3D'Date'/></div>
+<div class=3D"fieldTitle"><fmt:message key=3D"PageTitle"/>:</div>
+<div class=3D"fieldValue"><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'FileBean'/>
-<logic:present name=3D'FileField'>
- <logic:equal name=3D'FileField' property=3D'downloadable' value=3D'tru=
e'>
- <logic:equal name=3D'FileField' property=3D'image' value=3D'true'>
+</div>
+<div class=3D"fieldTitle"><fmt:message key=3D"FileTitle"/>:</div>
+<div class=3D"fieldValue"><content:fileField name=3D'File' valueId=3D'file=
'/>
+<logic:present name=3D'file'>
+ <logic:equal name=3D'file' property=3D'downloadable' value=3D'true'>
+ <logic:equal name=3D'file' 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'download=
Url'/>"
- alt=3D"<bean:write name=3D'FileField' property=3D'fileFiel=
dTitle'/>"/>
+ src=3D"<bean:write name=3D'file' property=3D'downloadUrl'/=
>"
+ alt=3D"<bean:write name=3D'file' property=3D'fileFieldTitl=
e'/>"/>
</logic:equal>
- <logic:equal name=3D'FileField' property=3D'image' value=3D'false'>
- <a href=3D"<bean:write name=3D'FileField' property=3D'download=
Url'/>">
- <bean:write name=3D'FileField' property=3D'fileFieldTitle=
'/>
+ <logic:equal name=3D'file' property=3D'image' value=3D'false'>
+ <a href=3D"<bean:write name=3D'file' property=3D'downloadUrl'/=
>">
+ <bean:write name=3D'file' property=3D'fileFieldTitle'/>
</a>
</logic:equal>
</logic:equal>
</logic:present>
-<br/><br/>
-
-<strong>Application</strong>:<br/>
-<content:applicationField valueId=3D"Application" name=3D'Application'/>
-<br/><br/>
+</div>
+<div class=3D"fieldTitle"><fmt:message key=3D"ApplicationTitle"/>:</div>
+<div class=3D"fieldValue"><content:applicationField valueId=3D"Application=
" name=3D'Application'/></div>
Modified: trunk/src/jsp/chapter2/allfields/workarea.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfields/workarea.jsp&rev=3D9&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/workarea.jsp (original)
+++ trunk/src/jsp/chapter2/allfields/workarea.jsp Wed Sep 12 14:04:12 2007
@@ -8,6 +8,18 @@
title=3D"Test subcontainer list">
<content:declareContainer> =
<%@ include file=3D"declaration.inc"%>
+ <content:declareContainerList name=3D'testSubcontainerList=
2'
+ title=3D"Test subcontainer list 2">
+ <content:declareContainer> =
+ <%@ include file=3D"declaration.inc"%>
+ <content:declareContainerList name=3D'testSubconta=
inerList3'
+ title=3D"Test subcontainer list 3">
+ <content:declareContainer> =
+ <%@ include file=3D"declaration.inc"%>
+ </content:declareContainer>
+ </content:declareContainerList>
+ </content:declareContainer>
+ </content:declareContainerList>
</content:declareContainer>
</content:declareContainerList>
</content:declareContainer>
@@ -17,21 +29,70 @@
<content:container id=3D"testContainer">
<jahiaHtml:actionMenu name=3D"testContainer" namePostFix=3D"" useF=
ieldSet=3D"true"
resourceBundle=3D"jahiatemplates.Doc_templates">
+ <div class=3D"level0">
+ <div class=3D"containerTitle">
+ <fmt:message key=3D"containerListLevel">
+ <fmt:param value=3D"0"/>
+ </fmt:message>
+ </div>
<%@ include file=3D"display.inc"%>
+ =
<content:containerList name=3D"testSubcontainerList" id=3D"tes=
tSubcontainerList">
<content:container id=3D"testSubcontainer">
<jahiaHtml:actionMenu name=3D"testSubcontainer" namePo=
stFix=3D"" useFieldSet=3D"true"
resourceBundle=3D"jahiatemplates.Doc_templates">
+ <div class=3D"level1"> =
+ <div class=3D"containerTitle">
+ <fmt:message key=3D"containerListLevel">
+ <fmt:param value=3D"1"/>
+ </fmt:message>
+ </div> =
<%@ include file=3D"display.inc"%>
+ =
+ <content:containerList name=3D"testSubcontainerLis=
t2" id=3D"testSubcontainerList">
+ <content:container id=3D"testSubcontainer2">
+ <div class=3D"level2">
+ <jahiaHtml:actionMenu name=3D"testSubconta=
iner2" namePostFix=3D"" useFieldSet=3D"true"
+ resourceBundle=3D"jahiatemplates.Doc_t=
emplates">
+ <div class=3D"containerTitle">
+ <fmt:message key=3D"containerListLev=
el">
+ <fmt:param value=3D"2"/>
+ </fmt:message>
+ </div> =
=
+ <%@ include file=3D"display.inc"%>
+ =
+ <content:containerList name=3D"testSub=
containerList3" id=3D"testSubcontainerList">
+ <content:container id=3D"testSubco=
ntainer3">
+ <jahiaHtml:actionMenu name=3D"=
testSubcontainer3" namePostFix=3D"" useFieldSet=3D"true"
+ resourceBundle=3D"jahiatem=
plates.Doc_templates">
+ <div class=3D"level3"> =
+ <div class=3D"containerTit=
le">
+ <fmt:message key=3D"cont=
ainerListLevel">
+ <fmt:param value=3D"3"=
/>
+ </fmt:message>
+ </div> =
=
+ <%@ include file=3D"displa=
y.inc"%>
+ </div> =
+ </jahiaHtml:actionMenu>
+ </content:container>
+ <jahiaHtml:actionMenu name=3D"test=
SubcontainerList3" namePostFix=3D"" useFieldSet=3D"false"
+ resourceBundle=3D"jahiatem=
plates.Doc_templates"/>
+ </content:containerList>
+ </div> =
=
+ </jahiaHtml:actionMenu>
+ </content:container>
+ <jahiaHtml:actionMenu name=3D"testSubcontainer=
List2" namePostFix=3D"" useFieldSet=3D"false"
+ resourceBundle=3D"jahiatemplates.Doc_t=
emplates"/>
+ </content:containerList>
+ </div> =
</jahiaHtml:actionMenu>
</content:container>
<jahiaHtml:actionMenu name=3D"testSubcontainerList" namePo=
stFix=3D"" useFieldSet=3D"false"
resourceBundle=3D"jahiatemplates.Doc_templates"/>
- </content:containerList> =
+ </content:containerList> =
+ </div> =
</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
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=3D9&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 Wed Sep 12 14:04:12 2007
@@ -214,5 +214,28 @@
}
=
.embeddedPart {
- padding-top:18px;
+ padding-top:18px;
}
+
+.fieldTitle {
+ font-weight:bold;
+}
+.fieldValue {
+ padding-bottom:10px;
+}
+.contentDate {
+ font-style:italic;
+}
+.containerTitle {
+ font-weight:bold;
+ padding-bottom:5px; =
+}
+.level1 {
+ padding-left: 10px;
+}
+.level2 {
+ padding-left: 20px;
+}
+.level3 {
+ padding-left: 30px;
+}
\ No newline at end of file
Modified: trunk/src/jsp/templates.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/templat=
es.xml&rev=3D9&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/templates.xml (original)
+++ trunk/src/jsp/templates.xml Wed Sep 12 14:04:12 2007
@@ -18,7 +18,7 @@
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">Simple-EL-JSTL)</parameter>
<parameter
name=3D"filename">chapter1/template_el-jstl.jsp</parameter>
- <parameter name=3D"display-name">Simple (EL & JSTL)</parameter>
+ <parameter name=3D"display-name">Simple (EL &
JSTL)</parameter>
</template>
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">Simple-JavaBean</parameter>
@@ -28,6 +28,6 @@
<template browsable=3D"1" visible=3D"1">
<parameter name=3D"name">All fields</parameter>
<parameter name=3D"filename">chapter2/allfields.jsp</parameter>
- <parameter name=3D"display-name">All fields (cont &
subcont)</parameter>
+ <parameter name=3D"display-name">All fields (cont &
subcont)</parame=
ter>
</template>
</tpml>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
