openutils-svn

[Openutils-svn] SF.net SVN: openutils: [254] trunk/openutils-tags-spring/src/main/resources /META-INF

[<fg...@us...>]

Revision: 254
          http://svn.sourceforge.net/openutils/?rev=254&view=rev
Author:   fgiust
Date:     2007-02-13 13:39:25 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
cleanup of useless tags + new keytext input type

Modified Paths:
--------------
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag

Removed Paths:
-------------
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	2007-02-13 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	2007-02-13 21:39:25 UTC (rev 254)
@@ -27,30 +27,10 @@
     <path>/META-INF/tags/ou/date.tag</path>
   </tag-file>
   <tag-file>
-    <name>daterange</name>
-    <path>/META-INF/tags/ou/daterange.tag</path>
-  </tag-file>
-  <tag-file>
     <name>debug</name>
     <path>/META-INF/tags/ou/debug.tag</path>
   </tag-file>
   <tag-file>
-    <name>docbutton</name>
-    <path>/META-INF/tags/ou/docbutton.tag</path>
-  </tag-file>
-  <tag-file>
-    <name>docframe</name>
-    <path>/META-INF/tags/ou/docframe.tag</path>
-  </tag-file>
-  <tag-file>
-    <name>docprintbutton</name>
-    <path>/META-INF/tags/ou/docprintbutton.tag</path>
-  </tag-file>
-  <tag-file>
-    <name>docsvg</name>
-    <path>/META-INF/tags/ou/docsvg.tag</path>
-  </tag-file>
-  <tag-file>
     <name>errorbox</name>
     <path>/META-INF/tags/ou/errorbox.tag</path>
   </tag-file>
@@ -67,10 +47,6 @@
     <path>/META-INF/tags/ou/messages.tag</path>
   </tag-file>
   <tag-file>
-    <name>na</name>
-    <path>/META-INF/tags/ou/na.tag</path>
-  </tag-file>
-  <tag-file>
     <name>select</name>
     <path>/META-INF/tags/ou/select.tag</path>
   </tag-file>

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	2007-02-13 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docbutton.tag	2007-02-13 21:39:25 UTC (rev 254)
@@ -1,24 +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="type" required="true" />
-    <jsp:directive.attribute name="href" required="true" />
-    <jsp:directive.attribute name="disabled" required="false" type="java.lang.Boolean" />
-
-
-	<c:set var="message"><fmt:message key="btn.${type}" /></c:set>
-
-    <c:choose>
-      <c:when test="${disabled}">
-	       <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}_false.gif" alt="${message}" title="${message}"/>
-      </c:when>
-      <c:otherwise>
-		<a href="${href}&amp;amp;page=full" title="${message}" target="_blank">
-	        <img src="${pageContext.request.contextPath}/docroot/img/btn-${type}.gif" alt="${message}" />
-	    </a>
-      </c:otherwise>
-    </c:choose>
-
-</jsp:root>

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	2007-02-13 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docframe.tag	2007-02-13 21:39:25 UTC (rev 254)
@@ -1,19 +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="width" required="false" />
-  <jsp:directive.attribute name="height" required="false" />
-  <jsp:directive.attribute name="doc" required="true" />
-  <jsp:directive.attribute name="id" required="false" />
-  <c:choose>
-    <c:when test="${!empty(doc)}">
-      <iframe src="${jspContext.request.contextPath}/docs/pdf/${doc}" width="${width}" height="${height}" id="${id}">
-        <!-- a -->
-      </iframe>
-    </c:when>
-    <c:otherwise>
-      <![CDATA[ <!-- doc is empty --> ]]>
-    </c:otherwise>
-  </c:choose>
-</jsp:root>

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	2007-02-13 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docprintbutton.tag	2007-02-13 21:39:25 UTC (rev 254)
@@ -1,13 +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="href" required="true" />
-
-	<c:set var="message"><fmt:message key="btn.stampa" /></c:set>
-
-	<a href="${href}&amp;amp;page=full&amp;amp;print=print" title="${message}" target="_blank">
-        <img src="${pageContext.request.contextPath}/docroot/img/btn-stampa.gif" alt="${message}" />
-    </a>
-</jsp:root>

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	2007-02-13 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/docsvg.tag	2007-02-13 21:39:25 UTC (rev 254)
@@ -1,13 +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="modello" required="true" />
-
-  <object class="svg" data="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml">
-  	<!-- <embed src="${jspContext.request.contextPath}/docs/svg/ES_${prodotto.seriemodello.id}.svg" type="image/svg+xml" pluginspage="http://www.adobe.com/svg/viewer/install/" /> -->
-  </object>
-
-
-
-</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 21:21:37 UTC (rev 253)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	2007-02-13 21:39:25 UTC (rev 254)
@@ -29,10 +29,10 @@
   <c:if test="${empty(maxlength)}">
     <c:set var="maxlength">30</c:set>
   </c:if>
-  <c:if test="${type == 'key' || type == 'keyshow'}">
+  <c:if test="${type == 'key' || type == 'keyshow' || type == 'keytext'}">
     <c:choose>
       <c:when test="${type == 'keytext' and empty(status.value)}">
-        <c:set var="type" value="hidden" />
+        <c:set var="donothing" value="${true}" />
       </c:when>
       <c:when test="${type == 'key' and !empty(status.value)}">
         <c:set var="type" value="hidden" />
@@ -72,6 +72,7 @@
   </c:choose>
   <!-- stampa campi -->
   <c:choose>
+    <c:when test="${donothing}"><!-- don't print anything --></c:when>
     <c:when test="${!nobind}">
       <spring:bind path="${path}">
         <c:set var="divclass">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils: [256] trunk/openutils-tags-spring/src/main/resources /META-INF

[<fg...@us...>]

Revision: 256
          http://svn.sourceforge.net/openutils/?rev=256&view=rev
Author:   fgiust
Date:     2007-02-14 09:34:52 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
support for "label" input type

Modified Paths:
--------------
    trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag

Removed Paths:
-------------
    trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag

Modified: trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	2007-02-14 00:06:54 UTC (rev 255)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/openutils-tags-spring.tld	2007-02-14 17:34:52 UTC (rev 256)
@@ -55,10 +55,6 @@
     <path>/META-INF/tags/ou/tablelang.tag</path>
   </tag-file>
   <tag-file>
-    <name>text</name>
-    <path>/META-INF/tags/ou/text.tag</path>
-  </tag-file>
-  <tag-file>
     <name>txtinput</name>
     <path>/META-INF/tags/ou/txtinput.tag</path>
   </tag-file>

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-14 00:06:54 UTC (rev 255)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/input.tag	2007-02-14 17:34:52 UTC (rev 256)
@@ -53,6 +53,9 @@
   <c:if test="${maxlength ge 256}">
     <c:set var="type" value="textarea" />
   </c:if>
+  <c:if test="${type eq 'label'}">
+    <c:set var="nobind" value="true" />
+  </c:if>
   <c:set var="divclass">
     <jsp:text>formelement formelement${type}</jsp:text>
   </c:set>
@@ -119,6 +122,13 @@
             onkeypress="${onkeypress}" onkeydown="${onkeydown}" onkeyup="${onkeyup}" onchange="${onchange}"
             onblur="${onblur}" />
         </c:when>
+        <c:when test="${label}">
+          <div class="${divclass}">
+            <label for="${name}">${labelmsg}:</label>
+            <span class="text">${status.value}</span>
+            <div class="clear"><!--  --></div>
+          </div>
+        </c:when>
         <c:otherwise>
           <div class="${divclass}">
             <label for="${name}">${labelmsg}:</label>

Deleted: trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag
===================================================================
--- trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	2007-02-14 00:06:54 UTC (rev 255)
+++ trunk/openutils-tags-spring/src/main/resources/META-INF/tags/ou/text.tag	2007-02-14 17:34:52 UTC (rev 256)
@@ -1,54 +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:ou="http://openutils.sourceforge.net/openutils-tags-spring">
-
-    <jsp:directive.attribute name="path" required="true" />
-    <jsp:directive.attribute name="name" required="false" />
-    <jsp:directive.attribute name="maxlength" required="false" type="java.lang.Integer" />
-    <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="type" required="false" />
-    <jsp:directive.attribute name="label" required="false" type="java.lang.String" />
-
-    <spring:bind path="${path}">
-	    <c:set var="divclass">formelement <c:if test="${!empty(status.errorMessage)}"> formelementerror</c:if></c:set>
-	    <c:if test="${empty(name)}">
-	      <c:set var="name">${su:substringAfter(path, ".")}</c:set>
-	    </c:if>
-	    <c:if test="${empty(maxlength)}">
-	      <c:set var="maxlength">30</c:set>
-	    </c:if>
-	    <c:if test="${type == 'key' and !empty(status.value)}">
-	      <c:set var="type">hidden</c:set>
-	    </c:if>
-	    <c:if test="${type == 'keyshow' and !empty(status.value)}">
-	      <c:set var="readonly" value="${true}" />
-	    </c:if>
-
-		 <c:choose>
-			 <c:when test="${empty(label)}">
-			  <c:set var="labelmsg"><fmt:message key="${path}" /></c:set>
-			 </c:when>
-			 <c:otherwise>
-			  <c:set var="labelmsg">${label}</c:set>
-			 </c:otherwise>
-		 </c:choose>
-
-
-	    <c:choose>
-	      <c:when test="${type == 'hidden'}">
-	      	<input type="hidden" name="${name}" id="${name}" value="${status.value}" />
-	      </c:when>
-	      <c:otherwise>
-		    <div class="${divclass}">
-		        <label for="${name}">${labelmsg}:</label>
-
-	            <ou:txtinput type="text" name="${name}" value="${status.value}" cssclass="text" maxlength="${maxlength}" readonly="${readonly}" disabled="${disabled}"/>
-
-	            <div class="clear"><!--  --></div>
-		    </div>
-	      </c:otherwise>
-	    </c:choose>
-    </spring:bind>
-
-</jsp:root>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.