Commit a3b0dc2e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

use control-group classes for inline forms in profile and group pages

parent f2082edb
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
group group
%p 1. Choose users you want in the group %p 1. Choose users you want in the group
.clearfix .control-group
= f.label :user_ids, "People" = 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 %p 2. Set access level for them
.clearfix .control-group
= f.label :group_access, "Group Access" = 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 .form-actions
= f.submit 'Add users into group', class: "btn btn-create" = f.submit 'Add users into group', class: "btn btn-create"
......
...@@ -26,15 +26,15 @@ ...@@ -26,15 +26,15 @@
- if @group.errors.any? - if @group.errors.any?
.alert.alert-error .alert.alert-error
%span= @group.errors.full_messages.first %span= @group.errors.full_messages.first
.clearfix .control-group
= f.label :name do = f.label :name do
Group name is Group name is
.input .controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
.clearfix.group-description-holder .control-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.input .controls
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.form-actions .form-actions
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
- if @group.errors.any? - if @group.errors.any?
.alert.alert-error .alert.alert-error
%span= @group.errors.full_messages.first %span= @group.errors.full_messages.first
.clearfix .control-group
= f.label :name do = f.label :name do
Group name is Group name is
.input .controls
= f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "xxlarge left"
.clearfix.group-description-holder .control-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.input .controls
= f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "xxlarge js-gfm-input", rows: 4
.clearfix .control-group
.input .controls
%ul %ul
%li Group is kind of directory for several projects %li Group is kind of directory for several projects
%li All created groups are private %li All created groups are private
......
...@@ -27,15 +27,15 @@ ...@@ -27,15 +27,15 @@
- @user.errors.full_messages.each do |msg| - @user.errors.full_messages.each do |msg|
%li= msg %li= msg
.clearfix .control-group
= f.label :password = f.label :password
.input= f.password_field :password, required: true .controls= f.password_field :password, required: true
.clearfix .control-group
= f.label :password_confirmation = f.label :password_confirmation
.input .controls
= f.password_field :password_confirmation, required: true = f.password_field :password_confirmation, required: true
.clearfix .control-group
.input .controls
= f.submit 'Save password', class: "btn btn-save" = f.submit 'Save password', class: "btn btn-save"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
= form_for @user, url: update_username_profile_path, method: :put, remote: true do |f| = form_for @user, url: update_username_profile_path, method: :put, remote: true do |f|
.padded .padded
= f.label :username = f.label :username
.input .controls
= f.text_field :username, required: true = f.text_field :username, required: true
   
%span.loading-gif.hide= image_tag "ajax_loader.gif" %span.loading-gif.hide= image_tag "ajax_loader.gif"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
%ul.cred %ul.cred
%li It will change web url for personal projects. %li It will change web url for personal projects.
%li It will change the git path to repositories 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" = f.submit 'Save username', class: "btn btn-save"
- if gitlab_config.signup_enabled - if gitlab_config.signup_enabled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment