Choices edit field should not be HTML

include/class.forms.php

@@ -606,7 +606,12 @@ class ChoiceField extends FormField {
     function getConfigurationOptions() {
         return array(
             'choices'  =>  new TextareaField(array(
-                'id'=>1, 'label'=>'Choices', 'required'=>false, 'default'=>'')),
+                'id'=>1, 'label'=>'Choices', 'required'=>false, 'default'=>'',
+                'hint'=>'List choices, one per line. To protect against
+                spelling changes, specify key:value names to preserve
+                entries if the list item names change',
+                'configuration'=>array('html'=>false)
+            )),
         );
     }
 

include/staff/templates/dynamic-field-config.tmpl.php

@@ -24,7 +24,7 @@
             else if ($f->get('default'))
                 $f->value = $f->get('default');
             ?>
-            <tr><td>
+            <tr><td class="multi-line">
             <label for="<?php echo $f->getWidget()->name; ?>"
                 style="vertical-align:top;padding-top:0.2em">
                 <?php echo Format::htmlchars($f->get('label')); ?>:</label>
@@ -53,7 +53,7 @@
         }
         ?>
         <tr><td colspan="2"><hr/></td></tr>
-        <tr><td>
+        <tr><td class="multi-line">
         <label for="hint"
             style="vertical-align:top;padding-top:0.2em">Help Text:</label>
         </td><td>

scp/css/scp.css

@@ -541,7 +541,7 @@ a.print {
 }
 
 
-.form_table td.multi-line {
+td.multi-line {
     vertical-align:top;
     padding-top: 0.4em;
     padding-bottom: 0.4em;