Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils: [244] trunk/openutils-tags-spring/src/main/resources /META-INF/tags/ou/select.tag
|
From: <fg...@us...> - 2007-02-12 16:15:07
|
Revision: 244
http://svn.sourceforge.net/openutils/?rev=244&view=rev
Author: fgiust
Date: 2007-02-12 08:15:02 -0800 (Mon, 12 Feb 2007)
Log Message:
-----------
fix missing close div and class (+ reformatting)
Modified Paths:
--------------
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag 2007-02-12 14:58:04 UTC (rev 243)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/select.tag 2007-02-12 16:15:02 UTC (rev 244)
@@ -1,10 +1,9 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
- xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
- xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
- xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx"
- xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:spring="http://www.springframework.org/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
+ xmlns:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx"
+ xmlns:ou="http://openutils.sourceforge.net/openutils-tags-spring"
xmlns:dao="http://openutils.sourceforge.net/openutils-tags-dao">
-
<jsp:directive.attribute name="path" required="true" />
<jsp:directive.attribute name="name" required="false" />
<jsp:directive.attribute name="collection" required="false" />
@@ -21,12 +20,9 @@
<jsp:directive.attribute name="onchange" required="false" />
<jsp:directive.attribute name="key" required="false" />
<jsp:directive.attribute name="label" required="false" type="java.lang.String" />
-
-
<c:if test="${empty(key)}">
<c:set var="key">${path}</c:set>
</c:if>
-
<c:choose>
<c:when test="${!empty(collection)}">
<c:set var="backingList" value="${requestScope[collection]}" />
@@ -35,8 +31,6 @@
<c:set var="backingList" value="${dao:findAll(pageContext, findall)}" />
</c:when>
</c:choose>
-
-
<c:choose>
<c:when test="${empty(label)}">
<c:set var="labelmsg">
@@ -46,30 +40,28 @@
<c:otherwise>
<c:set var="labelmsg">${label}</c:set>
</c:otherwise>
- </c:choose>
-
+ </c:choose>
+ <c:set var="divclass">formelement</c:set>
+ <c:if test="${empty(name)}">
+ <c:set var="name">${su:substringAfter(path, ".")}</c:set>
+ </c:if>
<c:choose>
<c:when test="${!nobind}">
<spring:bind path="${path}">
- <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if>
+ <c:set var="divclass">
+ formelement
+ <c:if test="${!empty(status.errorMessage)}">${elx:space()}formelementerror</c:if>
</c:set>
- <c:if test="${empty(name)}">
- <c:set var="name">${su:substringAfter(path, ".")}</c:set>
- </c:if>
-
<c:if test="${!bare}">
- <![CDATA[<div class="]]>${divclass}<![CDATA[">]]>
- <label for="${name}">${labelmsg} </label>
+ <![CDATA[<div class="${divclass}">]]>
+ <label for="${name}">${labelmsg}</label>
</c:if>
-
<c:choose>
<c:when test="${multiple}">
- <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
+ <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
disabled="${disabled}" onchange="${onchange}">
-
<c:set var="statusArray" value="${su:split(status.value,',')}" />
<c:forEach items="${backingList}" var="option">
-
<c:choose>
<c:when test="${empty(property)}">
<c:set var="optionvalue" value="${option}" />
@@ -78,11 +70,8 @@
<c:set var="optionvalue" value="${option[property]}" />
</c:otherwise>
</c:choose>
-
<ou:txtoption selected="${elx:containsString(statusArray, optionvalue)}" value="${optionvalue}">
-
<ou:compositeproperty bean="${option}" property="${text}" />
-
</ou:txtoption>
</c:forEach>
</ou:txtselect>
@@ -90,19 +79,19 @@
<input type="hidden" name="_${name}" value="" />
</c:when>
<c:otherwise>
- <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if>
+ <c:set var="divclass">
+ formelement
+ <c:if test="${!empty(status.errorMessage)}">${elx:space()}formelementerror</c:if>
</c:set>
<c:if test="${empty(name)}">
<c:set var="name">${su:substringAfter(path, ".")}</c:set>
</c:if>
-
- <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
+ <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
disabled="${disabled}" onchange="${onchange}">
<c:if test="${addempty}">
<option value="">---</option>
</c:if>
<c:forEach items="${backingList}" var="option">
-
<c:choose>
<c:when test="${empty(property)}">
<c:set var="optionvalue" value="${option}" />
@@ -111,36 +100,32 @@
<c:set var="optionvalue" value="${option[property]}" />
</c:otherwise>
</c:choose>
-
<ou:txtoption selected="${elx:equalsString(status.value, optionvalue)}" value="${optionvalue}">
-
<ou:compositeproperty bean="${option}" property="${text}" />
-
</ou:txtoption>
</c:forEach>
</ou:txtselect>
</c:otherwise>
</c:choose>
-
-
<c:if test="${!bare}">
<![CDATA[<div class="clear"><!-- --></div> </div>]]>
</c:if>
</spring:bind>
- </c:when>
+ </c:when>
+ <!-- nobind -->
<c:otherwise>
<c:if test="${!bare}">
- <![CDATA[<div class="]]>${divclass}<![CDATA[">]]>
- <label for="${name}">${labelmsg} </label>
+ <![CDATA[<div class="]]>
+ ${divclass}
+ <![CDATA[">]]>
+ <label for="${name}">${labelmsg}</label>
</c:if>
<c:choose>
<c:when test="${multiple}">
- <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
+ <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
disabled="${disabled}" onchange="${onchange}">
-
<c:set var="statusArray" value="${su:split(status.value,',')}" />
<c:forEach items="${backingList}" var="option">
-
<c:choose>
<c:when test="${empty(property)}">
<c:set var="optionvalue" value="${option}" />
@@ -149,11 +134,8 @@
<c:set var="optionvalue" value="${option[property]}" />
</c:otherwise>
</c:choose>
-
<ou:txtoption selected="${elx:containsString(statusArray, optionvalue)}" value="${optionvalue}">
-
<ou:compositeproperty bean="${option}" property="${text}" />
-
</ou:txtoption>
</c:forEach>
</ou:txtselect>
@@ -161,13 +143,12 @@
<input type="hidden" name="_${name}" value="" />
</c:when>
<c:otherwise>
- <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
+ <ou:txtselect name="${name}" multiple="${multiple}" style="${style}" readonly="${readonly}"
disabled="${disabled}" onchange="${onchange}">
<c:if test="${addempty}">
<option value="">---</option>
</c:if>
<c:forEach items="${backingList}" var="option">
-
<c:choose>
<c:when test="${empty(property)}">
<c:set var="optionvalue" value="${option}" />
@@ -176,14 +157,14 @@
<c:set var="optionvalue" value="${option[property]}" />
</c:otherwise>
</c:choose>
-
<ou:txtoption selected="${elx:equalsString(status.value, optionvalue)}" value="${optionvalue}">
-
<ou:compositeproperty bean="${option}" property="${text}" />
-
</ou:txtoption>
</c:forEach>
- </ou:txtselect>
+ </ou:txtselect>
+ <c:if test="${!bare}">
+ <![CDATA[<div class="clear"><!-- --></div> </div>]]>
+ </c:if>
</c:otherwise>
</c:choose>
</c:otherwise>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
