Author: bpapez
Date: Wed Sep 19 15:14:51 2007
New Revision: 14
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D14&repname=3D=
doc_templates
Log:
Bugfixes
Modified:
trunk/src/java/jahiatemplates/Doc_templates.properties
trunk/src/jsp/chapter2/defaultvalues/declaration.inc
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=3D14&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 19 15:14=
:51 2007
@@ -73,6 +73,8 @@
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)
+SmallTextRes_multiple =3D SmallText multiselection with resource bundle va=
lues
+SmallTextExpr_multiple =3D SmallText multiselection with expression marker=
(username)
DateNow =3D Date now
TimeNow =3D Time now
HourNow =3D Hour now
@@ -109,7 +111,12 @@
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
+product.Smalltext =3D Smalltext Product from resource bundle
+product.Bigtext =3D <b>Bigtext</b> Product from resource bundle
+product.Integer =3D 50
+product.Float =3D 50.50
+
+location.001 =3D Geneva / Switzerland
+location.002 =3D Paris / France
+location.003 =3D Washington / USA
+location.004 =3D Klagenfurt / Austria
Modified: trunk/src/jsp/chapter2/defaultvalues/declaration.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/chapter=
2/defaultvalues/declaration.inc&rev=3D14&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 (original)
+++ trunk/src/jsp/chapter2/defaultvalues/declaration.inc Wed Sep 19 15:14:5=
1 2007
@@ -17,7 +17,7 @@
=
<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"/> =
=
+ type=3D"SmallText" value=3D"<jahia_multivalue[val1:val2:val3:val4]>val=
4"/> =
<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"/>
@@ -28,68 +28,77 @@
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)" =
+ title=3D"Integer_multiple 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)" =
+ title=3D"Float_multiple 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"/>'/>
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.Smalltext=
" default-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"/>'/> =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.Smalltext=
" default-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"/>'/> =
+ type=3D"BigText" =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.Bigtext" =
default-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"/>'/> =
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.Integer" =
default-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"/>'/> =
-
+ value=3D'<jahia-resource id=3D"DOC_TEMPLATES" key=3D"product.Float" de=
fault-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=
"/>'/>
+ value=3D'<jahia-expression expr=3D"currentUser.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=
"/>'/>
+ value=3D'<jahia-expression expr=3D"currentUser.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"=
/>'/>
+ value=3D'<jahia-expression expr=3D"currentUser.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"/>'/> =
+ value=3D'Hello <jahia-expression expr=3D"currentUser.username" storeMa=
rker=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"/>'/> =
+ 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"/>'/> =
+ 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"/>'/> =
+ 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"/>'/> =
+ value=3D'<jahia-expression expr=3D"currentRequest.paramBean.cacheExpir=
ationDate" storeMarker=3D"false"/>'/> =
+
+<content:declareField name=3D"SmallTextRes_multiple"
+ titleKey=3D"SmallTextRes_multiple" bundleKey=3D"DOC_TEMPLATES" =
+ title=3D"SmallText_multiple with values from resource bundle" =
+ type=3D"SmallText" value=3D'<jahia_multivalue_single[<jahia-resource i=
d=3D"DOC_TEMPLATES" key=3D"location.001" default-value=3D"Geneva"/>:<jahia-=
resource id=3D"DOC_TEMPLATES" key=3D"location.002" default-value=3D"Paris"/=
>:<jahia-resource id=3D"DOC_TEMPLATES" key=3D"location.003" default-value=
=3D"Washington"/>:<jahia-resource id=3D"DOC_TEMPLATES" key=3D"location.004"=
default-value=3D"Klagenfurt"/>]><jahia-resource id=3D"DOC_TEMPLATES" key=
=3D"location.003" default-value=3D"Washington"/>'/> =
+<content:declareField name=3D"SmallTextExpr_multiple"
+ titleKey=3D"SmallTextExpr_multiple" bundleKey=3D"DOC_TEMPLATES" =
+ title=3D"SmallText_multiple with values from expression marker" =
+ type=3D"SmallText" value=3D'<jahia_multivalue_single[<jahia-expression=
expr=3D"currentPage.path[0].title" storeMarker=3D"false"/>:<jahia-expressi=
on expr=3D"currentPage.path[1].title" storeMarker=3D"false"/>:<jahia-expres=
sion expr=3D"currentSite.homePage.containerLists["leftMenuContainerList"].c=
ontainers[0].fields["leftLink"].object.title" storeMarker=3D"false"/>]><jah=
ia-expression expr=3D"currentPage.path[0].title" storeMarker=3D"false"/>'/>
=
<content:declareField name=3D"DateNow" title=3D"DateNow" =
titleKey=3D"DateNow" bundleKey=3D"DOC_TEMPLATES"
@@ -132,7 +141,7 @@
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"/>
+ value=3D"linkonly,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"/>
@@ -148,7 +157,4 @@
=
<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"/> =
+ type=3D"Color" value=3D"#3333FF"/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
