Bug 802613: Merge common code of admin/custom_fields/create.html.tmpl and admin/custom_fields/edit.html.tmpl into a single template

r=dkl a=LpSolit

1 files changed, 5 insertions, 125 deletions

diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl
index fb7f06f86..185cfffb5 100644
--- a/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/template/en/default/admin/custom_fields/create.html.tmpl
@@ -10,8 +10,6 @@
   # none
   #%]
 
-[% PROCESS "global/field-descs.none.tmpl" %]
-
 [% javascript = BLOCK %]
   [% INCLUDE "admin/custom_fields/cf-js.js.tmpl" %]
 [% END %]
@@ -26,7 +24,7 @@
 
 [%# set initial editability of fields such as Reverse Relationship Description %]
 <script type="text/javascript">
-YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('type'))});
+  YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('type'))});
 </script>
 
 <p>
@@ -47,129 +45,11 @@ YAHOO.util.Event.onDOMReady(function() {onChangeType(document.getElementById('ty
 </ul>
 
 <form id="add_field" action="editfields.cgi" method="GET">
-  <table border="0" cellspacing="0" cellpadding="5" id="edit_custom_field">
-    <tr>
-      <th class="narrow_label"><label for="name">Name:</label></th>
-      <td>
-        <input type="text" id="name" name="name" value="cf_" size="40" maxlength="64">
-      </td>
-
-      <th>
-        <label for="enter_bug">Can be set on [% terms.bug %] creation:</label>
-      </th>
-      <td>
-        <input type="checkbox" id="enter_bug" name="enter_bug" value="1"
-               onchange="toggleCheckbox(this, 'new_bugmail');">
-      </td>
-    </tr>
-    <tr>
-      <th class="narrow_label"><label for="desc">Description:</label></th>
-      <td><input type="text" id="desc" name="desc" value="" size="40"></td>
-
-      <th>
-        <label for="new_bugmail">Displayed in [% terms.bug %]mail for new [% terms.bugs %]:</label>
-      </th>
-      <td><input type="checkbox" id="new_bugmail" name="new_bugmail" value="1"></td>
-    </tr>
-    <tr>
-      <th class="narrow_label"><label for="type">Type:</label></th>
-      <td>
-        <select id="type" name="type" onchange="onChangeType(this)">
-          [% FOREACH type = field_types.keys %]
-            [% NEXT IF type == constants.FIELD_TYPE_UNKNOWN %]
-            <option value="[% type FILTER html %]">[% field_types.$type FILTER html %]</option>
-          [% END %]
-        </select>
-      </td>
-
-      <th><label for="obsolete">Is obsolete:</label></th>
-      <td><input type="checkbox" id="obsolete" name="obsolete" value="1"></td>
-    </tr>
-    <tr>
-      <th class="narrow_label"><label for="sortkey">Sortkey:</label></th>
-      <td>
-        <input type="text" id="sortkey" name="sortkey" size="6" maxlength="6">
-      </td>
-
-      <th align="right"><label for="is_mandatory">Is mandatory:</label></th>
-      <td><input type="checkbox" id="is_mandatory" name="is_mandatory" value="1"></td>
-    </tr>
-
-    <tr>
-      <th class="narrow_label">Long Description:</th>
-      <td>
-         [% INCLUDE global/textarea.html.tmpl
-          name           = 'long_desc'
-          id             = 'long_desc'
-          minrows        = 3
-          maxrows        = 5
-          cols           = 46
-          defaultcontent = defaultcontent
-        %]
-      </td>
-      <th>
-        <label for="visibility_field_id">Field only appears when:</label>
-      </th>
-      <td>
-        <select name="visibility_field_id" id="visibility_field_id"
-                onchange="onChangeVisibilityField()">
-          <option></option>
-          [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %]
-            <option value="[% sel_field.id FILTER html %]">
-              [% sel_field.description FILTER html %]
-              ([% sel_field.name FILTER html %])
-            </option>
-          [% END %]
-        </select>
-        <label for="visibility_values">
-          <strong>is set to any of:</strong>
-        </label>
-        <select multiple="multiple" size="5" name="visibility_values"
-                id="visibility_values" class="field_value">
-          <option value=""></option>
-        </select>
-      </td>
-    </tr>
-
-    <tr>
-      <th class="narrow_label">
-        <label for="reverse_desc">Reverse Relationship Description:</label>
-      </th>
-      <td>
-        <input type="text" id="reverse_desc" name="reverse_desc" value="" size="40" disabled="disabled">
-        <br/>
-        Use this label for the list of [% terms.bugs %] that link to
-        [%+ terms.abug %] with this 
-        [%+ field_types.${constants.FIELD_TYPE_BUG_ID} FILTER html %]
-        field. For example, if the description is "Is a duplicate of",
-        the reverse description would be "Duplicates of this [% terms.bug %]".
-        Leave blank to disable the list for this field.
-      </td>
-      <th>
-        <label for="value_field_id">
-          Field that controls the values<br>
-          that appear in this field:
-        </label>
-      </th>
+  [% PROCESS "admin/custom_fields/edit-common.html.tmpl" %]
 
-      <td>
-        <select disabled="disabled" name="value_field_id" id="value_field_id">
-          <option></option>
-          [% FOREACH sel_field = Bugzilla.fields({ is_select => 1 }) %]
-            <option value="[% sel_field.id FILTER html %]">
-              [% sel_field.description FILTER html %]
-              ([% sel_field.name FILTER html %])
-            </option>
-          [% END %]
-        </select>
-      </td>
-    </tr>
-  </table>
-  <p>
-    <input type="hidden" name="action" value="new">
-    <input type="hidden" name="token" value="[% token FILTER html %]">
-    <input type="submit" id="create" value="Create">
-  </p>
+  <input type="hidden" name="action" value="new">
+  <input type="hidden" name="token" value="[% token FILTER html %]">
+  <input type="submit" id="create" value="Create">
 </form>
 
 <p>