From 49fa9907ae55be4922929def98afb9be29281c1e Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 7 Aug 2013 23:20:10 +0300 Subject: [PATCH] use control-group classes for inline forms in admin area --- app/views/admin/groups/edit.html.haml | 12 ++++++------ app/views/admin/groups/new.html.haml | 8 ++++---- app/views/admin/hooks/index.html.haml | 4 ++-- app/views/admin/users/_form.html.haml | 52 ++++++++++++++++++++++++++-------------------------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index f4d931f..027f663 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -4,21 +4,21 @@ - if @group.errors.any? .alert.alert-error %span= @group.errors.full_messages.first - .clearfix.group_name_holder + .control-group.group_name_holder = f.label :name do Group name is - .input + .controls = f.text_field :name, placeholder: "Example Group", class: "xxlarge" - .clearfix.group-description-holder + .control-group.group-description-holder = f.label :description, "Details" - .input + .controls = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 - .clearfix.group_name_holder + .control-group.group_name_holder = f.label :path do %span.cred Group path is - .input + .controls = f.text_field :path, placeholder: "example-group", class: "xxlarge danger" %ul.cred %li Changing group path can have unintended side effects. diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index 483c40b..dcb91d5 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -4,14 +4,14 @@ - if @group.errors.any? .alert.alert-error %span= @group.errors.full_messages.first - .clearfix + .control-group = f.label :name do Group name is - .input + .controls = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" - .clearfix.group-description-holder + .control-group.group-description-holder = f.label :description, "Details" - .input + .controls = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 .form-actions diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 7c3b999..0830bc3 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -10,9 +10,9 @@ .alert.alert-error - @hook.errors.full_messages.each do |msg| %p= msg - .clearfix + .control-group = f.label :url, "URL:" - .input + .controls = f.text_field :url, class: "text_field xxlarge input-xpadding"   = f.submit "Add System Hook", class: "btn btn-create" diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index 4f7f05c..0e7f5cb 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -8,28 +8,28 @@ %fieldset %legend Account - .clearfix + .control-group = f.label :name - .input + .controls = f.text_field :name, required: true, autocomplete: "off" %span.help-inline * required - .clearfix + .control-group = f.label :username - .input + .controls = f.text_field :username, required: true, autocomplete: "off" %span.help-inline * required - .clearfix + .control-group = f.label :email - .input + .controls = f.text_field :email, required: true, autocomplete: "off" %span.help-inline * required - if @user.new_record? %fieldset %legend Password - .clearfix + .control-group = f.label :password - .input + .controls %strong A temporary password will be generated and sent to user. %br @@ -37,33 +37,33 @@ - else %fieldset %legend Password - .clearfix + .control-group = f.label :password - .input= f.password_field :password, disabled: f.object.force_random_password - .clearfix + .controls= f.password_field :password, disabled: f.object.force_random_password + .control-group = f.label :password_confirmation - .input= f.password_field :password_confirmation, disabled: f.object.force_random_password + .controls= f.password_field :password_confirmation, disabled: f.object.force_random_password %fieldset %legend Access .row .span8 - .clearfix + .control-group = f.label :projects_limit - .input= f.number_field :projects_limit + .controls= f.number_field :projects_limit - .clearfix + .control-group = f.label :can_create_group - .input= f.check_box :can_create_group + .controls= f.check_box :can_create_group - .clearfix + .control-group = f.label :can_create_team - .input= f.check_box :can_create_team + .controls= f.check_box :can_create_team - .clearfix + .control-group = f.label :admin do %strong.cred Administrator - .input= f.check_box :admin + .controls= f.check_box :admin .span4 - unless @user.new_record? .alert.alert-error @@ -75,15 +75,15 @@ = link_to 'Block User', block_admin_user_path(@user), confirm: 'USER WILL BE BLOCKED! Are you sure?', method: :put, class: "btn btn-small btn-remove" %fieldset %legend Profile - .clearfix + .control-group = f.label :skype - .input= f.text_field :skype - .clearfix + .controls= f.text_field :skype + .control-group = f.label :linkedin - .input= f.text_field :linkedin - .clearfix + .controls= f.text_field :linkedin + .control-group = f.label :twitter - .input= f.text_field :twitter + .controls= f.text_field :twitter .actions - if @user.new_record? -- libgit2 0.21.2