Download as
Browse Code »

Commit df437f419ba92f376f95917b235930311b4c9946

Authored by Dmitriy Zaporozhets
1 parent c52f9e1a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

use control-group classes for inline forms in project area pages

Showing 7 changed files with 26 additions and 26 deletions   Show diff stats
app/views/profiles/passwords/new.html.haml
  Diff comments   View file @df437f4
@@ -10,13 +10,13 @@ @@ -10,13 +10,13 @@
10 - @user.errors.full_messages.each do |msg| 10 - @user.errors.full_messages.each do |msg|
11 %li= msg 11 %li= msg
12 12
13 - .clearfix 13 + .control-group
14 = f.label :password 14 = f.label :password
15 - .input= f.password_field :password, required: true  
16 - .clearfix 15 + .controls= f.password_field :password, required: true
  16 + .control-group
17 = f.label :password_confirmation 17 = f.label :password_confirmation
18 - .input 18 + .controls
19 = f.password_field :password_confirmation, required: true 19 = f.password_field :password_confirmation, required: true
20 - .clearfix  
21 - .input 20 + .control-group
  21 + .controls
22 = f.submit 'Set new password', class: "btn btn-create" 22 = f.submit 'Set new password', class: "btn btn-create"
app/views/projects/deploy_keys/_form.html.haml
  Diff comments   View file @df437f4
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 - @key.errors.full_messages.each do |msg| 6 - @key.errors.full_messages.each do |msg|
7 %li= msg 7 %li= msg
8 8
9 - .clearfix 9 + .control-group
10 = f.label :title 10 = f.label :title
11 - .input= f.text_field :title  
12 - .clearfix 11 + .controls= f.text_field :title
  12 + .control-group
13 = f.label :key 13 = f.label :key
14 - .input 14 + .controls
15 = f.text_area :key, class: [:xxlarge, :thin_area] 15 = f.text_area :key, class: [:xxlarge, :thin_area]
16 %p.hint 16 %p.hint
17 Paste a machine public key here. Read more about how generate it 17 Paste a machine public key here. Read more about how generate it
app/views/projects/hooks/index.html.haml
  Diff comments   View file @df437f4
@@ -11,9 +11,9 @@ @@ -11,9 +11,9 @@
11 .alert.alert-error 11 .alert.alert-error
12 - @hook.errors.full_messages.each do |msg| 12 - @hook.errors.full_messages.each do |msg|
13 %p= msg 13 %p= msg
14 - .clearfix 14 + .control-group
15 = f.label :url, "URL:" 15 = f.label :url, "URL:"
16 - .input 16 + .controls
17 = f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json' 17 = f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
18   18  
19 = f.submit "Add Web Hook", class: "btn btn-create" 19 = f.submit "Add Web Hook", class: "btn btn-create"
app/views/projects/milestones/_form.html.haml
  Diff comments   View file @df437f4
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 .span6 26 .span6
27 .control-group 27 .control-group
28 = f.label :due_date, "Due Date", class: "control-label" 28 = f.label :due_date, "Due Date", class: "control-label"
29 - .input= f.hidden_field :due_date 29 + .controls= f.hidden_field :due_date
30 .controls 30 .controls
31 .datepicker 31 .datepicker
32 32
app/views/projects/snippets/_form.html.haml
  Diff comments   View file @df437f4
@@ -9,16 +9,16 @@ @@ -9,16 +9,16 @@
9 - @snippet.errors.full_messages.each do |msg| 9 - @snippet.errors.full_messages.each do |msg|
10 %li= msg 10 %li= msg
11 11
12 - .clearfix 12 + .control-group
13 = f.label :title 13 = f.label :title
14 - .input= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true  
15 - .clearfix 14 + .controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
  15 + .control-group
16 = f.label "Lifetime" 16 = f.label "Lifetime"
17 - .input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}  
18 - .clearfix 17 + .controls= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
  18 + .control-group
19 .file-editor 19 .file-editor
20 = f.label :file_name, "File" 20 = f.label :file_name, "File"
21 - .input 21 + .controls
22 .file-holder.snippet 22 .file-holder.snippet
23 .file-title 23 .file-title
24 = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true 24 = f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
app/views/projects/team_members/_form.html.haml
  Diff comments   View file @df437f4
@@ -9,15 +9,15 @@ @@ -9,15 +9,15 @@
9 %li= msg 9 %li= msg
10 10
11 %h6 1. Choose people you want in the team 11 %h6 1. Choose people you want in the team
12 - .clearfix 12 + .control-group
13 = f.label :user_ids, "People" 13 = f.label :user_ids, "People"
14 - .input 14 + .controls
15 = users_select_tag(:user_ids, multiple: true) 15 = users_select_tag(:user_ids, multiple: true)
16 16
17 %h6 2. Set access level for them 17 %h6 2. Set access level for them
18 - .clearfix 18 + .control-group
19 = f.label :project_access, "Project Access" 19 = f.label :project_access, "Project Access"
20 - .input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen" 20 + .controls= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
21 21
22 .actions 22 .actions
23 = f.submit 'Add users', class: "btn btn-create" 23 = f.submit 'Add users', class: "btn btn-create"
app/views/projects/wikis/_form.html.haml
  Diff comments   View file @df437f4
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium" 15 = f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
16 = f.label :format, class: "pull-right", style: "padding-right: 20px;" 16 = f.label :format, class: "pull-right", style: "padding-right: 20px;"
17 .ui-box-body 17 .ui-box-body
18 - .input 18 + .controls
19 %span.cgray 19 %span.cgray
20 Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. 20 Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
21 To link to a (new) page you can just type 21 To link to a (new) page you can just type
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
24 24
25 .ui-box-bottom 25 .ui-box-bottom
26 = f.label :content 26 = f.label :content
27 - .input= f.text_area :content, class: 'span8 js-gfm-input' 27 + .controls= f.text_area :content, class: 'span8 js-gfm-input'
28 .ui-box-bottom 28 .ui-box-bottom
29 = f.label :commit_message 29 = f.label :commit_message
30 - .input= f.text_field :message, class: 'span8' 30 + .controls= f.text_field :message, class: 'span8'
31 .actions 31 .actions
32 - if @wiki && @wiki.persisted? 32 - if @wiki && @wiki.persisted?
33 = f.submit 'Save changes', class: "btn-save btn" 33 = f.submit 'Save changes', class: "btn-save btn"