summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-02 13:32:27 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-02 13:32:27 +0200
commit66a91c4fabe2b777d0e63329c466614ed76c6b83 (patch)
treee09d9348c846aa42d14c0c4a70e1c64c5316b77d /app/views
parent34245ceb9962050bd8a953b4ea79e8e990558ab4 (diff)
downloadgitlab-ce-66a91c4fabe2b777d0e63329c466614ed76c6b83.tar.gz
Style deploy keys form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
-rw-r--r--app/views/profiles/show.html.haml2
-rw-r--r--app/views/projects/deploy_keys/_form.html.haml8
-rw-r--r--app/views/projects/team_members/_form.html.haml6
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 73d90fe9f45..6ae1032aebf 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -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
diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
index 2505159b0cd..ebb92b36b47 100644
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ b/app/views/projects/deploy_keys/_form.html.haml
@@ -1,5 +1,5 @@
%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
@@ -7,15 +7,15 @@
%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"
diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml
index 6673d44eb1a..01218090ff0 100644
--- a/app/views/projects/team_members/_form.html.haml
+++ b/app/views/projects/team_members/_form.html.haml
@@ -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
@@ -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