Author: bpapez
Date: Wed Nov 7 10:33:06 2007
New Revision: 20
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D20&repname=3D=
doc_templates
Log:
TEMPLATES-363: In the main content, the image was not displayed in all the =
template except for the Simple scriptlet template. =
Modified:
trunk/src/jsp/chapter1/el-jstl/maincontent_el-jstl.inc
trunk/src/jsp/chapter1/taglib/maincontent.inc
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=3D20&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 Nov 7 10:33=
:06 2007
@@ -23,7 +23,7 @@
<h2>${fn:escapeXml(title)}</h2>
</c:if>
<div class=3D"mainContent">
- <c:if test=3D"${!empty mainContentContainer.fields['image']}">
+ <c:if test=3D"${!empty mainContentContainer.fields['contentImage']=
}">
<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""/>
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=3D20&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 Nov 7 10:33:06 2007
@@ -23,7 +23,7 @@
<h2><bean:write name=3D'title' filter=3D'false'/></h2>
</logic:notEmpty>
<div class=3D"mainContent">
- <logic:present name=3D'mainContentContainer' property=3D'field(ima=
ge)'>
+ <logic:present name=3D'mainContentContainer' property=3D'field(con=
tentImage)'>
<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">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
