Fix modal dialogs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
42fc32d8bd
commit
a9fba2cd0a
|
@ -96,6 +96,10 @@ pre.well-pre {
|
|||
color: #999;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
&.label-inverse {
|
||||
background-color: #333333;
|
||||
}
|
||||
}
|
||||
|
||||
/** Big Labels **/
|
||||
|
|
|
@ -15,29 +15,9 @@
|
|||
}
|
||||
}
|
||||
|
||||
.accept_group {
|
||||
float: left;
|
||||
border: 1px solid #ADA;
|
||||
padding: 2px;
|
||||
@include border-radius(5px);
|
||||
background: #CEB;
|
||||
|
||||
.accept_merge_request {
|
||||
font-size: 13px;
|
||||
float: left;
|
||||
}
|
||||
.remove_branch_holder {
|
||||
margin-left: 20px;
|
||||
margin-right: 10px;
|
||||
float: left;
|
||||
}
|
||||
label {
|
||||
color: #444;
|
||||
text-align: left
|
||||
}
|
||||
.accept-group {
|
||||
}
|
||||
|
||||
|
||||
.how_to_merge_link {
|
||||
@extend .primary;
|
||||
}
|
||||
|
|
|
@ -1,30 +1,32 @@
|
|||
#modal-shortcuts.modal.hide
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3 Keyboard Shortcuts
|
||||
.modal-body
|
||||
%h5 Global Shortcuts
|
||||
%p
|
||||
%span.label.label-inverse s
|
||||
–
|
||||
Focus Search
|
||||
%p
|
||||
%span.label.label-inverse ?
|
||||
–
|
||||
Show this dialog
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3 Keyboard Shortcuts
|
||||
.modal-body
|
||||
%h5 Global Shortcuts
|
||||
%p
|
||||
%span.label.label-inverse s
|
||||
–
|
||||
Focus Search
|
||||
%p
|
||||
%span.label.label-inverse ?
|
||||
–
|
||||
Show this dialog
|
||||
|
||||
%h5 Project Files browsing
|
||||
%p
|
||||
%span.label.label-inverse
|
||||
%i.icon-arrow-up
|
||||
–
|
||||
Move selection up
|
||||
%p
|
||||
%span.label.label-inverse
|
||||
%i.icon-arrow-down
|
||||
–
|
||||
Move selection down
|
||||
%p
|
||||
%span.label.label-inverse Enter
|
||||
–
|
||||
Open selection
|
||||
%h5 Project Files browsing
|
||||
%p
|
||||
%span.label.label-inverse
|
||||
%i.icon-arrow-up
|
||||
–
|
||||
Move selection up
|
||||
%p
|
||||
%span.label.label-inverse
|
||||
%i.icon-arrow-down
|
||||
–
|
||||
Move selection down
|
||||
%p
|
||||
%span.label.label-inverse Enter
|
||||
–
|
||||
Open selection
|
||||
|
|
|
@ -1,19 +1,21 @@
|
|||
%div#modal-remove-blob.modal.hide
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title Remove #{@blob.name}
|
||||
%p.light
|
||||
From branch
|
||||
%strong= @ref
|
||||
#modal-remove-blob.modal.hide
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title Remove #{@blob.name}
|
||||
%p.light
|
||||
From branch
|
||||
%strong= @ref
|
||||
|
||||
.modal-body
|
||||
= form_tag project_blob_path(@project, @id), method: :delete do
|
||||
.form-group.commit_message-group
|
||||
= label_tag 'commit_message', class: "control-label" do
|
||||
Commit message
|
||||
.col-sm-10
|
||||
= text_area_tag 'commit_message', params[:commit_message], placeholder: "Removed this file because...", required: true, rows: 3
|
||||
.form-group
|
||||
.col-sm-10
|
||||
= submit_tag 'Remove file', class: 'btn btn-remove'
|
||||
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
|
||||
.modal-body
|
||||
= form_tag project_blob_path(@project, @id), method: :delete do
|
||||
.form-group.commit_message-group
|
||||
= label_tag 'commit_message', class: "control-label" do
|
||||
Commit message
|
||||
.col-sm-10
|
||||
= text_area_tag 'commit_message', params[:commit_message], placeholder: "Removed this file because...", required: true, rows: 3
|
||||
.form-group
|
||||
.col-sm-10
|
||||
= submit_tag 'Remove file', class: 'btn btn-remove'
|
||||
= link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal"
|
||||
|
|
|
@ -1,42 +1,44 @@
|
|||
%div#modal_merge_info.modal.hide
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3 How to merge
|
||||
.modal-body
|
||||
- if @merge_request.for_fork?
|
||||
- source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
|
||||
- target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
|
||||
%p
|
||||
%strong Step 1.
|
||||
Checkout target branch and get recent objects from GitLab
|
||||
Assuming remote for #{@merge_request.target_project.path_with_namespace} is called #{target_remote}
|
||||
remote for #{@merge_request.source_project_path} is called #{source_remote}
|
||||
%pre.dark
|
||||
:preserve
|
||||
git checkout #{target_remote} #{@merge_request.target_branch}
|
||||
git fetch #{source_remote}
|
||||
%p
|
||||
%strong Step 2.
|
||||
Merge source branch into target branch and push changes to GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git merge #{source_remote}/#{@merge_request.source_branch}
|
||||
git push #{target_remote} #{@merge_request.target_branch}
|
||||
- else
|
||||
%p
|
||||
%strong Step 1.
|
||||
Checkout target branch and get recent objects from GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git checkout #{@merge_request.target_branch}
|
||||
git fetch origin
|
||||
%p
|
||||
%strong Step 2.
|
||||
Merge source branch into target branch and push changes to GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git merge origin/#{@merge_request.source_branch}
|
||||
git push origin #{@merge_request.target_branch}
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3 How to merge
|
||||
.modal-body
|
||||
- if @merge_request.for_fork?
|
||||
- source_remote = @merge_request.source_project.namespace.nil? ? "source" :@merge_request.source_project.namespace.path
|
||||
- target_remote = @merge_request.target_project.namespace.nil? ? "target" :@merge_request.target_project.namespace.path
|
||||
%p
|
||||
%strong Step 1.
|
||||
Checkout target branch and get recent objects from GitLab
|
||||
Assuming remote for #{@merge_request.target_project.path_with_namespace} is called #{target_remote}
|
||||
remote for #{@merge_request.source_project_path} is called #{source_remote}
|
||||
%pre.dark
|
||||
:preserve
|
||||
git checkout #{target_remote} #{@merge_request.target_branch}
|
||||
git fetch #{source_remote}
|
||||
%p
|
||||
%strong Step 2.
|
||||
Merge source branch into target branch and push changes to GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git merge #{source_remote}/#{@merge_request.source_branch}
|
||||
git push #{target_remote} #{@merge_request.target_branch}
|
||||
- else
|
||||
%p
|
||||
%strong Step 1.
|
||||
Checkout target branch and get recent objects from GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git checkout #{@merge_request.target_branch}
|
||||
git fetch origin
|
||||
%p
|
||||
%strong Step 2.
|
||||
Merge source branch into target branch and push changes to GitLab
|
||||
%pre.dark
|
||||
:preserve
|
||||
git merge origin/#{@merge_request.source_branch}
|
||||
git push origin #{@merge_request.target_branch}
|
||||
|
||||
|
||||
:javascript
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
%strong
|
||||
= link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
|
||||
for instructions
|
||||
.accept_group
|
||||
.accept-group
|
||||
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
|
||||
- unless @merge_request.disallow_source_branch_removal?
|
||||
.remove_branch_holder
|
||||
|
|
|
@ -1,12 +1,14 @@
|
|||
%div#modal-new-wiki.modal.hide
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title New Wiki Page
|
||||
.modal-body
|
||||
= label_tag :new_wiki_path do
|
||||
%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)
|
||||
%p.hint
|
||||
Please don't use spaces and slashes
|
||||
.modal-footer
|
||||
= link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
|
||||
.modal-dialog
|
||||
.modal-content
|
||||
.modal-header
|
||||
%a.close{href: "#", "data-dismiss" => "modal"} ×
|
||||
%h3.page-title New Wiki Page
|
||||
.modal-body
|
||||
= label_tag :new_wiki_path do
|
||||
%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)
|
||||
%p.hint
|
||||
Please don't use spaces and slashes
|
||||
.modal-footer
|
||||
= link_to 'Build', '#', class: 'build-new-wiki btn btn-create'
|
||||
|
|
Loading…
Reference in New Issue