Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils: [251] trunk/openutils-tags-spring/src/main/resources /META-INF/tags/ou
|
From: <fg...@us...> - 2007-02-13 21:12:52
|
Revision: 251
http://svn.sourceforge.net/openutils/?rev=251&view=rev
Author: fgiust
Date: 2007-02-13 13:12:44 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag
Removed Paths:
-------------
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/checkbox.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -8,6 +8,10 @@
<jsp:directive.attribute name="bare" required="false" type="java.lang.Boolean" />
<jsp:directive.attribute name="multiline" required="false" type="java.lang.Boolean" />
<jsp:directive.attribute name="style" required="false" />
+
+ <jsp:scriptlet>
+ System.err.println("Warning ou:checkbox is deprecated, please use ou:input type=\"checkbox\" instead ");
+ </jsp:scriptlet>
<spring:bind path="${path}">
<c:if test="${empty(name)}">
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/date.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -19,6 +19,10 @@
<jsp:directive.attribute name="label" required="false" type="java.lang.String" />
+ <jsp:scriptlet>
+ System.err.println("Warning ou:date is deprecated, please use ou:input type=\"date\" instead ");
+ </jsp:scriptlet>
+
<c:if test="${empty(key)}">
<c:set var="key">${path}</c:set>
</c:if>
Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/daterange.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,30 +0,0 @@
-<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">
- <jsp:directive.attribute name="from" required="true" type="java.util.Date" />
- <jsp:directive.attribute name="to" required="true" type="java.util.Date" />
- <!-- elimina date anteriori al 1970 -->
- <c:if test="${from.time le 0}">
- <c:remove var="from" />
- </c:if>
- <c:if test="${to.time le 0}">
- <c:remove var="to" />
- </c:if>
- <c:if test="${(from != null) or (to != null)}">
- <jsp:text> (</jsp:text>
- <c:if test="${from != null}">
- <fmt:message key="daterange.from" />
- <jsp:text> </jsp:text>
- <fmt:formatDate value="${from}" type="date" pattern="dd/MM/yyyy" />
- <c:if test="${to != null}">
- <jsp:text> </jsp:text>
- </c:if>
- </c:if>
-
- <c:if test="${to != null}">
- <fmt:message key="daterange.to" />
- <jsp:text> </jsp:text>
- <fmt:formatDate value="${to}" type="date" pattern="dd/MM/yyyy" />
- </c:if>
- <jsp:text>) </jsp:text>
- </c:if>
-</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -31,10 +31,13 @@
</c:if>
<c:if test="${type == 'key' || type == 'keyshow'}">
<c:choose>
+ <c:when test="${type == 'keytext' and empty(status.value)}">
+ <c:set var="type" value="hidden" />
+ </c:when>
<c:when test="${type == 'key' and !empty(status.value)}">
<c:set var="type" value="hidden" />
</c:when>
- <c:when test="${type == 'keyshow' and !empty(status.value)}">
+ <c:when test="${(type == 'keyshow' and !empty(status.value)) or (type == 'keytext' and !empty(status.value))}">
<c:set var="type" value="text" />
<c:set var="readonly" value="${true}" />
</c:when>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/li.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,23 +1,24 @@
-<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:ou="http://openutils.sourceforge.net/openutils-tags-spring" xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
- <jsp:directive.attribute name="selected" required="false" />
- <jsp:directive.attribute name="href" required="true" />
- <jsp:directive.attribute name="text" required="true" />
- <jsp:directive.attribute name="title" required="false" />
- <c:choose>
- <c:when test="${href eq selected}">
- <li id="current">
- <strong>
- <a href="${href}" title="${title}">${text}</a>
- </strong>
- </li>
- </c:when>
- <c:otherwise>
- <li>
- <a href="${href}" title="${title}">${text}</a>
- </li>
- </c:otherwise>
- </c:choose>
+<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:ou="http://openutils.sourceforge.net/openutils-tags-spring"
+ xmlns:elx="http://openutils.sourceforge.net/openutils-tags-elx">
+ <jsp:directive.attribute name="selected" required="false" />
+ <jsp:directive.attribute name="href" required="true" />
+ <jsp:directive.attribute name="text" required="true" />
+ <jsp:directive.attribute name="title" required="false" />
+ <c:choose>
+ <c:when test="${href eq selected}">
+ <li id="current">
+ <strong>
+ <a href="${href}" title="${title}">${text}</a>
+ </strong>
+ </li>
+ </c:when>
+ <c:otherwise>
+ <li>
+ <a href="${href}" title="${title}">${text}</a>
+ </li>
+ </c:otherwise>
+ </c:choose>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/messages.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,30 +1,28 @@
-<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:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt">
-
- <c:if test="${not empty errors}">
- <div class="error">
- <ul>
- <c:forEach var="msg" items="${errors}">
- <li><c:out value="${msg}" escapeXml="false" /></li>
- </c:forEach>
- </ul>
- </div>
- <c:remove var="errors" />
- </c:if>
-
-
- <c:if test="${not empty messages}">
- <div class="message">
- <ul>
- <c:forEach var="msg" items="${messages}">
- <li><c:out value="${msg}" escapeXml="false" /></li>
- </c:forEach>
- </ul>
- </div>
- <c:remove var="messages" />
- </c:if>
-
+<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:su="http://openutils.sourceforge.net/openutils-tags-commonslang"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt">
+ <c:if test="${not empty errors}">
+ <div class="error">
+ <ul>
+ <c:forEach var="msg" items="${errors}">
+ <li>
+ <c:out value="${msg}" escapeXml="false" />
+ </li>
+ </c:forEach>
+ </ul>
+ </div>
+ <c:remove var="errors" />
+ </c:if>
+ <c:if test="${not empty messages}">
+ <div class="message">
+ <ul>
+ <c:forEach var="msg" items="${messages}">
+ <li>
+ <c:out value="${msg}" escapeXml="false" />
+ </li>
+ </c:forEach>
+ </ul>
+ </div>
+ <c:remove var="messages" />
+ </c:if>
</jsp:root>
Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/na.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,12 +0,0 @@
-<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">
- <c:set var="body">
- <jsp:doBody />
- </c:set>
- <c:choose>
- <c:when test="${!empty(body)}">${body}</c:when>
- <c:otherwise>N/A</c:otherwise>
- </c:choose>
-</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtinput.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,66 +1,92 @@
-<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">
-
-
- <jsp:directive.attribute name="name" required="true" />
- <jsp:directive.attribute name="value" required="true" />
- <jsp:directive.attribute name="type" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="maxlength" required="false" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean"/>
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean"/>
- <jsp:directive.attribute name="checked" required="false" type="java.lang.Boolean"/>
- <jsp:directive.attribute name="onkeypress" required="false" />
- <jsp:directive.attribute name="onkeydown" required="false" />
- <jsp:directive.attribute name="onkeyup" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
- <jsp:directive.attribute name="onblur" required="false" />
- <c:if test="${empty(type)}">
- <c:set var="type" value="text" />
- </c:if>
-
- <c:choose>
- <c:when test="${type == 'textarea'}"><![CDATA[<textarea name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" ]]></c:when>
- <c:otherwise><![CDATA[<input name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA[" type="]]>${type}<![CDATA["]]></c:otherwise>
- </c:choose>
-
- <c:choose>
- <c:when test="${type == 'checkbox'}"><![CDATA[ value="]]>true<![CDATA[" ]]></c:when>
- <c:when test="${type == 'textarea'}"></c:when>
- <c:otherwise><![CDATA[ value="]]>${value}<![CDATA[" ]]></c:otherwise>
- </c:choose>
-
-
-
- <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeypress)}"><![CDATA[ onkeypress="]]>${onkeypress}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeydown)}"><![CDATA[ onkeydown="]]>${onkeydown}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onkeyup)}"><![CDATA[ onkeydown="]]>${onkeyup}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onchange)}"><![CDATA[ onchange="]]>${onchange}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onblur)}"><![CDATA[ onblur="]]>${onblur}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
- <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
- <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
- <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}"><![CDATA[ autocomplete="off" ]]></c:if>
-
- <c:choose>
- <c:when test="${type == 'text'}">
- <c:if test="${!empty(maxlength)}"><![CDATA[ maxlength="]]>${maxlength}<![CDATA[" ]]></c:if>
- </c:when>
- <c:when test="${type == 'checkbox'}">
- <c:if test="${checked}"><![CDATA[ checked="checked" ]]></c:if>
- </c:when>
- </c:choose>
-
- <c:choose>
- <c:when test="${type == 'textarea'}"><![CDATA[ >]]>${value}<![CDATA[</textarea>]]></c:when>
- <c:otherwise><![CDATA[ />]]></c:otherwise>
- </c:choose>
- <c:if test="${type == checkbox}">
- <input type="hidden" name="_${name}" value="${value}"/>
- </c:if>
-
-
+<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">
+ <jsp:directive.attribute name="name" required="true" />
+ <jsp:directive.attribute name="value" required="true" />
+ <jsp:directive.attribute name="type" required="false" />
+ <jsp:directive.attribute name="cssclass" required="false" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="maxlength" required="false" />
+ <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="checked" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="onkeypress" required="false" />
+ <jsp:directive.attribute name="onkeydown" required="false" />
+ <jsp:directive.attribute name="onkeyup" required="false" />
+ <jsp:directive.attribute name="onchange" required="false" />
+ <jsp:directive.attribute name="onblur" required="false" />
+ <c:if test="${empty(type)}">
+ <c:set var="type" value="text" />
+ </c:if>
+ <c:choose>
+ <c:when test="${type == 'textarea'}">
+ <![CDATA[<textarea name="${name}" id="${name}" ]]>
+ </c:when>
+ <c:otherwise>
+ <![CDATA[<input name="${name}" id="${name}" type="${type}"]]>
+ </c:otherwise>
+ </c:choose>
+ <c:choose>
+ <c:when test="${type == 'checkbox'}">
+ <![CDATA[ value="true" ]]>
+ </c:when>
+ <c:when test="${type == 'textarea'}"></c:when>
+ <c:otherwise>
+ <![CDATA[ value="${value}" ]]>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="${!empty(cssclass)}">
+ <![CDATA[ class="${cssclass}" ]]>
+ </c:if>
+ <c:if test="${!empty(onkeypress)}">
+ <![CDATA[ onkeypress="${onkeypress}" ]]>
+ </c:if>
+ <c:if test="${!empty(onkeydown)}">
+ <![CDATA[ onkeydown="${onkeydown}" ]]>
+ </c:if>
+ <c:if test="${!empty(onkeyup)}">
+ <![CDATA[ onkeydown="${onkeyup}" ]]>
+ </c:if>
+ <c:if test="${!empty(onchange)}">
+ <![CDATA[ onchange="${onchange}" ]]>
+ </c:if>
+ <c:if test="${!empty(onblur)}">
+ <![CDATA[ onblur="${onblur}" ]]>
+ </c:if>
+ <c:if test="${!empty(style)}">
+ <![CDATA[ style="${style}" ]]>
+ </c:if>
+ <c:if test="${readonly}">
+ <![CDATA[ readonly="readonly" ]]>
+ </c:if>
+ <c:if test="${disabled}">
+ <![CDATA[ disabled="disabled" ]]>
+ </c:if>
+ <c:if test="${!empty(onkeypress) || !empty(onkeydown) || !empty(onkeyup) || !empty(onchange) || !empty(onblur)}">
+ <![CDATA[ autocomplete="off" ]]>
+ </c:if>
+ <c:choose>
+ <c:when test="${type == 'text'}">
+ <c:if test="${!empty(maxlength)}">
+ <![CDATA[ maxlength="${maxlength}" ]]>
+ </c:if>
+ </c:when>
+ <c:when test="${type == 'checkbox'}">
+ <c:if test="${checked}">
+ <![CDATA[ checked="checked" ]]>
+ </c:if>
+ </c:when>
+ </c:choose>
+ <c:choose>
+ <c:when test="${type == 'textarea'}">
+ <![CDATA[ >${value}</textarea>]]>
+ </c:when>
+ <c:otherwise>
+ <![CDATA[ />]]>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="${type == checkbox}">
+ <input type="hidden" name="_${name}" value="${value}" />
+ </c:if>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtoption.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,19 +1,16 @@
-<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">
-
-
- <jsp:directive.attribute name="value" required="true" />
- <jsp:directive.attribute name="selected" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
-
-
- <![CDATA[<option value="]]>${value}<![CDATA["]]>
- <c:if test="${selected}"><![CDATA[ selected="selected" ]]></c:if>
- <![CDATA[>]]>
- <jsp:doBody />
- <![CDATA[</option>]]>
-
-
+<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">
+ <jsp:directive.attribute name="value" required="true" />
+ <jsp:directive.attribute name="selected" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
+ <![CDATA[<option value="${value}"]]>
+ <c:if test="${selected}">
+ <![CDATA[ selected="selected" ]]>
+ </c:if>
+ <![CDATA[>]]>
+ <jsp:doBody />
+ <![CDATA[</option>]]>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txtselect.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,36 +1,43 @@
-<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">
-
-
- <jsp:directive.attribute name="name" required="true" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
- <jsp:directive.attribute name="value" required="false" />
- <jsp:directive.attribute name="onchange" required="false" />
-
- <c:if test="${multiple}">
- <c:set var="cssclass">multiple ${cssclass}</c:set>
- </c:if>
-
-
- <!-- readonly selects are emulated using a disabled select + hidden field -->
- <c:if test="${readonly}"><input type="hidden" name="${name}" value="${value}"/></c:if>
-
- <![CDATA[<select name="]]>${name}<![CDATA["]]>
- <![CDATA[ id="]]>${name}<![CDATA["]]>
- <c:if test="${readonly}"><![CDATA[ disabled="disabled" ]]></c:if>
- <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
- <c:if test="${multiple}"><![CDATA[ multiple="multiple" ]]></c:if>
- <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(style)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(onchange)}"><![CDATA[ onChange="]]>${onchange}<![CDATA[" ]]></c:if>
- <![CDATA[>]]>
- <jsp:doBody />
- <![CDATA[</select>]]>
-
-
+<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">
+ <jsp:directive.attribute name="name" required="true" />
+ <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="cssclass" required="false" />
+ <jsp:directive.attribute name="multiple" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="value" required="false" />
+ <jsp:directive.attribute name="onchange" required="false" />
+ <c:if test="${multiple}">
+ <c:set var="cssclass">multiple ${cssclass}</c:set>
+ </c:if>
+ <!-- readonly selects are emulated using a disabled select + hidden field -->
+ <c:if test="${readonly}">
+ <input type="hidden" name="${name}" value="${value}" />
+ </c:if>
+ <![CDATA[<select name="${name}"]]>
+ <![CDATA[ id="${name}"]]>
+ <c:if test="${readonly}">
+ <![CDATA[ disabled="disabled" ]]>
+ </c:if>
+ <c:if test="${disabled}">
+ <![CDATA[ disabled="disabled" ]]>
+ </c:if>
+ <c:if test="${multiple}">
+ <![CDATA[ multiple="multiple" ]]>
+ </c:if>
+ <c:if test="${!empty(cssclass)}">
+ <![CDATA[ class="${cssclass}" ]]>
+ </c:if>
+ <c:if test="${!empty(style)}">
+ <![CDATA[ style="${style}" ]]>
+ </c:if>
+ <c:if test="${!empty(onchange)}">
+ <![CDATA[ onChange="${onchange}" ]]>
+ </c:if>
+ <![CDATA[>]]>
+ <jsp:doBody />
+ <![CDATA[</select>]]>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/txttextarea.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -1,23 +1,27 @@
-<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">
-
-
- <jsp:directive.attribute name="name" required="true" />
- <jsp:directive.attribute name="value" required="true" />
- <jsp:directive.attribute name="type" required="false" />
- <jsp:directive.attribute name="cssclass" required="false" />
- <jsp:directive.attribute name="style" required="false" />
- <jsp:directive.attribute name="maxlength" required="false" />
- <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean"/>
- <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean"/>
-
- <![CDATA[<textarea name="]]>${name}<![CDATA[" id="]]>${name}<![CDATA["]]>
- <c:if test="${!empty(cssclass)}"><![CDATA[ class="]]>${cssclass}<![CDATA[" ]]></c:if>
- <c:if test="${!empty(styled)}"><![CDATA[ style="]]>${style}<![CDATA[" ]]></c:if>
- <c:if test="${readonly}"><![CDATA[ readonly="readonly" ]]></c:if>
- <c:if test="${disabled}"><![CDATA[ disabled="disabled" ]]></c:if>
- <![CDATA[>]]>${value}<![CDATA[</textarea>]]>
-
-
+<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">
+ <jsp:directive.attribute name="name" required="true" />
+ <jsp:directive.attribute name="value" required="true" />
+ <jsp:directive.attribute name="type" required="false" />
+ <jsp:directive.attribute name="cssclass" required="false" />
+ <jsp:directive.attribute name="style" required="false" />
+ <jsp:directive.attribute name="maxlength" required="false" />
+ <jsp:directive.attribute name="readonly" required="false" type="java.lang.Boolean" />
+ <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
+ <![CDATA[<textarea name="${name}" id="${name}"]]>
+ <c:if test="${!empty(cssclass)}">
+ <![CDATA[ class="${cssclass}" ]]>
+ </c:if>
+ <c:if test="${!empty(styled)}">
+ <![CDATA[ style="${style}" ]]>
+ </c:if>
+ <c:if test="${readonly}">
+ <![CDATA[ readonly="readonly" ]]>
+ </c:if>
+ <c:if test="${disabled}">
+ <![CDATA[ disabled="disabled" ]]>
+ </c:if>
+ <![CDATA[>${value}</textarea>]]>
</jsp:root>
Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag 2007-02-13 17:31:26 UTC (rev 250)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/url.tag 2007-02-13 21:12:44 UTC (rev 251)
@@ -11,9 +11,11 @@
<c:choose>
<c:when test="${!empty(var)}">
<jsp:scriptlet>
+ <![CDATA[
String varName = (String)jspContext.getAttribute("var");
String varContent = (String)jspContext.getAttribute("tmpVar");
jspContext.setAttribute(varName, varContent);
+ ]]>
</jsp:scriptlet>
</c:when>
<c:otherwise>${tmpVar}</c:otherwise>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
