svn commit: r427905 - in /incubator/ofbiz/trunk/framewo
Locked
 
|
Author: jacopoc
Date: Tue Aug 1 22:55:21 2006 New Revision: 427905 URL: http://svn.apache.org/viewvc?rev=427905&view=rev Log: Two changes to the way search fields are rendered in form widgets: 1) in thext fields, the "ignore case" option is true by default and the "begins with" option is the defalt one 2) the available search options for text and date fields are now rendered with drop down boxes instead of radio boxes OFBIZ-64 Modified: incubator/ofbiz/trunk/framework/widget/dtd/widget-form.xsd incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Modified: incubator/ofbiz/trunk/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=427905&r1=427904&r2=427905&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original) +++ incubator/ofbiz/trunk/framework/widget/dtd/widget-form.xsd Tue Aug 1 22:55:21 2006 @@ -765,7 +765,7 @@ <xs:attribute type="xs:positiveInteger" name="size" default="25"/> <xs:attribute type="xs:positiveInteger" name="maxlength"/> <xs:attribute type="xs:string" name="default-value"/> - <xs:attribute name="ignore-case" default="false"> + <xs:attribute name="ignore-case" default="true"> <xs:simpleType> <xs:restriction base="xs:token"> <xs:enumeration value="true"/> @@ -773,7 +773,7 @@ </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="default-option" default="equals"> + <xs:attribute name="default-option" default="like"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="equals"/> Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=427905&r1=427904&r2=427905&view=diff ============================================================================== --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Tue Aug 1 22:55:21 2006 @@ -1457,26 +1457,15 @@ } buffer.append('>'); - buffer.append(" <input type=\"radio\" name=\""); + buffer.append(" <select name=\""); buffer.append(modelFormField.getParameterName(context)); - buffer.append("_op\" value=\"equals\"" + ("equals".equals(defaultOption) ? " checked=\"checked\"" : "") + "/>"); - buffer.append(opEquals); + buffer.append("_op\" class=\"selectBox\">"); + buffer.append("<option value=\"equals\"" + ("equals".equals(defaultOption)? " selected": "") + ">" + opEquals + "</option>"); + buffer.append("<option value=\"like\"" + ("like".equals(defaultOption)? " selected": "") + ">" + opBeginsWith + "</option>"); + buffer.append("<option value=\"contains\"" + ("contains".equals(defaultOption)? " selected": "") + ">" + opContains + "</option>"); + buffer.append("<option value=\"empty\"" + ("empty".equals(defaultOption)? " selected": "") + ">" + opIsEmpty + "</option>"); + buffer.append("</select>"); - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_op\" value=\"like\"" + ("like".equals(defaultOption) ? " checked=\"checked\"" : "") + "/>"); - buffer.append(opBeginsWith); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_op\" value=\"contains\"" + ("contains".equals(defaultOption) ? " checked=\"checked\"" : "") + "/>"); - buffer.append(opContains); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_op\" value=\"empty\"" + ("empty".equals(defaultOption) ? " checked=\"checked\"" : "") + "/>"); - buffer.append(opIsEmpty); - buffer.append(" <input type=\"checkbox\" name=\""); buffer.append(modelFormField.getParameterName(context)); buffer.append("_ic\" value=\"Y\"" + (ignCase ? " checked=\"checked\"" : "") + "/>"); @@ -1549,20 +1538,13 @@ } buffer.append('>'); - buffer.append(" <input type=\"radio\" name=\""); + buffer.append(" <select name=\""); buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"equals\" checked=\"checked\"/>"); - buffer.append(opEquals); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"greaterThan\"/>"); - buffer.append(opGreaterThan); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"greaterThanEqualTo\"/>"); - buffer.append(opGreaterThanEquals); + buffer.append("_fld0_op\" class=\"selectBox\">"); + buffer.append("<option value=\"equals\" selected>" + opEquals + "</option>"); + buffer.append("<option value=\"greaterThan\">" + opGreaterThan + "</option>"); + buffer.append("<option value=\"greaterThanEqualTo\">" + opGreaterThanEquals + "</option>"); + buffer.append("</select>"); buffer.append("</span>"); @@ -1613,15 +1595,12 @@ } buffer.append('>'); - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld1_op\" value=\"lessThan\"/>"); - buffer.append(opLessThan); - - buffer.append(" <input type=\"radio\" name=\""); + buffer.append(" <select name=\""); buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld1_op\" value=\"lessThanEqualTo\"/>"); - buffer.append(opLessThanEquals); + buffer.append("_fld1_op\" class=\"selectBox\">"); + buffer.append("<option value=\"lessThan\">" + opLessThan + "</option>"); + buffer.append("<option value=\"lessThanEqualTo\">" + opLessThanEquals + "</option>"); + buffer.append("</select>"); buffer.append("</span>"); @@ -1706,25 +1685,14 @@ } buffer.append('>'); - buffer.append(" <input type=\"radio\" name=\""); + buffer.append(" <select name=\""); buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"equals\" />"); - buffer.append(opEquals); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"sameDay\" checked=\"checked\"/>"); - buffer.append(opSameDay); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"greaterThanFromDayStart\"/>"); - buffer.append(opGreaterThanFromDayStart); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld0_op\" value=\"greaterThan\"/>"); - buffer.append(opGreaterThan); + buffer.append("_fld0_op\" class=\"selectBox\">"); + buffer.append("<option value=\"equals\" selected>" + opEquals + "</option>"); + buffer.append("<option value=\"sameDay\">" + opSameDay + "</option>"); + buffer.append("<option value=\"greaterThanFromDayStart\">" + opGreaterThanFromDayStart + "</option>"); + buffer.append("<option value=\"greaterThan\">" + opGreaterThan + "</option>"); + buffer.append("</select>"); buffer.append(" </span>"); @@ -1784,25 +1752,14 @@ } buffer.append('>'); - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld1_op\" value=\"lessThan\"/>"); - buffer.append(opLessThan); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld1_op\" value=\"upToDay\"/>"); - buffer.append(opUpToDay); - - buffer.append(" <input type=\"radio\" name=\""); - buffer.append(modelFormField.getParameterName(context)); - buffer.append("_fld1_op\" value=\"upThruDay\"/>"); - buffer.append(opUpThruDay); - - buffer.append(" <input type=\"radio\" name=\""); + buffer.append(" <select name=\""); buffer.append(modelFormField.getParameterName(context)); - buffer.append("_op\" value=\"empty\"/>"); - buffer.append(opIsEmpty); + buffer.append("_fld1_op\" class=\"selectBox\">"); + buffer.append("<option value=\"lessThan\">" + opLessThan + "</option>"); + buffer.append("<option value=\"upToDay\">" + opUpToDay + "</option>"); + buffer.append("<option value=\"upThruDay\">" + opUpThruDay + "</option>"); + buffer.append("<option value=\"empty\">" + opIsEmpty + "</option>"); + buffer.append("</select>"); buffer.append("</span>"); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |