summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 21:02:18 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 21:02:18 +0100
commita74efe4bb1b5afeaf892d18ba2e7969ed17b4099 (patch)
tree908a588600022f5bfeabd9b9edcfed2eed01a45b /app/views
parent0d5fd7ba5092b4d00826f3572448bb54ac2ec983 (diff)
parent7cdcbdc4b851b348bb21e0f2ff437138e8b9884b (diff)
Merge branch 'page_caching' into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/users/_form_core.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/users/_form_core.html.haml b/app/views/users/_form_core.html.haml
index 8e18d12..24b15f5 100644
--- a/app/views/users/_form_core.html.haml
+++ b/app/views/users/_form_core.html.haml
@@ -1,6 +1,6 @@
.inputs
- if GuiFunction.display?('name_data_fields_in_user_edit_form', current_user)
- = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio
+ = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio_buttons
= f.input :first_name, :label => t('users.form.first_name.label'), :hint => conditional_hint('users.form.first_name.hint'), :autofocus => true
= f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint')
= f.input :last_name, :label => t('users.form.last_name.label'), :hint => conditional_hint('users.form.last_name.hint')