Author: dpillot
Date: Thu Jun 21 15:16:04 2007
New Revision: 722
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D722&repname=
=3Dcorporate_portal_templates_v2
Log:
jsp:scriptlet is not allowed as child tag of c:choose now by updated tld
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/categories.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/categories.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/categories.jsp&rev=3D722&repname=3Dcorporate_portal_templat=
es_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/categories.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/categories.jsp Thu Jun 21 15:16:04=
2007
@@ -1,18 +1,18 @@
<%--
Copyright 2002-2006 Jahia Ltd
=
-Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
-Version 1.0 (the "License"), or (at your option) any later version; you ma=
y =
-not use this file except in compliance with the License. You should have =
-received a copy of the License along with this program; if not, you may ob=
tain =
-a copy of the License at =
+Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L),
+Version 1.0 (the "License"), or (at your option) any later version; you may
+not use this file except in compliance with the License. You should have
+received a copy of the License along with this program; if not, you may ob=
tain
+a copy of the License at
=
http://www.jahia.org/license/
=
-Unless required by applicable law or agreed to in writing, software =
-distributed under the License is distributed on an "AS IS" BASIS, =
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. =
-See the License for the specific language governing permissions and =
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
limitations under the License.
--%><%@ include file=3D"common/top_declarations.inc"%>
<jesi:template aclGroup=3D"true">
@@ -64,7 +64,7 @@
</div>
<div style=3D"display:block;float:left;width:50%;">
=
-<% =
+<%
Category selectedCategory =3D (Category) pageContext.findAttribute=
("selectedUserObject");
if (selectedCategory !=3D null) { %>
<content:category key=3D"<%=3DselectedCategory.getKey()%>" id=3D"c=
urrentCategory" />
@@ -160,6 +160,7 @@
<bean:define id=3D"COLOR" value=3D"1=
3"/>
<bean:define id=3D"SMALLTEXT_SHARED_LANG" =
value=3D"20"/>
<c:choose>
+
<c:when test=3D"${type =3D=3D SMALLTEX=
T || type =3D=3D DATE || type =3D=3D FLOAT || type =3D=3D INTEGER}">
<bean:define name=3D"curField" pro=
perty=3D"value" id=3D"curFieldValue"/>
<logic:notEmpty name=3D"curFieldVa=
lue">
@@ -170,8 +171,9 @@
- <bean:write name=3D"curField" pr=
operty=3D"object" filter=3D"false"/><br/>
</c:when>
=
- <%/** Big Text Field *****************=
**************/ %>
+
<c:when test=3D"${type =3D=3D BIGTEXT}=
">
+ <%/** Big Text Field *****************=
**************/ %>
<bean:define name=3D"curField" pro=
perty=3D"value" id=3D"curFieldStr" type=3D"java.lang.String"/>
<%
// truncate the string to 35 chars
@@ -185,8 +187,9 @@
%>
</c:when>
=
- <%/** File Field *********************=
**************/ %>
+
<c:when test=3D"${type =3D=3D FILE}">
+ <%/** File Field *********************=
**************/ %>
<bean:define id=3D"currentFile" na=
me=3D"curField" property=3D"object"/>
<logic:present name=3D"currentFile=
">
<logic:equal name=3D"currentFi=
le" property=3D"downloadable" value=3D"true">
@@ -204,8 +207,9 @@
</logic:present>
</c:when>
=
- <%/** Page Field *********************=
**************/ %>
+
<c:when test=3D"${type =3D=3D PAGE}">
+ <%/** Page Field *********************=
**************/ %>
<logic:present name=3D"curField" p=
roperty=3D"object">
<bean:define id=3D"currentPage=
" name=3D"curField" property=3D"object"/>
<logic:notEmpty name=3D"curren=
tPage">
@@ -220,9 +224,11 @@
</logic:notEmpty>
</logic:present>
</c:when>
+
<c:otherwise>
Can not display this field<br/>
</c:otherwise>
+
</c:choose>
</logic:iterate>
<br/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
