[gen] Added the possibility to span widgets on several columns on the search screen (param Field.scolspan).

This commit is contained in:
Gaetan Delannay 2012-12-14 09:23:33 +01:00
parent 3f75d14e92
commit 0dae8b1888
9 changed files with 79 additions and 56 deletions

View file

@ -38,6 +38,6 @@
<label tal:attributes="for widgetName" tal:content="python: _(widget['labelId'])"></label><br>&nbsp;&nbsp;
<input type="text" tal:define="maxChars python: test(widget['maxChars'], widget['maxChars'], '')"
tal:attributes="name python: '%s*string' % widgetName;
maxlength maxChars;
value widget/defaultForSearch"/>
maxlength maxChars; size widget/width;
value widget/sdefault"/>
</metal:search>

View file

@ -25,12 +25,12 @@
<label tal:attributes="for fromName" tal:content="python: _('search_from')"></label>
<input type="text" size="4"
tal:attributes="name fromName; maxlength maxChars;
value python: widget['defaultForSearch'][0]"/>
value python: widget['sdefault'][0]"/>
</tal:from>
<tal:to define="toName python: '%s_to' % name">
<label tal:attributes="for toName" tal:content="python: _('search_to')"></label>
<input type="text" size="4"
tal:attributes="name toName; maxlength maxChars;
value python: widget['defaultForSearch'][1]"/>
value python: widget['sdefault'][1]"/>
</tal:to><br/>
</metal:search>

View file

@ -25,12 +25,12 @@
<label tal:attributes="for fromName" tal:content="python: _('search_from')"></label>
<input type="text" size="4"
tal:attributes="name fromName; maxlength maxChars;
value python: widget['defaultForSearch'][0]"/>
value python: widget['sdefault'][0]"/>
</tal:from>
<tal:to define="toName python: '%s_to' % name">
<label tal:attributes="for toName" tal:content="python: _('search_to')"></label>
<input type="text" size="4"
tal:attributes="name toName; maxlength maxChars;
value python: widget['defaultForSearch'][1]"/>
value python: widget['sdefault'][1]"/>
</tal:to><br/>
</metal:search>

View file

@ -94,9 +94,9 @@
<tal:simpleSearch condition="not: widget/isSelect">
<input type="text" tal:define="maxChars python: test(widget['maxChars'], widget['maxChars'], '')"
tal:attributes="name python: '%s*string-%s' % (widgetName, widget['transform']);
maxlength maxChars;
maxlength maxChars; size widget/width;
style python: 'text-transform:%s' % widget['transform'];
value widget/defaultForSearch"/>
value widget/sdefault"/>
</tal:simpleSearch>
<tal:comment replace="nothing">Show a multi-selection box for fields whose
validator defines a list of values, with a "AND/OR" checkbox.</tal:comment>
@ -112,7 +112,7 @@
<label tal:attributes="for andName" tal:content="python: _('search_and')"></label><br/>
</tal:operator>
<tal:comment replace="nothing">The list of values</tal:comment>
<select tal:define="preSelected widget/defaultForSearch"
<select tal:define="preSelected widget/sdefault"
tal:attributes="name widgetName; size widget/height" multiple="multiple">
<option tal:repeat="v python:tool.getPossibleValues(name, withTranslations=True, withBlankValue=False, className=className)"
tal:attributes="value python:v[0]; title python: v[1];