Commit 5fa805a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restyle issue form. Replace inputs

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a9fba2cd
...@@ -57,6 +57,6 @@ ...@@ -57,6 +57,6 @@
max-width: 170px !important; max-width: 170px !important;
} }
select.select-wide { select.chosen {
width: 200px; min-width: 200px;
} }
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.form-group .form-group
= f.label :message = f.label :message
.col-sm-10 .col-sm-10
= f.text_area :message, class: "input-lg", rows: 2, required: true = f.text_area :message, class: "form-control", rows: 2, required: true
%div %div
= link_to '#', class: 'js-toggle-colors-link' do = link_to '#', class: 'js-toggle-colors-link' do
Customize colors Customize colors
......
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Example Group", class: "input-lg" = f.text_field :name, placeholder: "Example Group", class: "form-control"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
.form-group.group_name_holder .form-group.group_name_holder
= f.label :path do = f.label :path do
%span.cred Group path %span.cred Group path
.col-sm-10 .col-sm-10
= f.text_field :path, placeholder: "example-group", class: "input-lg danger" = f.text_field :path, placeholder: "example-group", class: "form-control danger"
%ul.cred %ul.cred
%li Changing group path can have unintended side effects. %li Changing group path can have unintended side effects.
%li Renaming group path will rename directory for all related projects %li Renaming group path will rename directory for all related projects
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
.form-actions .form-actions
= f.submit 'Create group', class: "btn btn-create" = f.submit 'Create group', class: "btn btn-create"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.form-group .form-group
= f.label :url, "URL:" = f.label :url, "URL:"
.col-sm-10 .col-sm-10
= f.text_field :url, class: "text_field input-lg input-xpadding" = f.text_field :url, class: "text_field form-control input-xpadding"
&nbsp; &nbsp;
= f.submit "Add System Hook", class: "btn btn-create" = f.submit "Add System Hook", class: "btn btn-create"
%hr %hr
......
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
.form-actions .form-actions
= f.submit 'Save group', class: "btn btn-save" = f.submit 'Save group', class: "btn btn-save"
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
= f.label :name do = f.label :name do
Group name Group name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Ex. OpenSource", class: "input-lg left" = f.text_field :name, placeholder: "Ex. OpenSource", class: "form-control left"
.form-group.group-description-holder .form-group.group-description-holder
= f.label :description, "Details" = f.label :description, "Details"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 250, class: "input-lg js-gfm-input", rows: 4 = f.text_area :description, maxlength: 250, class: "form-control js-gfm-input", rows: 4
.form-group .form-group
.col-sm-10 .col-sm-10
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, class: 'input-lg' .col-sm-10= f.text_field :title, class: 'form-control'
.form-group .form-group
= f.label :key = f.label :key
.col-sm-10 .col-sm-10
%p.light %p.light
Paste a machine public key here. Read more about how to generate it Paste a machine public key here. Read more about how to generate it
= link_to "here", help_ssh_path = link_to "here", help_ssh_path
= f.text_area :key, class: "input-lg thin_area" = f.text_area :key, class: "form-control thin_area"
.form-actions .form-actions
= f.submit 'Create', class: "btn-create btn" = f.submit 'Create', class: "btn-create btn"
......
%div.issue-form-holder %div.issue-form-holder
%h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}" %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.iid}"
= form_for [@project, @issue] do |f| %hr
= form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
-if @issue.errors.any? -if @issue.errors.any?
.alert.alert-danger .alert.alert-danger
- @issue.errors.full_messages.each do |msg| - @issue.errors.full_messages.each do |msg|
%span= msg %span= msg
%br %br
.issue-box
.title
.form-group .form-group
= f.label :title do = f.label :title, class: 'control-label' do
%strong= "Subject *" %strong= "Subject *"
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "input-lg js-gfm-input", autofocus: true, required: true = f.text_field :title, maxlength: 255, class: "form-control js-gfm-input", autofocus: true, required: true
.context
.form-group .form-group
.issue_assignee.pull-left = f.label :description, "Details", class: 'control-label'
= f.label :assignee_id do .col-sm-10
= f.text_area :description, class: "form-control js-gfm-input", rows: 14
%p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
%hr
.form-group
.issue_assignee
= f.label :assignee_id, class: 'control-label' do
%i.icon-user %i.icon-user
Assign to Assign to
.col-sm-10 .col-sm-10
.pull-left
= f.select(:assignee_id, assignee_options(@issue), { include_blank: "Select a user" }, {class: 'chosen'}) = f.select(:assignee_id, assignee_options(@issue), { include_blank: "Select a user" }, {class: 'chosen'})
.pull-right
&nbsp; &nbsp;
= link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link' = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
.issue_milestone.pull-left .form-group
= f.label :milestone_id do .issue_milestone
= f.label :milestone_id, class: 'control-label' do
%i.icon-time %i.icon-time
Milestone Milestone
.col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'}) .col-sm-10= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'chosen'})
.description
.form-group .form-group
= f.label :label_list do = f.label :label_list, class: 'control-label' do
%i.icon-tag %i.icon-tag
Labels Labels
.col-sm-10 .col-sm-10
= f.text_field :label_list, maxlength: 2000, class: "input-lg" = f.text_field :label_list, maxlength: 2000, class: "form-control"
%p.hint Separate labels with commas. %p.hint Separate labels with commas.
.form-group
= f.label :description, "Details"
.col-sm-10
= f.text_area :description, class: "input-lg js-gfm-input", rows: 14
%p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.form-actions .form-actions
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
.form-group .form-group
= f.label :title do = f.label :title do
%strong= "Title *" %strong= "Title *"
.col-sm-10= f.text_field :title, class: "input-lg pad js-gfm-input", maxlength: 255, rows: 5, required: true .col-sm-10= f.text_field :title, class: "form-control pad js-gfm-input", maxlength: 255, rows: 5, required: true
.form-group .form-group
.left .left
= f.label :assignee_id do = f.label :assignee_id do
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
.form-group .form-group
= f.label :description, "Description" = f.label :description, "Description"
.col-sm-10 .col-sm-10
= f.text_area :description, class: "input-lg js-gfm-input", rows: 14 = f.text_area :description, class: "form-control js-gfm-input", rows: 14
%p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
.form-group .form-group
= f.label :title, "Title", class: "control-label" = f.label :title, "Title", class: "control-label"
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "input-lg" = f.text_field :title, maxlength: 255, class: "form-control"
%p.hint Required %p.hint Required
.form-group .form-group
= f.label :description, "Description", class: "control-label" = f.label :description, "Description", class: "control-label"
.col-sm-10 .col-sm-10
= f.text_area :description, maxlength: 2000, class: "input-lg", rows: 10 = f.text_area :description, maxlength: 2000, class: "form-control", rows: 10
%p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}. %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
.col-md-6 .col-md-6
.form-group .form-group
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.form-group .form-group
= label_tag :search , "Looking for commit:", class: 'control-label light' = label_tag :search , "Looking for commit:", class: 'control-label light'
.col-sm-10 .col-sm-10
= text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input input-lg" = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control"
= button_tag type: 'submit', class: 'btn vtop' do = button_tag type: 'submit', class: 'btn vtop' do
%i.icon-search %i.icon-search
- @options.each do |key, value| - @options.each do |key, value|
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
.form-group .form-group
= f.label "Lifetime" = f.label "Lifetime"
.col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'} .col-sm-10= f.select :expires_at, lifetime_select_options, {}, {class: 'chosen span2'}
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.modal-body .modal-body
= label_tag :new_wiki_path do = label_tag :new_wiki_path do
%span Page slug %span Page slug
= text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'input-lg', required: true, :'data-wikis-path' => project_wikis_path(@project) = text_field_tag :new_wiki_path, nil, placeholder: 'how-to-setup', class: 'form-control', required: true, :'data-wikis-path' => project_wikis_path(@project)
%p.hint %p.hint
Please don't use spaces and slashes Please don't use spaces and slashes
.modal-footer .modal-footer
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.git-clone-holder .git-clone-holder
%button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
%button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase
= text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-lg", readonly: true = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select form-control", readonly: true
.git-empty .git-empty
%fieldset %fieldset
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= label_tag :search do = label_tag :search do
%span Looking for %span Looking for
.col-sm-10 .col-sm-10
= search_field_tag :search, params[:search], placeholder: "issue 143", class: "input-lg search-text-input", id: "dashboard_search" = search_field_tag :search, params[:search], placeholder: "issue 143", class: "form-control search-text-input", id: "dashboard_search"
= hidden_field_tag :project_id, params[:project_id] = hidden_field_tag :project_id, params[:project_id]
= hidden_field_tag :group_id, params[:group_id] = hidden_field_tag :group_id, params[:group_id]
= hidden_field_tag :search_code, params[:search_code] = hidden_field_tag :search_code, params[:search_code]
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.form-group .form-group
= f.label :title = f.label :title
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'input-lg', required: true .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
.form-group .form-group
= f.label "Access" = f.label "Access"
.col-sm-10 .col-sm-10
......
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