mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 15:20:13 +01:00
Update the preferences pages to Bootstrap
This commit is contained in:
Matt Rogers
parent
d1a9e2746b
commit
7652791451
9 changed files with 123 additions and 65 deletions
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,6 +25,11 @@
|
|||
display: block;
|
||||
}
|
||||
|
||||
form {
|
||||
border: 0px none;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@media screen and (min-width: 1170px) {
|
||||
.footer-line {
|
||||
display: inline;
|
||||
|
|
|
|||
|
|
@ -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 << "<br/>".html_safe
|
||||
s << yield
|
||||
s << "<br/><br/>".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
|
||||
|
|
|
|||
|
|
@ -3,20 +3,34 @@
|
|||
<div class='prefs_example'>This will result in: <span id='prefs.date_format'><%= l(Time.zone.today, :format => current_user.prefs.date_format) %></span></div>
|
||||
<br/>
|
||||
Or pick one of the following:<br/>
|
||||
<% %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) %> <br/>
|
||||
<% end %>
|
||||
<br/>
|
||||
|
||||
<%= pref_with_text_field('prefs', 'title_date_format') %>
|
||||
<div class="form-group btn-group" role="group" data-toggle="buttons">
|
||||
<% %i{default short long longer}.each do |format| %>
|
||||
<label class="btn btn-default">
|
||||
<%= radio_button_tag("date_picker1", t("date.formats.#{format}")) %>
|
||||
<%= l(Time.zone.today, format: format) %>
|
||||
</label>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', 'title_date_format') %>
|
||||
</div>
|
||||
<div class='prefs_example'>This will result in: <span id='prefs.title_date_format'><%= l(Time.zone.today, :format => current_user.prefs.title_date_format) %></span></div>
|
||||
<br/>
|
||||
Or pick one of the following:<br/>
|
||||
<% %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) %> <br/>
|
||||
<% end %>
|
||||
<div class="form-group btn-group" role="group" data-toggle="buttons">
|
||||
<% %i{default short long longer}.each do |format| %>
|
||||
<label class="btn btn-default">
|
||||
<%= radio_button_tag("date_picker2", t("date.formats.#{format}")) %>
|
||||
<%= l(Time.zone.today, format: format) %>
|
||||
</label>
|
||||
<% end %>
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
<%= pref('prefs', 'time_zone') { time_zone_select('prefs','time_zone') } %>
|
||||
<div class="form-group">
|
||||
<%= pref('prefs', 'time_zone') { time_zone_select('prefs','time_zone', [], {}, class: "form-control") } %>
|
||||
</div>
|
||||
|
||||
<%= pref_with_select_field('prefs', "week_starts", (0..6).to_a.map {|num| [t('date.day_names')[num], num] }) %>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "week_starts", (0..6).to_a.map {|num| [t('date.day_names')[num], num] }) %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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}) %>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field 'user', 'first_name' %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field 'user', 'last_name' %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', 'locale', I18n.available_locales.map {|l| l.to_s}) %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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]}) } %>
|
||||
<div class="form-group">
|
||||
<%= 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]]]) %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "show_completed_projects_in_sidebar") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "show_hidden_projects_in_sidebar") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "show_hidden_contexts_in_sidebar") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "show_project_on_todo_done") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', 'staleness_starts') %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', 'review_period') %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', 'show_number_completed') %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', 'refresh') %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_select_field('prefs', "verbose_action_descriptors") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', "mobile_todos_per_page") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref_with_text_field('prefs', "sms_email") %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<%= pref('prefs', "sms_context") { select('prefs', 'sms_context_id', current_user.contexts.map{|c| [c.name, c.id]}, {}, class: "form-control") } %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,27 +1,38 @@
|
|||
<div id="display_box">
|
||||
<div class="bootstrap">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<div id="edit_error_status">
|
||||
<%= get_list_of_error_messages_for(@user)%>
|
||||
<%= get_list_of_error_messages_for(@prefs)%>
|
||||
</div>
|
||||
|
||||
<div id="edit_error_status">
|
||||
<%= get_list_of_error_messages_for(@user)%>
|
||||
<%= get_list_of_error_messages_for(@prefs)%>
|
||||
<%= form_for(@prefs) do %>
|
||||
<ul id="tabs" class="nav nav-tabs">
|
||||
<li role="presentation" class="active">
|
||||
<%= link_to t('preferences.tabs.profile'), "#profile", data: { toggle: "tab" } %>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<%= link_to t('preferences.tabs.authentication'), "#authentication", data: { toggle: "tab" } %>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<%= link_to t('preferences.tabs.date_and_time'), "#date_and_time", data: { toggle: "tab" } %>
|
||||
</li>
|
||||
<li role="presentation">
|
||||
<%= link_to t('preferences.tabs.tracks_behavior'), "#behavior", data: { toggle: "tab" } %>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content">
|
||||
<div role="tabpanel" class="tab-pane active" id="profile"><%= render :partial => 'profile'%></div>
|
||||
<div role="tabpanel" class="tab-pane" id="authentication"><%= render :partial => 'authentication'%></div>
|
||||
<div role="tabpanel" class="tab-pane" id="date_and_time"><%= render :partial => 'date_and_time'%></div>
|
||||
<div role="tabpanel" class="tab-pane" id="behavior"><%= render :partial => 'tracks_behavior'%></div>
|
||||
</div>
|
||||
|
||||
<button type="submit" id="prefs_submit" class="btn btn-default"><%= t('common.update') %></button>
|
||||
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= form_for(@prefs) do %>
|
||||
<div id="tabs">
|
||||
<ul>
|
||||
<li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
|
||||
<li><a href="#tabs-2"><%= t('preferences.tabs.authentication')%></a></li>
|
||||
<li><a href="#tabs-3"><%= t('preferences.tabs.date_and_time')%></a></li>
|
||||
<li><a href="#tabs-4"><%= t('preferences.tabs.tracks_behavior')%></a></li>
|
||||
</ul>
|
||||
<div id="tabs-1"><%= render :partial => 'profile'%></div>
|
||||
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
|
||||
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
|
||||
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
|
||||
</div>
|
||||
|
||||
<br/>
|
||||
|
||||
<button type="submit" id="prefs_submit"><%= t('common.update') %></button>
|
||||
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
<label for="user[password]"><%= t('users.new_password_label') %>:</label><br/>
|
||||
<%= password_field "user", "password", :size => 40, :autocomplete => "off" %><br/>
|
||||
<label for="user[password_confirmation]"><%= t('users.password_confirmation_label') %>:</label><br/>
|
||||
<%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "off" %><br/>
|
||||
<div class="form-group">
|
||||
<label for="user[password]"><%= t('users.new_password_label') %>:</label>
|
||||
<%= password_field "user", "password", :size => 40, :autocomplete => "off", class: "form-control" %>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="user[password_confirmation]"><%= t('users.password_confirmation_label') %>:</label>
|
||||
<%= password_field "user", "password_confirmation", :size => 40, :autocomplete => "off", class: "form-control" %>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue