mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 23:30:12 +01:00
get preferences scenario to pass
This commit is contained in:
parent
ba0b637c85
commit
d432d91cc8
4 changed files with 15 additions and 31 deletions
|
|
@ -1,9 +1,10 @@
|
||||||
module PreferencesHelper
|
module PreferencesHelper
|
||||||
|
|
||||||
def pref(model, pref_name, &block)
|
def pref(model, pref_name, &block)
|
||||||
s = "<label for #{model+pref_name}>#{Preference.human_attribute_name(pref_name)}:</label><br/>"
|
s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model+pref_name)
|
||||||
|
s << "<br/>".html_safe
|
||||||
s << yield
|
s << yield
|
||||||
s << "<br/><br/>"
|
s << "<br/><br/>".html_safe
|
||||||
s
|
s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,10 @@ class Preference < ActiveRecord::Base
|
||||||
belongs_to :sms_context, :class_name => 'Context'
|
belongs_to :sms_context, :class_name => 'Context'
|
||||||
|
|
||||||
attr_accessible :date_format, :week_starts, :show_number_completed, :show_completed_projects_in_sidebar,
|
attr_accessible :date_format, :week_starts, :show_number_completed, :show_completed_projects_in_sidebar,
|
||||||
:show_hidden_contexts_in_sidebar, :staleness_starts, :due_style, :admin_email, :locale
|
:show_hidden_contexts_in_sidebar, :staleness_starts, :due_style, :admin_email, :locale,
|
||||||
|
:title_date_format, :time_zone, :show_hidden_projects_in_sidebar, :show_project_on_todo_done, :review_period,
|
||||||
|
:refresh, :verbose_action_descriptors, :mobile_todos_per_page, :sms_email, :sms_context_id
|
||||||
|
|
||||||
def self.due_styles
|
def self.due_styles
|
||||||
{ :due_in_n_days => 0, :due_on => 1}
|
{ :due_in_n_days => 0, :due_on => 1}
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,11 @@
|
||||||
<div id="display_box">
|
<div id="display_box">
|
||||||
|
|
||||||
<div id="edit_error_status">
|
<div id="edit_error_status">
|
||||||
<% if @user.errors.any? -%>
|
<%= get_list_of_error_messages_for(@user)%>
|
||||||
<ul>
|
<%= get_list_of_error_messages_for(@prefs)%>
|
||||||
<% @user.errors.full_messages.each do |msg| %>
|
|
||||||
<li><%= msg %></li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
<% end -%>
|
|
||||||
<% if @prefs.errors.any? -%>
|
|
||||||
<ul>
|
|
||||||
<% @prefs.errors.full_messages.each do |msg| %>
|
|
||||||
<li><%= msg %></li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
<% end -%>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%= form_tag :action => 'update' do %>
|
<%= form_for(@prefs) do %>
|
||||||
<div id="tabs">
|
<div id="tabs">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
|
<li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
|
||||||
|
|
@ -25,18 +13,10 @@
|
||||||
<li><a href="#tabs-3"><%= t('preferences.tabs.date_and_time')%></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>
|
<li><a href="#tabs-4"><%= t('preferences.tabs.tracks_behavior')%></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div id="tabs-1">
|
<div id="tabs-1"><%= render :partial => 'profile'%></div>
|
||||||
<%= render :partial => 'profile'%>
|
<div id="tabs-2"><%= render :partial => 'authentication'%></div>
|
||||||
</div>
|
<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
|
||||||
<div id="tabs-2">
|
<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
|
||||||
<%= render :partial => 'authentication'%>
|
|
||||||
</div>
|
|
||||||
<div id="tabs-3">
|
|
||||||
<%= render :partial => 'date_and_time'%>
|
|
||||||
</div>
|
|
||||||
<div id="tabs-4">
|
|
||||||
<%= render :partial => 'tracks_behavior'%>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
|
||||||
|
|
@ -152,6 +152,7 @@ Tracksapp::Application.routes.draw do
|
||||||
match 'signup' => "users#new"
|
match 'signup' => "users#new"
|
||||||
|
|
||||||
resources :notes
|
resources :notes
|
||||||
|
resources :preferences
|
||||||
|
|
||||||
match 'search' => 'search#index'
|
match 'search' => 'search#index'
|
||||||
match 'search/results' => 'search#results', :via => 'post'
|
match 'search/results' => 'search#results', :via => 'post'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue