diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb index 3f864e00..2fe5a74a 100644 --- a/app/assets/javascripts/tracks.js.erb +++ b/app/assets/javascripts/tracks.js.erb @@ -467,10 +467,6 @@ var PreferencesPage = { }); }, setup_behavior: function() { - $( "#tabs" ).tabs(); - - $( "button#prefs_submit" ).button(); - $('input[name="user[auth_type]"]').change(function() { var value = $('input[name="user[auth_type]"]:checked').val(); $('#open_id')[0].style.display = value ==='open_id' ? 'block' : 'none'; diff --git a/app/assets/stylesheets/legacy.css.scss b/app/assets/stylesheets/legacy.css.scss index 877022b8..8391c817 100644 --- a/app/assets/stylesheets/legacy.css.scss +++ b/app/assets/stylesheets/legacy.css.scss @@ -429,8 +429,6 @@ a.footer_link { } /* override jquery css to match tracks defaults better */ - div.ui-widget { font-size: 1em; } - div.ui-tabs li a { padding: 0.1em 1em; } div.pref_new_token a { color: #CC3334; } } diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index 3c13b809..71dbcaa6 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -25,6 +25,11 @@ display: block; } +form { + border: 0px none; + padding: 0; +} + @media screen and (min-width: 1170px) { .footer-line { display: inline; diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index fb1f189e..b187b75a 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -2,18 +2,16 @@ module PreferencesHelper def pref(model, pref_name, &block) s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model+pref_name) - s << "
".html_safe s << yield - s << "

".html_safe s end def pref_with_select_field(model, pref_name, collection = [ [t('preferences.is_true'),true], [t('preferences.is_false'), false] ]) - pref(model, pref_name) { select(model, pref_name, collection) } + pref(model, pref_name) { select(model, pref_name, collection, {}, class: "form-control") } end def pref_with_text_field(model, pref_name) - pref(model, pref_name) { text_field(model, pref_name) } + pref(model, pref_name) { text_field(model, pref_name, class: "form-control") } end end diff --git a/app/views/preferences/_date_and_time.html.erb b/app/views/preferences/_date_and_time.html.erb index cbb20804..ce566dcb 100644 --- a/app/views/preferences/_date_and_time.html.erb +++ b/app/views/preferences/_date_and_time.html.erb @@ -3,20 +3,34 @@
This will result in: <%= l(Time.zone.today, :format => current_user.prefs.date_format) %>

Or pick one of the following:
-<% %w{default short long longer}.each do |format| %> -<%= radio_button_tag("date_picker1", t("date.formats.#{format}")) %> <%= l(Time.zone.today, :format => format.to_sym) %>
-<% end %> -
- -<%= pref_with_text_field('prefs', 'title_date_format') %> +
+ <% %i{default short long longer}.each do |format| %> + + <% end %> +
+
+ <%= pref_with_text_field('prefs', 'title_date_format') %> +
This will result in: <%= l(Time.zone.today, :format => current_user.prefs.title_date_format) %>

Or pick one of the following:
-<% %w{default short long longer}.each do |format| %> -<%= radio_button_tag("date_picker2", t("date.formats.#{format}")) %> <%= l(Time.zone.today, :format => format.to_sym) %>
-<% end %> +
+ <% %i{default short long longer}.each do |format| %> + + <% end %> +

-<%= pref('prefs', 'time_zone') { time_zone_select('prefs','time_zone') } %> +
+ <%= pref('prefs', 'time_zone') { time_zone_select('prefs','time_zone', [], {}, class: "form-control") } %> +
-<%= pref_with_select_field('prefs', "week_starts", (0..6).to_a.map {|num| [t('date.day_names')[num], num] }) %> +
+ <%= pref_with_select_field('prefs', "week_starts", (0..6).to_a.map {|num| [t('date.day_names')[num], num] }) %> +
diff --git a/app/views/preferences/_profile.html.erb b/app/views/preferences/_profile.html.erb index 9a27ae97..b2f67ace 100644 --- a/app/views/preferences/_profile.html.erb +++ b/app/views/preferences/_profile.html.erb @@ -1,3 +1,9 @@ -<%= pref_with_text_field 'user', 'first_name' %> -<%= pref_with_text_field 'user', 'last_name' %> -<%= pref_with_select_field('prefs', 'locale', I18n.available_locales.map {|l| l.to_s}) %> \ No newline at end of file +
+ <%= pref_with_text_field 'user', 'first_name' %> +
+
+ <%= pref_with_text_field 'user', 'last_name' %> +
+
+ <%= pref_with_select_field('prefs', 'locale', I18n.available_locales.map {|l| l.to_s}) %> +
diff --git a/app/views/preferences/_tracks_behavior.html.erb b/app/views/preferences/_tracks_behavior.html.erb index b4937187..1479f522 100644 --- a/app/views/preferences/_tracks_behavior.html.erb +++ b/app/views/preferences/_tracks_behavior.html.erb @@ -1,14 +1,40 @@ -<%= pref_with_select_field('prefs', "due_style", [[t('models.preference.due_styles')[0],Preference.due_styles[:due_in_n_days]],[t('models.preference.due_styles')[1],Preference.due_styles[:due_on]]]) %> -<%= pref_with_select_field('prefs', "show_completed_projects_in_sidebar") %> -<%= pref_with_select_field('prefs', "show_hidden_projects_in_sidebar") %> -<%= pref_with_select_field('prefs', "show_hidden_contexts_in_sidebar") %> -<%= pref_with_select_field('prefs', "show_project_on_todo_done") %> -<%= pref_with_text_field('prefs', 'staleness_starts') %> -<%= pref_with_text_field('prefs', 'review_period') %> -<%= pref_with_text_field('prefs', 'show_number_completed') %> -<%= pref_with_text_field('prefs', 'refresh') %> -<%= pref_with_select_field('prefs', "verbose_action_descriptors") %> -<%= pref_with_text_field('prefs', "mobile_todos_per_page") %> -<%= pref_with_text_field('prefs', "sms_email") %> -<%= pref('prefs', "sms_context") { select('prefs', 'sms_context_id', current_user.contexts.map{|c| [c.name, c.id]}) } %> +
+ <%= pref_with_select_field('prefs', "due_style", [[t('models.preference.due_styles')[0],Preference.due_styles[:due_in_n_days]],[t('models.preference.due_styles')[1],Preference.due_styles[:due_on]]]) %> +
+
+ <%= pref_with_select_field('prefs', "show_completed_projects_in_sidebar") %> +
+
+ <%= pref_with_select_field('prefs', "show_hidden_projects_in_sidebar") %> +
+
+ <%= pref_with_select_field('prefs', "show_hidden_contexts_in_sidebar") %> +
+
+ <%= pref_with_select_field('prefs', "show_project_on_todo_done") %> +
+
+ <%= pref_with_text_field('prefs', 'staleness_starts') %> +
+
+ <%= pref_with_text_field('prefs', 'review_period') %> +
+
+ <%= pref_with_text_field('prefs', 'show_number_completed') %> +
+
+ <%= pref_with_text_field('prefs', 'refresh') %> +
+
+ <%= pref_with_select_field('prefs', "verbose_action_descriptors") %> +
+
+ <%= pref_with_text_field('prefs', "mobile_todos_per_page") %> +
+
+ <%= pref_with_text_field('prefs', "sms_email") %> +
+
+ <%= pref('prefs', "sms_context") { select('prefs', 'sms_context_id', current_user.contexts.map{|c| [c.name, c.id]}, {}, class: "form-control") } %> +
diff --git a/app/views/preferences/index.html.erb b/app/views/preferences/index.html.erb index 710961e4..852b67fe 100644 --- a/app/views/preferences/index.html.erb +++ b/app/views/preferences/index.html.erb @@ -1,27 +1,38 @@ -
+
+
+
+
+
+ <%= get_list_of_error_messages_for(@user)%> + <%= get_list_of_error_messages_for(@prefs)%> +
-
- <%= get_list_of_error_messages_for(@user)%> - <%= get_list_of_error_messages_for(@prefs)%> + <%= form_for(@prefs) do %> + +
+
<%= render :partial => 'profile'%>
+
<%= render :partial => 'authentication'%>
+
<%= render :partial => 'date_and_time'%>
+
<%= render :partial => 'tracks_behavior'%>
+
+ + + + <% end %> +
- - <%= form_for(@prefs) do %> -
- -
<%= render :partial => 'profile'%>
-
<%= render :partial => 'authentication'%>
-
<%= render :partial => 'date_and_time'%>
-
<%= render :partial => 'tracks_behavior'%>
-
- -
- - - - <% end %> +
diff --git a/app/views/users/_update_password.html.erb b/app/views/users/_update_password.html.erb index 09e044b5..5f2fa683 100644 --- a/app/views/users/_update_password.html.erb +++ b/app/views/users/_update_password.html.erb @@ -1,4 +1,8 @@ -
-<%= password_field "user", "password", :size => 40, :autocomplete => "off" %>
-
-<%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "off" %>
+
+ + <%= password_field "user", "password", :size => 40, :autocomplete => "off", class: "form-control" %> +
+
+ + <%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "off", class: "form-control" %> +