Skip to content

Commit

Permalink
Style deploy keys form
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  • Loading branch information
dzaporozhets committed Jan 2, 2014
1 parent 34245ce commit 66a91c4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/views/profiles/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
%span Choose File ...
&nbsp;
%span.file_name.js-avatar-filename File name...
= f.file_field :avatar, class: "js-user-avatar-input hide"
= f.file_field :avatar, class: "js-user-avatar-input hidden"
.light The maximum file size allowed is 100KB.
- if @user.avatar?
%hr
Expand Down
8 changes: 4 additions & 4 deletions app/views/projects/deploy_keys/_form.html.haml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
%div
= form_for [@project, @key], url: project_deploy_keys_path do |f|
= form_for [@project, @key], url: project_deploy_keys_path, html: { class: 'deploy-key-form form-horizontal' } do |f|
-if @key.errors.any?
.alert.alert-danger
%ul
- @key.errors.full_messages.each do |msg|
%li= msg

.form-group
= f.label :title
= f.label :title, class: "control-label"
.col-sm-10= f.text_field :title, class: 'form-control'
.form-group
= f.label :key
= f.label :key, class: "control-label"
.col-sm-10
%p.light
Paste a machine public key here. Read more about how to generate it
= link_to "here", help_ssh_path
= f.text_area :key, class: "form-control thin_area"
= f.text_area :key, class: "form-control thin_area", rows: 5

.form-actions
= f.submit 'Create', class: "btn-create btn"
Expand Down
6 changes: 3 additions & 3 deletions app/views/projects/team_members/_form.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%h3.page-title
= "New project member(s)"

= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f|
= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f|
-if @user_project_relation.errors.any?
.alert.alert-danger
%ul
Expand All @@ -10,13 +10,13 @@

%p 1. Choose people you want in the project
.form-group
= f.label :user_ids, "People"
= f.label :user_ids, "People", class: 'control-label'
.col-sm-10
= users_select_tag(:user_ids, multiple: true)

%p 2. Set access level for them
.form-group
= f.label :project_access, "Project Access"
= f.label :project_access, "Project Access", class: 'control-label'
.col-sm-10= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select chosen"

.form-actions
Expand Down

0 comments on commit 66a91c4

Please sign in to comment.