Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
a9fba2cd
Commit
a9fba2cd
authored
Jan 01, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix modal dialogs
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
42fc32d8
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
109 additions
and
117 deletions
+109
-117
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+4
-0
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+1
-21
app/views/help/_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+30
-28
app/views/projects/blob/_remove.html.haml
app/views/projects/blob/_remove.html.haml
+20
-18
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+40
-38
app/views/projects/merge_requests/show/_mr_accept.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
+1
-1
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+13
-11
No files found.
app/assets/stylesheets/generic/common.scss
View file @
a9fba2cd
...
...
@@ -96,6 +96,10 @@ pre.well-pre {
color
:
#999
;
text-shadow
:
none
;
}
&
.label-inverse
{
background-color
:
#333333
;
}
}
/** Big Labels **/
...
...
app/assets/stylesheets/sections/merge_requests.scss
View file @
a9fba2cd
...
...
@@ -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
;
}
...
...
app/views/help/_shortcuts.html.haml
View file @
a9fba2cd
#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
app/views/projects/blob/_remove.html.haml
View file @
a9fba2cd
%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"
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
a9fba2cd
%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
...
...
app/views/projects/merge_requests/show/_mr_accept.html.haml
View file @
a9fba2cd
...
...
@@ -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
...
...
app/views/projects/wikis/_new.html.haml
View file @
a9fba2cd
%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'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment