Author: nico
Date: 2010-03-05 15:26:36 +0100 (Fri, 05 Mar 2010)
New Revision: 41280
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/resources/META-INF/tags/field.tag
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
Log:
CMSC-1654 Support seperate name attribute on cmsc form tags
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/resources/META-INF/tags/field.tag
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/resources/META-INF/tags/field.tag
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/resources/META-INF/tags/field.tag
2010-03-05 14:26:36 UTC (rev 41280)
@@ -7,10 +7,10 @@
%><%@ attribute name="container" required="false" rtexprvalue="true"
%><%@ attribute name="containerclass" required="false" rtexprvalue="true"
%><%@ attribute name="options" required="false" rtexprvalue="true"
-%><c:set var="edit" value="${empty edit ? false :edit }"/>
-<c:set var="container" value="${empty container ? 'div' :container }"/>
-<c:set var="containerclass" value="${empty containerclass ? name
:containerclass }"/>
-<c:set var="istitle" value="${name eq 'title' || name eq 'subtitle' ? true
:false }"/>
+%><c:set var="edit" value="${empty edit ? false : edit }"/>
+<c:set var="container" value="${empty container ? 'div' : container }"/>
+<c:set var="containerclass" value="${empty containerclass ? name :
containerclass }"/>
+<c:set var="istitle" value="${name eq 'title' || name eq 'subtitle' ? true :
false }"/>
<c:if test="${edit || istitle}">
<${container} id="content_${elementId}_${name}" class="${containerclass}">
</c:if>
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -20,9 +20,13 @@
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
public class CheckboxTag extends SimpleTagSupport {
public String var;
+ public String name;
public String value;
public Object selected;
public boolean checked;
@@ -31,7 +35,7 @@
public void doTag() throws JspException, IOException {
PageContext ctx = (PageContext) getJspContext();
- ctx.getOut().print("<input type=\"checkbox\" class=\"checkbox\"
style=\"width:15px;\" name=\"" + var + "\" value=\"" + value + "\" ");
+ ctx.getOut().print("<input type=\"checkbox\" class=\"checkbox\"
style=\"width:15px;\" name=\"" + StringEscapeUtils.escapeXml(name) + "\"
value=\"" + value + "\" ");
if (isSelected(ctx.getRequest()) == true || this.checked ==
true) {
ctx.getOut().print("checked=\"checked\"");
}
@@ -80,10 +84,16 @@
return false;
}
- public void setVar(String var) {
- this.var = var;
- }
+ public void setVar(String var) {
+ this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
public void setSelected(Object selected) {
this.selected = selected;
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -20,9 +20,13 @@
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
public class MultipleSelectTag extends SimpleTagSupport {
private String var;
+ public String name;
private List<String> selected;
private int size = 0;
@@ -44,7 +48,7 @@
}
}
- ctx.getOut().print("<select name=\"" + var + "\"");
+ ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(name)
+ "\"");
if (size > 0) {
ctx.getOut().print(" size=\"" + size + "\"");
@@ -64,12 +68,17 @@
return var;
}
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
-
public boolean isSelected(String key) {
if (selected != null) {
if (selected.contains(key)) {
@@ -79,12 +88,10 @@
return (false);
}
-
public int getSize() {
return size;
}
-
public void setSize(int size) {
if (size > 0) {
this.size = size;
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -24,17 +24,24 @@
public class SelectTag extends SimpleTagSupport {
public String var;
-
+ public String name;
+
public String onchange;
public String selected;
public String defaultValue;
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
public void setOnchange(String onchange) {
this.onchange = onchange;
@@ -56,7 +63,7 @@
myOnChange = " " + "onchange=\"" +
StringEscapeUtils.escapeXml(onchange) + "\"";
}
- ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(var)
+ "\"" + myOnChange + ">");
+ ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(name)
+ "\"" + myOnChange + ">");
JspFragment frag = getJspBody();
if (frag != null) {
frag.invoke(null);
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -21,19 +21,24 @@
public class TextTag extends SimpleTagSupport {
public String var;
+ public String name;
public String value;
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
-
public void setValue(String value) {
this.value = value;
}
-
@Override
public void doTag() throws IOException {
PageContext ctx = (PageContext) getJspContext();
@@ -46,11 +51,11 @@
}
else {
if (StringUtils.isNotEmpty(value)) {
- inputValue = attValue;
+ inputValue = value;
}
}
ctx.getOut().print(
- "<input type=\"text\" " + "name=\"" + var + "\" " + "value=\"" +
StringEscapeUtils.escapeHtml(inputValue)
+ "<input type=\"text\" " + "name=\"" +
StringEscapeUtils.escapeXml(name) + "\" " + "value=\"" +
StringEscapeUtils.escapeHtml(inputValue)
+ "\" />");
}
Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
2010-03-05 14:22:47 UTC (rev 41279)
+++ CMSContainer/branches/b1_7/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
2010-03-05 14:26:36 UTC (rev 41280)
@@ -759,6 +759,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>Default value when selected is not set.</description>
<name>default</name>
<required>false</required>
@@ -807,6 +813,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>Size of the list.</description>
<name>size</name>
<required>false</required>
@@ -849,6 +861,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>value attribute.</description>
<name>value</name>
<required>true</required>
@@ -874,6 +892,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>default value.</description>
<name>value</name>
<required>false</required>
@@ -1656,12 +1680,12 @@
<path>/META-INF/tags/attachment.tag</path>
</tag-file>
<tag-file>
- <description>Generates page header information of all the RSS feeds on
the current page level.</description>
+ <!-- <description>Generates page header information of all the RSS
feeds on the current page level.</description> -->
<name>feeds</name>
<path>/META-INF/tags/feeds.tag</path>
</tag-file>
<tag-file>
- <description>Override the mm:field tag and edit the richtext edit
stuff when in edit modus.</description>
+ <!-- <description>Override the mm:field tag and edit the richtext edit
stuff when in edit modus.</description> -->
<name>field</name>
<path>/META-INF/tags/field.tag</path>
</tag-file>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/CheckboxTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -20,9 +20,13 @@
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
public class CheckboxTag extends SimpleTagSupport {
public String var;
+ public String name;
public String value;
public Object selected;
public boolean checked;
@@ -31,7 +35,7 @@
public void doTag() throws JspException, IOException {
PageContext ctx = (PageContext) getJspContext();
- ctx.getOut().print("<input type=\"checkbox\" class=\"checkbox\"
style=\"width:15px;\" name=\"" + var + "\" value=\"" + value + "\" ");
+ ctx.getOut().print("<input type=\"checkbox\" class=\"checkbox\"
style=\"width:15px;\" name=\"" + StringEscapeUtils.escapeXml(name) + "\"
value=\"" + value + "\" ");
if (isSelected(ctx.getRequest()) == true || this.checked ==
true) {
ctx.getOut().print("checked=\"checked\"");
}
@@ -80,10 +84,16 @@
return false;
}
- public void setVar(String var) {
- this.var = var;
- }
+ public void setVar(String var) {
+ this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
public void setSelected(Object selected) {
this.selected = selected;
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/MultipleSelectTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -20,9 +20,13 @@
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
public class MultipleSelectTag extends SimpleTagSupport {
private String var;
+ public String name;
private List<String> selected;
private int size = 0;
@@ -44,7 +48,7 @@
}
}
- ctx.getOut().print("<select name=\"" + var + "\"");
+ ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(name)
+ "\"");
if (size > 0) {
ctx.getOut().print(" size=\"" + size + "\"");
@@ -64,12 +68,17 @@
return var;
}
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
-
public boolean isSelected(String key) {
if (selected != null) {
if (selected.contains(key)) {
@@ -79,12 +88,10 @@
return (false);
}
-
public int getSize() {
return size;
}
-
public void setSize(int size) {
if (size > 0) {
this.size = size;
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/SelectTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -24,17 +24,24 @@
public class SelectTag extends SimpleTagSupport {
public String var;
-
+ public String name;
+
public String onchange;
public String selected;
public String defaultValue;
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
public void setOnchange(String onchange) {
this.onchange = onchange;
@@ -56,7 +63,7 @@
myOnChange = " " + "onchange=\"" +
StringEscapeUtils.escapeXml(onchange) + "\"";
}
- ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(var)
+ "\"" + myOnChange + ">");
+ ctx.getOut().print("<select name=\"" + StringEscapeUtils.escapeXml(name)
+ "\"" + myOnChange + ">");
JspFragment frag = getJspBody();
if (frag != null) {
frag.invoke(null);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
2010-03-05 14:22:47 UTC (rev 41279)
+++
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/form/TextTag.java
2010-03-05 14:26:36 UTC (rev 41280)
@@ -21,19 +21,24 @@
public class TextTag extends SimpleTagSupport {
public String var;
+ public String name;
public String value;
-
public void setVar(String var) {
this.var = var;
+ if (StringUtils.isEmpty(name)) {
+ name = var;
+ }
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
-
public void setValue(String value) {
this.value = value;
}
-
@Override
public void doTag() throws IOException {
PageContext ctx = (PageContext) getJspContext();
@@ -46,11 +51,11 @@
}
else {
if (StringUtils.isNotEmpty(value)) {
- inputValue = attValue;
+ inputValue = value;
}
}
ctx.getOut().print(
- "<input type=\"text\" " + "name=\"" + var + "\" " + "value=\"" +
StringEscapeUtils.escapeHtml(inputValue)
+ "<input type=\"text\" " + "name=\"" +
StringEscapeUtils.escapeXml(name) + "\" " + "value=\"" +
StringEscapeUtils.escapeHtml(inputValue)
+ "\" />");
}
Modified: CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
===================================================================
--- CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
2010-03-05 14:22:47 UTC (rev 41279)
+++ CMSContainer/trunk/CMSContainer/cmsc/taglib/src/tld/cmsc.tld
2010-03-05 14:26:36 UTC (rev 41280)
@@ -759,6 +759,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>Default value when selected is not set.</description>
<name>default</name>
<required>false</required>
@@ -807,6 +813,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>Size of the list.</description>
<name>size</name>
<required>false</required>
@@ -849,6 +861,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>value attribute.</description>
<name>value</name>
<required>true</required>
@@ -874,6 +892,12 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
+ <description>html input name.</description>
+ <name>name</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
<description>default value.</description>
<name>value</name>
<required>false</required>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
