diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-09 02:49:11 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-09 02:49:11 +0300 |
| commit | 8b551ee31858db9c5da1ff5245359151d5b71211 (patch) | |
| tree | 39fc875c2e2cade77dd4723630782200fef33dcf /app/views/admin | |
| parent | c025c0d58948680c3021a598822c2814f7fe1cce (diff) | |
| parent | 4658e554b7129c44221a73fe8ec3b73b4b9b8b24 (diff) | |
Merge branch 'emails-on-push'
Conflicts:
app/controllers/projects/services_controller.rb
app/models/project_services/emails_on_push_service.rb
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/services/_form.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml index 4ddddbd46ea..291e48efc12 100644 --- a/app/views/admin/services/_form.html.haml +++ b/app/views/admin/services/_form.html.haml @@ -53,14 +53,16 @@ - @service.fields.each do |field| - name = field[:name] + - title = field[:title] || name.humanize - value = @service.send(name) unless field[:type] == 'password' - type = field[:type] - placeholder = field[:placeholder] - choices = field[:choices] - default_choice = field[:default_choice] + - help = field[:help] .form-group - = f.label name, class: "control-label" + = f.label name, title, class: "control-label" .col-sm-10 - if type == 'text' = f.text_field name, class: "form-control", placeholder: placeholder @@ -72,6 +74,8 @@ = f.select name, options_for_select(choices, value ? value : default_choice), {}, { class: "form-control" } - elsif type == 'password' = f.password_field name, class: 'form-control' + - if help + %span.help-block= help .form-actions = f.submit 'Save', class: 'btn btn-save' |