Commit df437f41 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

parent b99b57161149
......@@ -10,13 +10,13 @@
- @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 'Set new password', class: "btn btn-create"
......@@ -6,12 +6,12 @@
- @key.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :title
.input= f.text_field :title
.clearfix
.controls= f.text_field :title
.control-group
= f.label :key
.input
.controls
= f.text_area :key, class: [:xxlarge, :thin_area]
%p.hint
Paste a machine public key here. Read more about how generate it
......
......@@ -11,9 +11,9 @@
.alert.alert-error
- @hook.errors.full_messages.each do |msg|
%p= msg
.clearfix
.control-group
= f.label :url, "URL:"
.input
.controls
= f.text_field :url, class: "text_field xxlarge input-xpadding", placeholder: 'http://example.com/trigger-ci.json'
 
= f.submit "Add Web Hook", class: "btn btn-create"
......
......@@ -26,7 +26,7 @@
.span6
.control-group
= f.label :due_date, "Due Date", class: "control-label"
.input= f.hidden_field :due_date
.controls= f.hidden_field :due_date
.controls
.datepicker
......
......@@ -9,16 +9,16 @@
- @snippet.errors.full_messages.each do |msg|
%li= msg
.clearfix
.control-group
= f.label :title
.input= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
.clearfix
.controls= f.text_field :title, placeholder: "Example Snippet", class: 'input-xlarge', required: true
.control-group
= f.label "Lifetime"
.input= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
.clearfix
.controls= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
.control-group
.file-editor
= f.label :file_name, "File"
.input
.controls
.file-holder.snippet
.file-title
= f.text_field :file_name, placeholder: "example.rb", class: 'snippet-file-name', required: true
......
......@@ -9,15 +9,15 @@
%li= msg
%h6 1. Choose people you want in the team
.clearfix
.control-group
= f.label :user_ids, "People"
.input
.controls
= users_select_tag(:user_ids, multiple: true)
%h6 2. Set access level for them
.clearfix
.control-group
= f.label :project_access, "Project Access"
.input= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
.controls= select_tag :project_access, options_for_select(Project.access_options, @user_project_relation.project_access), class: "project-access-select chosen"
.actions
= f.submit 'Add users', class: "btn btn-create"
......
......@@ -15,7 +15,7 @@
= f.select :format, options_for_select(GollumWiki::MARKUPS, {selected: @wiki.format}), {}, class: "pull-right input-medium"
= f.label :format, class: "pull-right", style: "padding-right: 20px;"
.ui-box-body
.input
.controls
%span.cgray
Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
To link to a (new) page you can just type
......@@ -24,10 +24,10 @@
.ui-box-bottom
= f.label :content
.input= f.text_area :content, class: 'span8 js-gfm-input'
.controls= f.text_area :content, class: 'span8 js-gfm-input'
.ui-box-bottom
= f.label :commit_message
.input= f.text_field :message, class: 'span8'
.controls= f.text_field :message, class: 'span8'
.actions
- if @wiki && @wiki.persisted?
= f.submit 'Save changes', class: "btn-save btn"
......
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