[Checkins] SVN: z3c.form/trunk/ orderedselect lists displayed tokens instead of value

[Axel Müller]

Log message for revision 82319:
  orderedselect lists displayed tokens instead of value
  

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/src/z3c/form/browser/README.txt
  U   z3c.form/trunk/src/z3c/form/browser/orderedselect.py
  U   z3c.form/trunk/src/z3c/form/browser/orderedselect.txt
  U   z3c.form/trunk/src/z3c/form/browser/orderedselect_input.pt

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2007-12-17 20:28:31 UTC (rev 82318)
+++ z3c.form/trunk/CHANGES.txt	2007-12-17 20:46:41 UTC (rev 82319)
@@ -8,6 +8,8 @@
 
 - Feature: Add a hidden widget template for the ``ISelectWidget``.
 
+- Feature: arrows in orderedselect replaced by named entities 
+
 - Bug: ``createId`` could not handle arbitrary unicode input. Thanks to
   Andreas Reuleaux for reporting the bug and a patch for it. (Added
   descriptive doctests for the function in the process.)
@@ -17,6 +19,8 @@
 
 - Bug: orderedselect didn't submit selected values 
 
+- Bug orderedselect lists displayed tokens instead of value
+
 Version 1.7.0 (2007-10-09)
 --------------------------
 

Modified: z3c.form/trunk/src/z3c/form/browser/README.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/README.txt	2007-12-17 20:28:31 UTC (rev 82318)
+++ z3c.form/trunk/src/z3c/form/browser/README.txt	2007-12-17 20:46:41 UTC (rev 82319)
@@ -479,12 +479,12 @@
       </td>
       <td>
         <button name="from2toButton" type="button"
-                value=" -&gt;"
-                onclick="javascript:from2to('foo')">&nbsp;-&gt;</button>
+                value="&rArr;"
+                onclick="javascript:from2to('foo')">&rArr;</button>
         <br />
         <button name="to2fromButton" type="button"
-                value="&lt;- "
-                onclick="javascript:to2from('foo')">&lt;-&nbsp;</button>
+                value="&lArr;"
+                onclick="javascript:to2from('foo')">&lArr;</button>
       </td>
       <td>
         <select id="foo-to" name="bar.to" size="5"
@@ -499,11 +499,11 @@
         </span>
       </td>
       <td>
-        <button name="upButton" type="button" value="^"
-                onclick="javascript:moveUp('foo')">^</button>
+        <button name="upButton" type="button" value="&uArr;"
+                onclick="javascript:moveUp('foo')">&uArr;</button>
         <br />
-        <button name="downButton" type="button" value="v"
-                onclick="javascript:moveDown('foo')">v</button>
+        <button name="downButton" type="button" value="&dArr;"
+                onclick="javascript:moveDown('foo')">&dArr;</button>
       </td>
     </tr>
   </table>
@@ -677,12 +677,12 @@
       </td>
       <td>
         <button name="from2toButton" type="button"
-                value=" -&gt;"
-                onclick="javascript:from2to('foo')">&nbsp;-&gt;</button>
+                value="&rArr;"
+                onclick="javascript:from2to('foo')">&rArr;</button>
         <br />
         <button name="to2fromButton" type="button"
-                value="&lt;- "
-                onclick="javascript:to2from('foo')">&lt;-&nbsp;</button>
+                value="&lArr;"
+                onclick="javascript:to2from('foo')">&lArr;</button>
       </td>
       <td>
         <select id="foo-to" name="bar.to" size="5"
@@ -697,11 +697,11 @@
         </span>
       </td>
       <td>
-        <button name="upButton" type="button" value="^"
-                onclick="javascript:moveUp('foo')">^</button>
+        <button name="upButton" type="button" value="&uArr;"
+                onclick="javascript:moveUp('foo')">&uArr;</button>
         <br />
-        <button name="downButton" type="button" value="v"
-                onclick="javascript:moveDown('foo')">v</button>
+        <button name="downButton" type="button" value="&dArr;"
+                onclick="javascript:moveDown('foo')">&dArr;</button>
       </td>
     </tr>
   </table>

