[CMF-checkins] CVS: CMF/CMFTopic/skins/zpt_topic - listc_edit.pt:1.1.4.1

[Tres Seaver]

Update of /cvs-repository/CMF/CMFTopic/skins/zpt_topic
In directory cvs.zope.org:/tmp/cvs-serv17452/CMFTopic/skins/zpt_topic

Modified Files:
      Tag: CMF-1_2-branch
	listc_edit.pt 
Log Message:
 - Merge fix for tracker #442 from branch.

=== CMF/CMFTopic/skins/zpt_topic/listc_edit.pt 1.1 => 1.1.4.1 ===
-<tr>
-    <td width="20">
-        <input type="checkbox" value="" name="criterion_ids:list" id=""
-            tal:attributes="value here/getId; id string:cb_${here/getId}">
-    </td>
-    <td align="left">
-        <label for="" tal:attributes="for string:cb_${here/getId}">
-            <strong title="" tal:attributes="title here/Description">List:</strong>
-            <tt tal:content="here/Field">Field</tt>
-        </label>
-        <input type="hidden" name="criteria.id:records" value="" tal:attributes="value here/getId">
-    </td>
-</tr>
-<tr valign="top">
-    <td width="20">&nbsp;</td>
-    <td valign="top"><br>
-        <strong>Value:</strong>
-        <textarea name="criteria.value:lines:records" rows="5" cols="40"
-            tal:content="python:modules['string'].join(here.value, '\n')"
-        ></textarea>
-    </td>
-</tr>
+ <tr>
+  <td width="20">
+   <input type="checkbox" value="" name="criterion_ids:list" id=""
+          tal:attributes="value here/getId; id string:cb_${here/getId}">
+  </td>
+  <td align="left">
+   <label for="" tal:attributes="for string:cb_${here/getId}">
+    <strong title="" tal:attributes="title here/Description">List:</strong>
+    <tt tal:content="here/Field">Field</tt>
+   </label>
+   <input type="hidden" name="criteria.id:records" value=""
+          tal:attributes="value here/getId">
+  </td>
+ </tr>
+ <tr valign="top">
+  <td width="20">&nbsp;</td>
+  <td valign="top">
+   <strong>Value:</strong><br>
+   <textarea name="criteria.value:lines:records" rows="5" cols="40"
+             tal:content="python:modules['string'].join(here.value, '\n')"
+   ></textarea><br>
+   <strong>Operator:</strong><br>
+   <select name="criteria.operator:records">
+    <option value=""
+            tal:attributes="selected not: here/operator">-- none --</option>
+    <option value="or"
+            tal:attributes="selected python:here.operator == 'or'">or</option>
+    <option value="and" 
+            tal:attributes="selected python:here.operator == 'and'">and</option>
+   </select>
+  </td>
+ </tr>
 </table>