Author: bpapez
Date: Tue Sep 18 17:26:25 2007
New Revision: 13
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D13&repname=3D=
doc_templates
Log:
* add new "Default values" template (some examples not working yet - perhap=
s buggy)
* change the display JSP fragment to automatically iterate through all fiel=
ds of a container
Added:
trunk/src/jsp/chapter2/defaultvalues/
trunk/src/jsp/chapter2/defaultvalues.jsp
trunk/src/jsp/chapter2/defaultvalues/declaration.inc
trunk/src/jsp/chapter2/defaultvalues/workarea.jsp
trunk/src/jsp/common/css/web_css.xml
Modified:
trunk/src/java/jahiatemplates/Doc_templates.properties
trunk/src/jsp/chapter2/allfields.jsp
trunk/src/jsp/chapter2/allfields/declaration.inc
trunk/src/jsp/chapter2/allfields/workarea.jsp
trunk/src/jsp/chapter2/allfieldstwice/workarea.jsp
trunk/src/jsp/chapter2/conttype/workarea.jsp
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=3D13&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 Tue Sep 18 17:26=
:25 2007
@@ -58,6 +58,40 @@
FileTitle2nd =3D Second File
ApplicationTitle2nd =3D Second Application
=
+SmallTextMLandDef =3D Multiline SmallText with default value
+SharedSmallTextMLandDef =3D Multiline Shared SmallText with default value
+SmallTextRes =3D SmallText with resource bundle marker =
+SharedSmallTextRes =3D Shared SmallText with resource bundle marker
+BigTextRes =3D BigText with resource bundle marker
+IntegerRes =3D Integer with resource bundle marker
+FloatRes =3D Float with resource bundle marker
+SmallTextExpr =3D SmallText with expression marker (username)
+SharedSmallTextExpr =3D SharedSmallText with expression marker (username)
+SharedSmallTextExprStored =3D SharedSmallText with stored expression marke=
r (username)
+BigTextExpr =3D BigText with expression marker (Hello username)
+IntegerExpr =3D Integer with expression marker (pageID - readOnly)
+FloatExpr =3D Float with expression marker (site-ID * 10 + 2.5)
+BooleanExpr =3D Boolean with expression marker (isWindows-Client)
+DateExpr =3D Date with expression marker (Page cache expiration date)
+DateNow =3D Date now
+TimeNow =3D Time now
+HourNow =3D Hour now
+TomorrowSameTime =3D Tomorrow same time =
+YesterdaySameTime =3D Yesterday same time
+NewPageOnly =3D New page only
+NewSimplePageOnly =3D New Simple page only
+LinkPageOnly =3D Link page only
+LinkSimplePageOnly =3D Link Simple page only
+MovePageOnly =3D Move page only
+MoveSimplePageOnly =3D Move Simple page only
+ExternalLinkOnly =3D External link only
+LinkInternalPageOnlyKeepTitle =3D Internal link, keep title
+LinkOrMoveSimplePageOnly =3D Link or move Simple page only
+NewPageOrExternalLink =3D New page or external link
+NewOrMoveSimplePageOnly =3D New or move Simple page
+BlueDefColor =3D Blue default color
+HexBlueDefColor =3D Hexcode blue default color
+
testContainerList =3D Test container list
testSubcontainerList =3D Test sub-container list
testSubcontainerList2 =3D Test sub-container list 2
@@ -74,3 +108,8 @@
testSubcontainerListSingleMandatory =3D Test sub-container list single man=
datory
testSubcontainerList2SingleMandatory =3D Test sub-container list single ma=
ndatory 2
testSubcontainerList3SingleMandatory =3D Test sub-container list single ma=
ndatory 3
+
+product.001 =3D Smalltext Product from resource bundle
+product.002 =3D <b>Bigtext</b> Product from resource bundle
+product.003 =3D 50
+product.004 =3D 50.50
\ No newline at end of file
Modified: trunk/src/jsp/chapter2/allfields.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfields.jsp&rev=3D13&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.jsp (original)
+++ trunk/src/jsp/chapter2/allfields.jsp Tue Sep 18 17:26:25 2007
@@ -1,3 +1,3 @@
<jsp:include page=3D"../chapter1/template_taglib.jsp" flush=3D"true">
- <jsp:param name=3D"workAreaJSP" value=3D'../chapter2/allfields/workarea.=
jsp'/>
+ <jsp:param name=3D"workAreaJSP" value=3D'../chapter2/allfields/workarea.=
jsp'/> =
</jsp:include>
\ No newline at end of file
Modified: trunk/src/jsp/chapter2/allfields/declaration.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfields/declaration.inc&rev=3D13&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/declaration.inc (original)
+++ trunk/src/jsp/chapter2/allfields/declaration.inc Tue Sep 18 17:26:25 20=
07
@@ -1,7 +1,7 @@
<content:declareField name=3D'<%=3D"SmallText" + fieldSuffix%>' title=3D'<=
%=3D"SmallText" + fieldSuffix%>' type=3D"SmallText" value=3D""/>
<content:declareField name=3D'<%=3D"SharedSmallText" + fieldSuffix%>' titl=
e=3D'<%=3D"SharedSmallText" + fieldSuffix%>' type=3D"SharedSmallText" value=
=3D""/>
-<content:declareField name=3D'<%=3D"SharedSmallText_single" + fieldSuffix%=
>' title=3D'<%=3D"SharedSmallText_single" + fieldSuffix%>' type=3D"SharedSm=
allText" value=3D"<jahia_multivalue_single[val1:val2:val3]>val2"/>
-<content:declareField name=3D'<%=3D"SharedSmallText_multiple" + fieldSuffi=
x%>' title=3D'<%=3D"SharedSmallText_multiple" + fieldSuffix%>' type=3D"Shar=
edSmallText" value=3D"<jahia_multivalue_multiple[val1:val2:val3]>val2"/>
+<content:declareField name=3D'<%=3D"SharedSmallText_single" + fieldSuffix%=
>' title=3D'<%=3D"SharedSmallText_single" + fieldSuffix%>' type=3D"SharedSm=
allText" value=3D"<jahia_multivalue_single[val1:val2:val3]>"/>
+<content:declareField name=3D'<%=3D"SharedSmallText_multiple" + fieldSuffi=
x%>' title=3D'<%=3D"SharedSmallText_multiple" + fieldSuffix%>' type=3D"Shar=
edSmallText" value=3D"<jahia_multivalue_multiple[val1:val2:val3]>"/>
<content:declareField name=3D'<%=3D"BigText" + fieldSuffix%>' title=3D'<%=
=3D"BigText" + fieldSuffix%>' type=3D"BigText" value=3D""/>
<content:declareField name=3D'<%=3D"Integer" + fieldSuffix%>' title=3D'<%=
=3D"Integer" + fieldSuffix%>' type=3D"Integer" value=3D""/>
<content:declareField name=3D'<%=3D"Float" + fieldSuffix%>' title=3D'<%=3D=
"Float" + fieldSuffix%>' type=3D"Float" value=3D""/>
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=3D13&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 Tue Sep 18 17:26:25 2007
@@ -40,6 +40,7 @@
<fmt:param value=3D"0"/>
</fmt:message>
</div>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/=
> =
<%@ include file=3D"display.inc"%>
=
<content:containerList name=3D"testSubcontainerList" id=3D"tes=
tSubcontainerList">
@@ -51,7 +52,8 @@
<fmt:message key=3D"containerListLevel">
<fmt:param value=3D"1"/>
</fmt:message>
- </div> =
+ </div>
+ <bean:define id=3D"processedContainer" name=3D"tes=
tSubcontainer"/>
<%@ include file=3D"display.inc"%>
=
<content:containerList name=3D"testSubcontainerLis=
t2" id=3D"testSubcontainerList2">
@@ -63,7 +65,8 @@
<fmt:message key=3D"containerListLev=
el">
<fmt:param value=3D"2"/>
</fmt:message>
- </div> =
=
+ </div>
+ <bean:define id=3D"processedContainer"=
name=3D"testSubcontainer2"/> =
=
<%@ include file=3D"display.inc"%>
=
<content:containerList name=3D"testSub=
containerList3" id=3D"testSubcontainerList3">
@@ -75,7 +78,8 @@
<fmt:message key=3D"cont=
ainerListLevel">
<fmt:param value=3D"3"=
/>
</fmt:message>
- </div> =
=
+ </div> =
+ <bean:define id=3D"process=
edContainer" name=3D"testSubcontainer3"/>
<%@ include file=3D"displa=
y.inc"%>
</div> =
</jahiaHtml:actionMenu>
Modified: trunk/src/jsp/chapter2/allfieldstwice/workarea.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/allfieldstwice/workarea.jsp&rev=3D13&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/allfieldstwice/workarea.jsp (original)
+++ trunk/src/jsp/chapter2/allfieldstwice/workarea.jsp Tue Sep 18 17:26:25 =
2007
@@ -50,9 +50,7 @@
<fmt:param value=3D"0"/>
</fmt:message>
</div>
- <% fieldSuffix =3D ""; %>
- <%@ include file=3D"..\allfields\display.inc"%>
- <% fieldSuffix =3D "2nd"; %>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
=
<content:containerList name=3D"testSubcontainerList" id=3D"tes=
tSubcontainerList">
@@ -65,9 +63,7 @@
<fmt:param value=3D"1"/>
</fmt:message>
</div> =
- <% fieldSuffix =3D ""; %>
- <%@ include file=3D"..\allfields\display.inc"%>
- <% fieldSuffix =3D "2nd"; %>
+ <bean:define id=3D"processedContainer" name=3D"tes=
tSubcontainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
=
<content:containerList name=3D"testSubcontainerLis=
t2" id=3D"testSubcontainerList2">
@@ -80,9 +76,7 @@
<fmt:param value=3D"2"/>
</fmt:message>
</div> =
=
- <% fieldSuffix =3D ""; %>
- <%@ include file=3D"..\allfields\displ=
ay.inc"%>
- <% fieldSuffix =3D "2nd"; %>
+ <bean:define id=3D"processedContainer"=
name=3D"testSubcontainer2"/>
<%@ include file=3D"..\allfields\displ=
ay.inc"%>
=
<content:containerList name=3D"testSub=
containerList3" id=3D"testSubcontainerList3">
@@ -95,9 +89,7 @@
<fmt:param value=3D"3"=
/>
</fmt:message>
</div> =
=
- <% fieldSuffix =3D ""; %>
- <%@ include file=3D"..\all=
fields\display.inc"%>
- <% fieldSuffix =3D "2nd"; =
%>
+ <bean:define id=3D"process=
edContainer" name=3D"testSubcontainer3"/>
<%@ include file=3D"..\all=
fields\display.inc"%>
</div> =
</jahiaHtml:actionMenu>
Modified: trunk/src/jsp/chapter2/conttype/workarea.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/conttype/workarea.jsp&rev=3D13&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/conttype/workarea.jsp (original)
+++ trunk/src/jsp/chapter2/conttype/workarea.jsp Tue Sep 18 17:26:25 2007
@@ -81,6 +81,7 @@
<fmt:param value=3D"0"/>
</fmt:message>
</div>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
=
<content:containerList name=3D"testSubcontainerListSingle" id=
=3D"testSubcontainerListSingle">
@@ -93,6 +94,7 @@
<fmt:param value=3D"1"/>
</fmt:message>
</div> =
+ <bean:define id=3D"processedContainer" name=3D"tes=
tSubcontainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
=
<content:containerList name=3D"testSubcontainerLis=
t2Single" id=3D"testSubcontainerList2Single">
@@ -105,6 +107,7 @@
<fmt:param value=3D"2"/>
</fmt:message>
</div> =
+ <bean:define id=3D"processedContainer"=
name=3D"testSubcontainer2"/>
<%@ include file=3D"..\allfields\displ=
ay.inc"%>
</jahiaHtml:actionMenu>
</div> =
@@ -123,6 +126,7 @@
<fmt:param value=3D"2"/>
</fmt:message>
</div> =
+ <bean:define id=3D"processedContainer"=
name=3D"testSubcontainer2"/>
<%@ include file=3D"..\allfields\displ=
ay.inc"%>
</jahiaHtml:actionMenu>
</div> =
@@ -141,6 +145,7 @@
<fmt:param value=3D"2"/>
</fmt:message>
</div> =
+ <bean:define id=3D"processedContainer"=
name=3D"testSubcontainer2"/>
<%@ include file=3D"..\allfields\displ=
ay.inc"%>
</jahiaHtml:actionMenu>
</div> =
@@ -163,7 +168,8 @@
<fmt:message key=3D"containerListLevel">
<fmt:param value=3D"1"/>
</fmt:message>
- </div> =
+ </div> =
+ <bean:define id=3D"processedContainer" name=3D"tes=
tSubcontainer"/> =
<%@ include file=3D"..\allfields\display.inc"%>
</div> =
</jahiaHtml:actionMenu>
@@ -181,6 +187,7 @@
<fmt:param value=3D"1"/>
</fmt:message>
</div> =
+ <bean:define id=3D"processedContainer" name=3D"tes=
tSubcontainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
</div> =
</jahiaHtml:actionMenu>
@@ -204,6 +211,7 @@
<fmt:param value=3D"0"/>
</fmt:message>
</div>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
</div> =
</jahiaHtml:actionMenu>
@@ -221,6 +229,7 @@
<fmt:param value=3D"0"/>
</fmt:message>
</div>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/>
<%@ include file=3D"..\allfields\display.inc"%>
</div> =
</jahiaHtml:actionMenu>
Added: trunk/src/jsp/chapter2/defaultvalues.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter2/defaultvalues.jsp&rev=3D13&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/defaultvalues.jsp (added)
+++ trunk/src/jsp/chapter2/defaultvalues.jsp Tue Sep 18 17:26:25 2007
@@ -0,0 +1,3 @@
+<jsp:include page=3D"../chapter1/template_taglib.jsp" flush=3D"true">
+ <jsp:param name=3D"workAreaJSP" value=3D'../chapter2/defaultvalues/worka=
rea.jsp'/>
+</jsp:include>
\ No newline at end of file
Added: trunk/src/jsp/chapter2/defaultvalues/declaration.inc
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter2/defaultvalues/declaration.inc&rev=3D13&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/defaultvalues/declaration.inc (added)
+++ trunk/src/jsp/chapter2/defaultvalues/declaration.inc Tue Sep 18 17:26:2=
5 2007
@@ -0,0 +1,154 @@
+<[EMAIL PROTECTED]
import=3D"org.jahia.data.fields.JahiaFieldDefinitionProperties"%>
+<%
+jData.containers().declareFieldDefProp("SmallTextMLandDef",
+ JahiaFieldDefinitionProperties.FIELD_MULTILINE_SMALLTEXT_PROP,
+ "true");
+jData.containers().declareFieldDefProp("SharedSmallTextMLandDef",
+ JahiaFieldDefinitionProperties.FIELD_MULTILINE_SMALLTEXT_PROP,
+ "true");
+%>
+
+<content:declareField name=3D"SmallTextMLandDef" title=3D"SmallTextMLandDe=
f" =
+ titleKey=3D"SmallTextMLandDef" bundleKey=3D"DOC_TEMPLATES" =
+ type=3D"SmallText" value=3D"Default value SmallText"/>
+<content:declareField name=3D"SharedSmallTextMLandDef" title=3D"SharedSmal=
lTextMLandDef"
+ titleKey=3D"SharedSmallTextMLandDef" bundleKey=3D"DOC_TEMPLATES" =
+ type=3D"SharedSmallText" value=3D"Default value SharedSmallText"/>
+
+<content:declareField name=3D"SmallText_multivalue" =
+ title=3D"SmallText_multivalue with default value (hardcoded title)" =
+ type=3D"SmallText" value=3D"<jahia_multivalue[val1:val2:val3]>val1"/> =
=
+<content:declareField name=3D"SharedSmallText_single" =
+ title=3D"SharedSmallText_single with default value (hardcoded title)" =
+ type=3D"SharedSmallText" value=3D"<jahia_multivalue_single[val1:val2:v=
al3]>val2"/>
+<content:declareField name=3D"SharedSmallText_multiple" =
+ title=3D"SharedSmallText_multiple with default value (hardcoded title)=
" =
+ type=3D"SharedSmallText" value=3D"<jahia_multivalue_multiple[val1:val2=
:val3]>val2$$$val3"/>
+<content:declareField name=3D"Integer_single" =
+ title=3D"Integer_single with default value (hardcoded title)" =
+ type=3D"Integer" value=3D"<jahia_multivalue_single[1:5:10:15:20]>15"/>
+<content:declareField name=3D"Integer_multiple" =
+ title=3D"Integer_single with default value (hardcoded title)" =
+ type=3D"Integer" value=3D"<jahia_multivalue_multiple[1:5:10:15:20]>5$$=
$15"/> =
+<content:declareField name=3D"Float_single" =
+ title=3D"Float_single with default value (hardcoded title)" =
+ type=3D"Float" value=3D"<jahia_multivalue_single[1.5:2:2.5:3:3.5]>2.5"=
/>
+<content:declareField name=3D"Float_multiple" =
+ title=3D"Float_single with default value (hardcoded title)" =
+ type=3D"Float" value=3D"<jahia_multivalue_multiple[1:1.25:1.50:1.75:2.=
0]>1.25$$$1.5"/> =
+
+<content:declareField name=3D"SmallTextRes" title=3D"SmallTextRes" =
+ titleKey=3D"SmallTextRes" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SmallText" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.001" defa=
ult-value=3D"Hardcoded default"/>'/>
+<content:declareField name=3D"SharedSmallTextRes" title=3D"SharedSmallText=
Res" =
+ titleKey=3D"SharedSmallTextRes" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SharedSmallText" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.001" defa=
ult-value=3D"Hardcoded default"/>'/> =
+<content:declareField name=3D"BigTextRes" title=3D"BigTextRes" =
+ titleKey=3D"BigTextRes" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SharedSmallText" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.002" defa=
ult-value=3D"Hardcoded default"/>'/> =
+<content:declareField name=3D"IntegerRes" title=3D"IntegerRes" =
+ titleKey=3D"IntegerRes" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Integer" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.003" defa=
ult-value=3D"100"/>'/> =
+<content:declareField name=3D"FloatRes" title=3D"FloatRes" =
+ titleKey=3D"FloatRes" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Float" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.004" defa=
ult-value=3D"100.25"/>'/> =
+
+<content:declareField name=3D"SmallTextExpr" title=3D"SmallTextExpr" =
+ titleKey=3D"SmallTextExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SmallText" =
+ value=3D'<jahia-expression expr=3D"user/username" storeMarker=3D"false=
"/>'/>
+<content:declareField name=3D"SharedSmallTextExpr" title=3D"SharedSmallTex=
tExpr" =
+ titleKey=3D"SharedSmallTextExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SharedSmallText" =
+ value=3D'<jahia-expression expr=3D"user/username" storeMarker=3D"false=
"/>'/>
+<content:declareField name=3D"SharedSmallTextExprStored" title=3D"SharedSm=
allTextExprStored" =
+ titleKey=3D"SharedSmallTextExprStored" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SharedSmallText" =
+ value=3D'<jahia-expression expr=3D"user/username" storeMarker=3D"true"=
/>'/>
+<content:declareField name=3D"BigTextExpr" title=3D"BigTextExpr" =
+ titleKey=3D"BigTextExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"BigText" =
+ value=3D'Hello <jahia-expression expr=3D"user/username" storeMarker=3D=
"false"/>'/> =
+<content:declareField name=3D"IntegerExpr" title=3D"IntegerExpr" =
+ titleKey=3D"IntegerExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Integer" readOnly=3D"true"
+ value=3D'<jahia-expression expr=3D"currentPage/ID" storeMarker=3D"fals=
e"/>'/> =
+<content:declareField name=3D"FloatExpr" title=3D"FloatExpr" =
+ titleKey=3D"FloatExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Float"
+ value=3D'<jahia-expression expr=3D"currentSite/Id * 10 + 2.5" storeMar=
ker=3D"false"/>'/> =
+<content:declareField name=3D"BooleanExpr" title=3D"BooleanExpr" =
+ titleKey=3D"BooleanExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Boolean" =
+ value=3D'<jahia-expression expr=3D"currentRequest/windows" storeMarker=
=3D"false"/>'/> =
+<content:declareField name=3D"DateExpr" title=3D"DateExpr" =
+ titleKey=3D"DateExpr" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" =
+ value=3D'<jahia-expression expr=3D"currentRequest/paramBean/cacheExpir=
ationDate" storeMarker=3D"false"/>'/> =
+
+<content:declareField name=3D"DateNow" title=3D"DateNow" =
+ titleKey=3D"DateNow" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" =
+ value=3D'<jahia_calendar[dd.MMM.yyyy / HH:mm]>now'/> =
+<content:declareField name=3D"TimeNow" title=3D"TimeNow" =
+ titleKey=3D"TimeNow" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" =
+ value=3D'<jahia_calendar[HH:mm:ss,SSS]>now'/> =
+<content:declareField name=3D"HourNow" title=3D"HourNow" =
+ titleKey=3D"HourNow" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" =
+ value=3D"<jahia_calendar[hh 'o''clock' a, zzzz]>now"/> =
+<content:declareField name=3D"TomorrowSameTime" title=3D"TomorrowSameTime" =
+ titleKey=3D"TomorrowSameTime" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" readOnly=3D"true"
+ value=3D'<jahia_calendar[yyyyy.MMMMM.dd GGG hh:mm aaa]>now+1000*60*60*=
24'/> =
+<content:declareField name=3D"YesterdaySameTime" title=3D"YesterdaySameTim=
e" =
+ titleKey=3D"YesterdaySameTime" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Date" readOnly=3D"true"
+ value=3D'<jahia_calendar[yyyyy.MMMMM.dd GGG hh:mm aaa]>now-1000*60*60*=
24'/> =
+
+<content:declareField name=3D"NewPageOnly" title=3D"NewPageOnly" type=3D"P=
age"
+ titleKey=3D"NewPageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"pageonly"/>
+<content:declareField name=3D"NewSimplePageOnly" title=3D"NewSimplePageOnl=
y" type=3D"Page"
+ titleKey=3D"NewSimplePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"[Simple (Taglib), Simple (Scriptlet), Simple (JavaBean)]pageo=
nly"/>
+<content:declareField name=3D"LinkPageOnly" title=3D"LinkPageOnly" type=3D=
"Page"
+ titleKey=3D"LinkPageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"linkonly"/>
+<content:declareField name=3D"LinkSimplePageOnly" title=3D"LinkSimplePageO=
nly" type=3D"Page"
+ titleKey=3D"LinkSimplePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"[Simple (Taglib), Simple (Scriptlet), Simple (JavaBean)]linko=
nly"/>
+<content:declareField name=3D"MovePageOnly" title=3D"MovePageOnly" type=3D=
"Page"
+ titleKey=3D"MovePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"move"/>
+<content:declareField name=3D"MoveSimplePageOnly" title=3D"MoveSimplePageO=
nly" type=3D"Page"
+ titleKey=3D"MoveSimplePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"[Simple (Taglib), Simple (Scriptlet), Simple (JavaBean)]move"=
/> =
+<content:declareField name=3D"ExternalLinkOnly" title=3D"ExternalLinkOnly"=
type=3D"Page"
+ titleKey=3D"ExternalLinkOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"external"/>
+<content:declareField name=3D"LinkInternalPageOnlyKeepTitle" title=3D"Link=
InternalPageOnlyKeepTitle" type=3D"Page"
+ titleKey=3D"LinkInternalPageOnlyKeepTitle" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"linkonly,internal,notitleoverwrite"/>
+<content:declareField name=3D"LinkOrMoveSimplePageOnly" title=3D"LinkOrMov=
eSimplePageOnly" type=3D"Page"
+ titleKey=3D"LinkOrMoveSimplePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"[Simple (Taglib), Simple (Scriptlet), Simple (JavaBean)]linko=
nly,move"/>
+<content:declareField name=3D"NewPageOrExternalLink" title=3D"NewPageOrExt=
ernalLink" type=3D"Page"
+ titleKey=3D"NewPageOrExternalLink" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"pageonly,external"/>
+<content:declareField name=3D"NewOrMoveSimplePageOnly" title=3D"NewOrMoveS=
implePageOnly" type=3D"Page"
+ titleKey=3D"NewOrMoveSimplePageOnly" bundleKey=3D"DOC_TEMPLATES" =
+ value=3D"[Simple (Taglib), Simple (Scriptlet), Simple (JavaBean)]pageo=
nly,move"/>
+
+<content:declareField name=3D"BlueDefColor" title=3D"BlueDefColor" =
+ titleKey=3D"BlueDefColor" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"Color" value=3D"blue"/>
+<content:declareField name=3D"HexBlueDefColor" title=3D"HexBlueDefColor" =
+ titleKey=3D"HexBlueDefColor" bundleKey=3D"DOC_TEMPLATES"
+ type=3D"SmallText" value=3D"#3333FF"/> =
Added: trunk/src/jsp/chapter2/defaultvalues/workarea.jsp
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
chapter2/defaultvalues/workarea.jsp&rev=3D13&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/defaultvalues/workarea.jsp (added)
+++ trunk/src/jsp/chapter2/defaultvalues/workarea.jsp Tue Sep 18 17:26:25 2=
007
@@ -0,0 +1,29 @@
+<%@ include file=3D"..\..\chapter1\taglib\declarations.inc"%>
+
+<content:declareContainerList name=3D"testContainerListSingle" =
+ title=3D"Test container list single (hardcoded)"
+ titleKey=3D"testContainerListSingle" bundleKey=3D"DOC_TEMPLATES" =
+ containerListType=3D"<%=3DJahiaContainerDefinition.SINGLE_TYPE%>">
+ <content:declareContainer>
+ <%@ include file=3D"declaration.inc"%>
+ </content:declareContainer>
+</content:declareContainerList>
+
+<content:containerList name=3D"testContainerListSingle" id=3D"testContaine=
rListSingle">
+ <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>
+ <bean:define id=3D"processedContainer" name=3D"testContainer"/>
+ <%@ include file=3D"..\allfields\display.inc"%>
+ </div> =
+ </jahiaHtml:actionMenu>
+ </content:container>
+ <jahiaHtml:actionMenu name=3D"testContainerListSingle" labelKey=3D"add=
.containerSingle" =
+ namePostFix=3D"" useFieldSet=3D"false" resourceBundle=3D"jahiatemp=
lates.Doc_templates"/>
+</content:containerList>
\ No newline at end of file
Added: trunk/src/jsp/common/css/web_css.xml
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/src/jsp/=
common/css/web_css.xml&rev=3D13&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.xml (added)
+++ trunk/src/jsp/common/css/web_css.xml Tue Sep 18 17:26:25 2007
@@ -0,0 +1,30 @@
+<?xml version=3D"1.0" encoding=3D"utf-8" ?>
+<!--
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * =
+ * =3D=3D BEGIN LICENSE =3D=3D
+ * =
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * =
+ * - GNU General Public License Version 2 or later (the "GPL")
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ * http://www.gnu.org/licenses/lgpl.html
+ *
+ * - Mozilla Public License Version 1.1 or later (the "MPL")
+ * http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * =3D=3D END LICENSE =3D=3D
+ * =
+ * This is the sample style definitions file. It makes the styles combo
+ * completely customizable.
+ *
+ * See FCKConfig.StylesXmlPath in the configuration file.
+-->
+<Styles>
+ <Style name=3D"Title H1" element=3D"h1" />
+ <Style name=3D"Title H2" element=3D"h2" />
+</Styles>
\ 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=3D13&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 Tue Sep 18 17:26:25 2007
@@ -39,5 +39,10 @@
<parameter name=3D"name">Container types</parameter>
<parameter name=3D"filename">chapter2/conttype.jsp</parameter>
<parameter name=3D"display-name">Container types (cont &
subcont)</p=
arameter>
- </template> =
+ </template>
+ <template browsable=3D"1" visible=3D"1">
+ <parameter name=3D"name">Default values</parameter>
+ <parameter
name=3D"filename">chapter2/defaultvalues.jsp</parameter>
+ <parameter name=3D"display-name">Default values</parameter>
+ </template> =
</tpml>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
