fixes for fields

11 files changed, 53 insertions, 69 deletions

diff --git a/share/skin/base/layout/field/array.tt b/share/skin/base/layout/field/array.tt
index 2b049b5..35c6429 100644
--- a/share/skin/base/layout/field/array.tt
+++ b/share/skin/base/layout/field/array.tt
@@ -5,16 +5,18 @@
 
 =for layout label
 
-<strong > [% content | html %]: </strong>
+<span class="field_array_label"> [% content | html %]: </span>
 
 =for layout list
 
+<div id="array_list">
 <ul>
 [% content %]
 </ul>
+</div>
 
 =for layout item
 
 <li>[% content | html %]</li>
 
-=cut
\ No newline at end of file
+=cut
diff --git a/share/skin/base/layout/field/collection.tt b/share/skin/base/layout/field/collection.tt
index 47244e7..abd7e56 100644
--- a/share/skin/base/layout/field/collection.tt
+++ b/share/skin/base/layout/field/collection.tt
@@ -5,13 +5,15 @@
 
 =for layout label_box
 
-<strong> [% label %]: </strong>
+<span class="field_collection_label_box"> [% label %]: </span>
 
 =for layout list
 
+<div id="collection_list">
 <ul>
 [% call_next %]
 </ul>
+</div>
 
 =for layout item
 
diff --git a/share/skin/base/layout/field/mutable.tt b/share/skin/base/layout/field/mutable.tt
index 3983263..ee6cf08 100644
--- a/share/skin/base/layout/field/mutable.tt
+++ b/share/skin/base/layout/field/mutable.tt
@@ -1,6 +1,6 @@
 =for layout widget
 
-[% label_fragment %] [% field %] [% message_fragment %] 
+<div id="[% field_name | replace('\d\-', '') %]">[% label_fragment %] [% field %] [% message_fragment %]</div>
 
 =for layout label
 
@@ -12,14 +12,9 @@ class="required_field"
 
 =for layout field_is_required_no
 
-=for layout field
-
-<!-- Why is this here??? -->
-FIELD GOES HERE
-
 =for layout message
 
-<span>[% message %]</span><br />
+<span class="field_mutable_message">[% message %]</span>
 
 =for layout field
 
diff --git a/share/skin/base/layout/field/mutable/choose_many.tt b/share/skin/base/layout/field/mutable/choose_many.tt
index ed6c136..f6658c6 100644
--- a/share/skin/base/layout/field/mutable/choose_many.tt
+++ b/share/skin/base/layout/field/mutable/choose_many.tt
@@ -3,12 +3,12 @@
 =for layout widget
 
 [% label_fragment %]
-<br />
 [% message_fragment %]
 [% field %]
 
 =for layout field
 
+<div id="choose_many_field">
 <table>
   <tr>
     <td> [% available_values %] </td>
@@ -19,6 +19,7 @@
     </td>
   </tr>
 </table>
+</div>
 
 =for layout available_values
 
@@ -42,9 +43,11 @@
 
 =for layout action_buttons
 
-<input type="submit" value="&gt;&gt;" name="[% event_id_add_all_values %]" /> <br />
-<input type="submit" value="&gt;" name="[% event_id_do_add_values %]" /> <br />
-<input type="submit" value="&lt;" name="[% event_id_do_remove_values %]" /> <br />
-<input type="submit" value="&lt;&lt;" name="[% event_id_remove_all_values %]" /> <br />
+<div id="choose_many_buttons">
+  <input type="submit" value="&gt;&gt;" name="[% event_id_add_all_values %]" />
+  <input type="submit" value="&gt;" name="[% event_id_do_add_values %]" />
+  <input type="submit" value="&lt;" name="[% event_id_do_remove_values %]" />
+  <input type="submit" value="&lt;&lt;" name="[% event_id_remove_all_values %]" />
+</div>
 
 =cut
diff --git a/share/skin/base/layout/field/mutable/time_range.tt b/share/skin/base/layout/field/mutable/time_range.tt
index 954c40b..3ce9c24 100644
--- a/share/skin/base/layout/field/mutable/time_range.tt
+++ b/share/skin/base/layout/field/mutable/time_range.tt
@@ -11,7 +11,7 @@ TODO
 <!-- This conditional goes away when mst comes up with something better -->
 [% content_str = GET content; %]
 [% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
+  <span class="time_range_label"><label> [% content_str | html %]: </label></span>
 [% END; %]
 
 =for layout message
@@ -19,7 +19,7 @@ TODO
 <!-- This conditional goes away when mst comes up with something better -->
 [% content_str = GET content; %]
 [% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
+  <span class="time_range_message"> [% content_str | html %] </span>
 [% END %]
 
 =cut
diff --git a/share/skin/default/layout/field.tt b/share/skin/default/layout/field.tt
new file mode 100644
index 0000000..d800da9
--- /dev/null
+++ b/share/skin/default/layout/field.tt
@@ -0,0 +1,7 @@
+=extends NEXT
+
+=for layout label
+
+<span class="field_label"><strong > [% label %]: </strong></span>
+
+=cut
diff --git a/share/skin/default/layout/field/array.tt b/share/skin/default/layout/field/array.tt
new file mode 100644
index 0000000..acb2cce
--- /dev/null
+++ b/share/skin/default/layout/field/array.tt
@@ -0,0 +1,7 @@
+=extends NEXT
+
+=for layout label
+
+<span class="field_array_label"><strong > [% content | html %]: </strong></span>
+
+=cut
diff --git a/share/skin/default/layout/field/collection.tt b/share/skin/default/layout/field/collection.tt
new file mode 100644
index 0000000..f513e94
--- /dev/null
+++ b/share/skin/default/layout/field/collection.tt
@@ -0,0 +1,7 @@
+=extends NEXT
+
+=for layout label_box
+
+<span class="field_collection_label_box"><strong> [% label %]: </strong></span>
+
+=cut
diff --git a/share/skin/default/layout/field/mutable.tt b/share/skin/default/layout/field/mutable.tt
new file mode 100644
index 0000000..615e14e
--- /dev/null
+++ b/share/skin/default/layout/field/mutable.tt
@@ -0,0 +1,7 @@
+=extends NEXT
+
+=for layout message
+
+[% call_next %]<br />
+
+=cut
diff --git a/share/skin/default/layout/field/mutable/choose_many.tt b/share/skin/default/layout/field/mutable/choose_many.tt
index ed6c136..177030f 100644
--- a/share/skin/default/layout/field/mutable/choose_many.tt
+++ b/share/skin/default/layout/field/mutable/choose_many.tt
@@ -1,50 +1,18 @@
-=extends field/mutable
+=extends NEXT
 
 =for layout widget
 
-[% label_fragment %]
-<br />
+[% label_fragment %]<br />
 [% message_fragment %]
 [% field %]
 
-=for layout field
-
-<table>
-  <tr>
-    <td> [% available_values %] </td>
-    <td>  [% action_buttons %]  </td>
-    <td>
-      [% selected_values %]
-      [% current_values  %]
-    </td>
-  </tr>
-</table>
-
-=for layout available_values
-
-<select size="10" multiple="multiple"  name="[% event_id_add_values %]">
- [% call_next %]
-</select>
-
-=for layout selected_values
-
-<select size="10" multiple="multiple"  name="[% event_id_remove_values %]">
- [% call_next %]
-</select>
-
-=for layout hidden_value
-
-<input type="hidden" name="[% field_name %]" value="[% hidden_value %]">
-
-=for layout value_option
-
-<option value="[% option_value %]">[% option_name %]</option>
-
 =for layout action_buttons
 
+<div id="choose_many_buttons">
 <input type="submit" value="&gt;&gt;" name="[% event_id_add_all_values %]" /> <br />
 <input type="submit" value="&gt;" name="[% event_id_do_add_values %]" /> <br />
 <input type="submit" value="&lt;" name="[% event_id_do_remove_values %]" /> <br />
 <input type="submit" value="&lt;&lt;" name="[% event_id_remove_all_values %]" /> <br />
+</div>
 
 =cut
diff --git a/share/skin/default/layout/field/mutable/time_range.tt b/share/skin/default/layout/field/mutable/time_range.tt
index 954c40b..04c6165 100644
--- a/share/skin/default/layout/field/mutable/time_range.tt
+++ b/share/skin/default/layout/field/mutable/time_range.tt
@@ -1,25 +1,11 @@
-=for layout widget
-
-[% label %] [% field %] [% message %]
-
-=for layout field
-
-TODO
-
-=for layout label
-
-<!-- This conditional goes away when mst comes up with something better -->
-[% content_str = GET content; %]
-[% IF content_str.length; %]
-  <label> [% content_str | html %]: </label>
-[% END; %]
+=extends NEXT
 
 =for layout message
 
 <!-- This conditional goes away when mst comes up with something better -->
 [% content_str = GET content; %]
 [% IF content_str.length; %]
-  <span> [% content_str | html %] </span> <br />
+  <span class="time_range_message"> [% content_str | html %] </span><br />
 [% END %]
 
 =cut