summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
committerJulian Pawlowski <julian.pawlowski@gmail.com>2013-01-16 21:06:22 +0100
commit6a3eb3a21958e4bc1a73e5774c3717fc01ee64e0 (patch)
tree933902730c79edb8f1f8372ce6af6217433c9a84 /app/views
parentea70e08534319dd3f15c34859c498771fa7d9b32 (diff)
parenta74efe4bb1b5afeaf892d18ba2e7969ed17b4099 (diff)
Merge branch 'develop' of https://github.com/amooma/GS5 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')