diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-14 09:12:50 -0500 |
commit | 813da6788e5129579db04e89aac3076902af2c7a (patch) | |
tree | 2c7c8435e4eae5baa4b6169973c8da4644d44ded /app/views/settings/profiles | |
parent | e3d0d72b299103d30fcda2b7175906c73c1571bc (diff) | |
parent | 78ed4ab75ff77d7cba60d478aa1f45d1c104785d (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: db/schema.rb
Diffstat (limited to 'app/views/settings/profiles')
-rw-r--r-- | app/views/settings/profiles/show.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index be7bd0ba0..5f63466d9 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -19,6 +19,16 @@ .fields-group = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked') + .fields-group + .input.with_block_label + %label= t('simple_form.labels.defaults.fields') + %span.hint= t('simple_form.hints.defaults.fields') + + = f.simple_fields_for :fields do |fields_f| + .row + = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name') + = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value') + .actions = f.button :button, t('generic.save_changes'), type: :submit |