diff options
| author | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2012-12-31 08:50:27 +0100 |
| commit | aed84444142604a62e37e57acfaaf957219e2c8d (patch) | |
| tree | e00b1f5844590393171e0bc839ab516d39f5144d /app/views/user_groups | |
| parent | c24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff) | |
| parent | 12c8f4c82770ded6ea6b519e4451ed6757419ddf (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/user_groups')
| -rw-r--r-- | app/views/user_groups/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/user_groups/_form_core.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_groups/_form.html.haml b/app/views/user_groups/_form.html.haml index cbe3cc4..3263fdd 100644 --- a/app/views/user_groups/_form.html.haml +++ b/app/views/user_groups/_form.html.haml @@ -1,4 +1,4 @@ -= simple_form_for(@user_group) do |f| += simple_form_for([@parent, @user_group]) do |f| = f.error_notification = render "form_core", :f => f diff --git a/app/views/user_groups/_form_core.html.haml b/app/views/user_groups/_form_core.html.haml index a45ba6f..edb0dbc 100644 --- a/app/views/user_groups/_form_core.html.haml +++ b/app/views/user_groups/_form_core.html.haml @@ -1,3 +1,3 @@ .inputs - = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint') + = f.input :name, :label => t('user_groups.form.name.label'), :hint => conditional_hint('user_groups.form.name.hint'), :autofocus => true = f.input :description, :label => t('user_groups.form.description.label'), :hint => conditional_hint('user_groups.form.description.hint') |