From a3b0dc2e17de0ec5ea5327ac6b84659aeb84d252 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 7 Aug 2013 23:24:34 +0300 Subject: [PATCH] use control-group classes for inline forms in profile and group pages --- app/views/groups/_new_group_member.html.haml | 8 ++++---- app/views/groups/edit.html.haml | 8 ++++---- app/views/groups/new.html.haml | 12 ++++++------ app/views/profiles/account.html.haml | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml index 2e17ff12a18..234392c03e1 100644 --- a/app/views/groups/_new_group_member.html.haml +++ b/app/views/groups/_new_group_member.html.haml @@ -6,14 +6,14 @@ group %p 1. Choose users you want in the group - .clearfix + .control-group = f.label :user_ids, "People" - .input= users_select_tag(:user_ids, multiple: true, class: 'input-large') + .controls= users_select_tag(:user_ids, multiple: true, class: 'input-large') %p 2. Set access level for them - .clearfix + .control-group = f.label :group_access, "Group Access" - .input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen" + .controls= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen" .form-actions = f.submit 'Add users into group', class: "btn btn-create" diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 13264b37134..2017be5aaf3 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -26,15 +26,15 @@ - 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/groups/new.html.haml b/app/views/groups/new.html.haml index 4aa58dedc4a..ccf610b8c36 100644 --- a/app/views/groups/new.html.haml +++ b/app/views/groups/new.html.haml @@ -2,19 +2,19 @@ - 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 - .clearfix - .input + .control-group + .controls %ul %li Group is kind of directory for several projects %li All created groups are private diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index 7951f639bfb..f1cd8fe3fbf 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -27,15 +27,15 @@ - @user.errors.full_messages.each do |msg| %li= msg - .clearfix + .control-group = f.label :password - .input= f.password_field :password, required: true - .clearfix + .controls= f.password_field :password, required: true + .control-group = f.label :password_confirmation - .input + .controls = f.password_field :password_confirmation, required: true - .clearfix - .input + .control-group + .controls = f.submit 'Save password', class: "btn btn-save" @@ -70,7 +70,7 @@ = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| .padded = f.label :username - .input + .controls = f.text_field :username, required: true   %span.loading-gif.hide= image_tag "ajax_loader.gif" @@ -83,7 +83,7 @@ %ul.cred %li It will change web url for personal projects. %li It will change the git path to repositories for personal projects. - .input + .controls = f.submit 'Save username', class: "btn btn-save" - if gitlab_config.signup_enabled