From 909f35bbb61acfb03beacad087e01f58a9fe7009 Mon Sep 17 00:00:00 2001
From: Gregory Martin <greg@edx.org>
Date: Tue, 20 Dec 2016 13:36:21 -0500
Subject: [PATCH] add blankTitle option

---
 .../tests/lms/test_account_settings.py        |  2 +-
 .../account_settings_fields_spec.js           |  5 +++--
 .../views/account_settings_factory.js         |  3 ++-
 .../fields/field_dropdown_account.underscore  | 20 +++++++++++--------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/common/test/acceptance/tests/lms/test_account_settings.py b/common/test/acceptance/tests/lms/test_account_settings.py
index eb4758e14b..136222fb01 100644
--- a/common/test/acceptance/tests/lms/test_account_settings.py
+++ b/common/test/acceptance/tests/lms/test_account_settings.py
@@ -421,7 +421,7 @@ class AccountSettingsPageTest(AccountSettingsTestMixin, AcceptanceTest):
         self._test_dropdown_field(
             u'time_zone',
             u'Time Zone',
-            u'',
+            u'Default (Local Time Zone)',
             [
                 u'Europe/Kiev ({abbr}, UTC{offset})'.format(abbr=kiev_abbr, offset=kiev_offset),
                 u'US/Pacific ({abbr}, UTC{offset})'.format(abbr=pacific_abbr, offset=pacific_offset),
diff --git a/lms/static/js/spec/student_account/account_settings_fields_spec.js b/lms/static/js/spec/student_account/account_settings_fields_spec.js
index c69958b75a..156233b36a 100644
--- a/lms/static/js/spec/student_account/account_settings_fields_spec.js
+++ b/lms/static/js/spec/student_account/account_settings_fields_spec.js
@@ -54,7 +54,8 @@ define(['backbone',
                     valueAttribute: 'time_zone',
                     groupOptions: [{
                         groupTitle: gettext('All Time Zones'),
-                        selectOptions: FieldViewsSpecHelpers.SELECT_OPTIONS
+                        selectOptions: FieldViewsSpecHelpers.SELECT_OPTIONS,
+                        blankTitle: 'Default (Local Time Zone)'
                     }],
                     persistChanges: true,
                     required: true
@@ -97,7 +98,7 @@ define(['backbone',
 
                 // expect time zone dropdown to have two subheaders (country/all time zone sub-headers) with new values
                 expect(timeZoneView.$(groupsSelector).length).toBe(2);
-                expect(timeZoneView.$(groupOptionsSelector).length).toBe(5);
+                expect(timeZoneView.$(groupOptionsSelector).length).toBe(6);
                 expect(timeZoneView.$(groupOptionsSelector)[0].value).toBe('America/Guyana');
 
                 // select time zone option from option
diff --git a/lms/static/js/student_account/views/account_settings_factory.js b/lms/static/js/student_account/views/account_settings_factory.js
index 419c1e1e7c..a1af832df6 100644
--- a/lms/static/js/student_account/views/account_settings_factory.js
+++ b/lms/static/js/student_account/views/account_settings_factory.js
@@ -118,7 +118,8 @@
                                 helpMessage: gettext('Select the time zone for displaying course dates. If you do not specify a time zone, course dates, including assignment deadlines, will be displayed in your browser\'s local time zone.'), // eslint-disable-line max-len
                                 groupOptions: [{
                                     groupTitle: gettext('All Time Zones'),
-                                    selectOptions: fieldsData.time_zone.options
+                                    selectOptions: fieldsData.time_zone.options,
+                                    blankTitle: gettext('Default (Local Time Zone)')
                                 }],
                                 persistChanges: true
                             })
diff --git a/lms/templates/fields/field_dropdown_account.underscore b/lms/templates/fields/field_dropdown_account.underscore
index 718fffb3eb..f5fdd0e293 100644
--- a/lms/templates/fields/field_dropdown_account.underscore
+++ b/lms/templates/fields/field_dropdown_account.underscore
@@ -20,16 +20,20 @@
         <span class="u-field-value-readonly"></span>
     <% } else { %>
         <select name="select" id="u-field-select-<%- id %>" aria-describedby="u-field-help-message-<%- id %>">
-            <% if (showBlankOption) { %>
-                <option value=""></option>
-            <% } %>
             <% _.each(groupOptions, function(groupOption) { %>
-                <% if (groupOption.groupTitle != null) { %>
-                    <optgroup label="<%- groupOption.groupTitle %>">
+                <% if (showBlankOption) { %>
+                    <% if (groupOption.blankTitle) { %>
+                        <option value=""><%- groupOption.blankTitle %></option>
+                    <% } else { %>
+                        <option value=""></option>
+                    <% } %>
                 <% } %>
-                <% _.each(groupOption.selectOptions, function(selectOption) { %>
-                    <option value="<%- selectOption[0] %>"><%- selectOption[1] %></option>
-                <% }); %>
+                    <% if (groupOption.groupTitle != null) { %>
+                        <optgroup label="<%- groupOption.groupTitle %>">
+                    <% } %>
+                    <% _.each(groupOption.selectOptions, function(selectOption) { %>
+                        <option value="<%- selectOption[0] %>"><%- selectOption[1] %></option>
+                    <% }); %>
             <% }); %>
         </select>
         <span class="icon-caret-down" aria-hidden="true"></span>