Modified: z3c.form/trunk/src/z3c/form/browser/orderedselect.py
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/orderedselect.py	2007-12-17 20:28:31 UTC (rev 82318)
+++ z3c.form/trunk/src/z3c/form/browser/orderedselect.py	2007-12-17 20:46:41 UTC (rev 82319)
@@ -39,7 +39,7 @@
 
     def getItem(self, term, count=0):
         id = '%s-%i' % (self.id, count)
-        content = term.token
+        content = term.value
         if zope.schema.interfaces.ITitledTokenizedTerm.providedBy(term):
             content = translate(
                 term.title, context=self.request, default=term.title)

Modified: z3c.form/trunk/src/z3c/form/browser/orderedselect.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/orderedselect.txt	2007-12-17 20:28:31 UTC (rev 82318)
+++ z3c.form/trunk/src/z3c/form/browser/orderedselect.txt	2007-12-17 20:46:41 UTC (rev 82319)
@@ -56,12 +56,12 @@
       </td>
       <td>
         <button name="from2toButton" type="button"
-                value=" -&gt;"
-                onclick="javascript:from2to('widget-id')">&nbsp;-&gt;</button>
+                value="&rArr;"
+                onclick="javascript:from2to('widget-id')">&rArr;</button>
         <br />
         <button name="to2fromButton" type="button"
-                value="&lt;- "
-                onclick="javascript:to2from('widget-id')">&lt;-&nbsp;</button>
+                value="&lArr;"
+                onclick="javascript:to2from('widget-id')">&lArr;</button>
       </td>
       <td>
         <select id="widget-id-to" name="widget.name.to"
@@ -74,11 +74,11 @@
         </span>
       </td>
       <td>
-        <button name="upButton" type="button" value="^"
-                onclick="javascript:moveUp('widget-id')">^</button>
+        <button name="upButton" type="button" value="&uArr;"
+                onclick="javascript:moveUp('widget-id')">&uArr;</button>
         <br />
-        <button name="downButton" type="button" value="v"
-                onclick="javascript:moveDown('widget-id')">v</button>
+        <button name="downButton" type="button" value="&dArr;"
+                onclick="javascript:moveDown('widget-id')">&dArr;</button>
       </td>
     </tr>
   </table>

Modified: z3c.form/trunk/src/z3c/form/browser/orderedselect_input.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/orderedselect_input.pt	2007-12-17 20:28:31 UTC (rev 82318)
+++ z3c.form/trunk/src/z3c/form/browser/orderedselect_input.pt	2007-12-17 20:46:41 UTC (rev 82319)
@@ -169,15 +169,15 @@
       </select>
     </td>
     <td>
-      <button name="from2toButton" type="button" value=" -&gt;"
+      <button name="from2toButton" type="button" value="&rArr;"
           onclick="javascript:from2to()"
           tal:attributes="onClick string:javascript:from2to('${view/id}')"
-          >&nbsp;-&gt;</button>
+          >&rArr;</button>
       <br />
-      <button name="to2fromButton" type="button" value="&lt;- "
+      <button name="to2fromButton" type="button" value="&lArr;"
           onclick="javascript:to2from()"
           tal:attributes="onClick string:javascript:to2from('${view/id}')"
-          >&lt;-&nbsp;</button>
+          >&lArr;</button>
     </td>
     <td>
       <select id="to" name="to" size="5" multiple=""
@@ -221,16 +221,16 @@
     </td>
     <td>
       <button
-          name="upButton" type="button" value="^"
+          name="upButton" type="button" value="&uArr;"
           onclick="javascript:moveUp()"
           tal:attributes="onClick string:javascript:moveUp('${view/id}')"
-          >^</button>
+          >&uArr;</button>
       <br />
       <button
-          name="downButton" type="button" value="v"
+          name="downButton" type="button" value="&dArr;"
           onclick="javascript:moveDown()"
           tal:attributes="onClick string:javascript:moveDown('${view/id}')"
-          >v</button>
+          >&dArr;</button>
     </td>
   </tr>
 </table>