Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

styles the preferences in user profile

Browse source
This commit is contained in:
Manuel Wiedenmann 2013-06-14 22:38:07 +02:00
parent ba923a8f16
commit 6569579c02
4 changed files with 60 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -208,3 +208,21 @@ tr.unavailable {
dt { width: 160px; } dt { width: 160px; }
dd { margin-left: 170px; } dd { margin-left: 170px; }
} }
.settings {
.settings-group {
margin-bottom: 10px;
.control-label {
margin: 5px 0 0 0;
}
}
.control-group {
margin-bottom: 5px;
}
.control-group.h_wrapper {
margin-bottom: 5px;
}
.control-group.select {
margin-bottom: 15px
}
}

43
app/views/shared/_user_form_fields.html.haml
View file

@ -6,18 +6,37 @@
= f.input :password, :required => f.object.new_record? = f.input :password, :required => f.object.new_record?
= f.input :password_confirmation = f.input :password_confirmation
= f.simple_fields_for :settings_attributes do |s| .settings
%h4
=t 'simple_form.labels.settings.settings_groups'
= f.simple_fields_for :settings_attributes do |s|
= s.simple_fields_for :profile, defaults: { inline_label: true } do |profile| .settings-group
= profile.input 'language', as: :select, collection: available_locales, required: false, selected: f.object.settings.profile['language'] %div{class: 'control-group h_wrapper'}
= profile.input 'phone_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] } %h5{class: 'control-label'}
= profile.input 'email_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] } = t 'simple_form.labels.settings.settings_group.profile'
= profile.input 'name_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
= s.simple_fields_for :messages, defaults: { inline_label: true, label: false } do |messages| = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
= messages.input 'send_as_email', as: :boolean, input_html: { checked: f.object.settings.messages['send_as_email'] } = profile.input 'language', as: :select, collection: available_locales, required: false, selected: f.object.settings.profile['language']
= profile.input 'phone_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['phone_is_public'] }
= profile.input 'email_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['email_is_public'] }
= profile.input 'name_is_public', as: :boolean, label: false, input_html: { checked: f.object.settings.profile['name_is_public'] }
.settings-group
%div{class: 'control-group'}
%h5{class: 'control-label'}
=t 'simple_form.labels.settings.settings_group.messages'
= s.simple_fields_for :messages, defaults: { inline_label: true, label: false } do |messages|
= messages.input 'send_as_email', as: :boolean, input_html: { checked: f.object.settings.messages['send_as_email'] }
.settings-group
%div{class: 'control-group'}
%h5{class: 'control-label'}
= t 'simple_form.labels.settings.settings_group.notify'
= s.simple_fields_for :notify, defaults: { inline_label: true, label: false } do |notify|
= notify.input 'order_finished', as: :boolean, input_html: { checked: f.object.settings.notify['order_finished'] }
= notify.input 'negative_balance', as: :boolean, input_html: { checked: f.object.settings.notify['negative_balance'] }
= notify.input 'upcoming_tasks', as: :boolean, input_html: { checked: f.object.settings.notify['upcoming_tasks'] }
= s.simple_fields_for :notify, defaults: { inline_label: true, label: false } do |notify|
= notify.input 'order_finished', as: :boolean, input_html: { checked: f.object.settings.notify['order_finished'] }
= notify.input 'negative_balance', as: :boolean, input_html: { checked: f.object.settings.notify['negative_balance'] }
= notify.input 'upcoming_tasks', as: :boolean, input_html: { checked: f.object.settings.notify['upcoming_tasks'] }

5
config/locales/de.yml
View file

@ -1621,6 +1621,11 @@ de:
one: Arbeitsgruppe one: Arbeitsgruppe
other: Arbeitsgruppen other: Arbeitsgruppen
settings: settings:
settings_groups: Einstellungen
settings_group:
profile: Porfil
notify: Benachrichtigungen
messages: Nachrichten
profile: profile:
language: Sprache language: Sprache
phone_is_public: Telefon ist für Mitglieder sichtbar phone_is_public: Telefon ist für Mitglieder sichtbar

6
config/locales/en.yml
View file

@ -1624,7 +1624,11 @@ en:
one: Workgroup one: Workgroup
other: Workgroups other: Workgroups
settings: settings:
notify: settings_groups: Preferences
settings_group:
profile: Porfile
notify: Notifications
messages: Messages
profile: profile:
language: Language language: Language
phone_is_public: Phone number is visible for other members. phone_is_public: Phone number is visible for other members.