From b4410eb57d8e07de23de18b6375039c47e6cea35 Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@mozilla.org>
Date: Fri, 3 May 2013 10:13:53 -0400
Subject: Bug 866248 - backport new date custom field type from bug 801664 to
 bmo/4.2 r=glob

---
 template/en/default/bug/field.html.tmpl          | 5 +++--
 template/en/default/global/field-descs.none.tmpl | 1 +
 template/en/default/search/field.html.tmpl       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 78a449990..e157a80ed 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -57,8 +57,9 @@
                value="[% value FILTER html %]" size="40"
                maxlength="[% constants.MAX_FREETEXT_LENGTH FILTER none %]"
                [% ' aria-required="true"' IF field.is_mandatory %]>
-    [% CASE constants.FIELD_TYPE_DATETIME %]
-      <input name="[% field.name FILTER html %]" size="20"
+    [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
+      [% size = (field.type == constants.FIELD_TYPE_DATE) ? 10 : 20 %]
+      <input name="[% field.name FILTER html %]" size="[% size FILTER none %]"
              id="[% field.name FILTER html %]"
              value="[% value FILTER html %]"
              [% ' aria-required="true"' IF field.is_mandatory %]
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 46fbc6d31..1596f3884 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -60,6 +60,7 @@
                    ${constants.FIELD_TYPE_MULTI_SELECT}  => "Multiple-Selection Box",
                    ${constants.FIELD_TYPE_TEXTAREA}      => "Large Text Box",
                    ${constants.FIELD_TYPE_DATETIME}      => "Date/Time",
+                   ${constants.FIELD_TYPE_DATE}          => "Date",
                    ${constants.FIELD_TYPE_BUG_ID}        => "$terms.Bug ID",
                 } %]
 
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index 19f199692..ae7ca1ad4 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -71,7 +71,7 @@
       YAHOO.bugzilla.keywordAutocomplete.init('[% field.name FILTER js %]',
                                               'keyword_autocomplete');
     </script>
-  [% CASE constants.FIELD_TYPE_DATETIME %]
+  [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = field
       tag_name = "span"
-- 
cgit v1.2.3-24-g4f1b