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
f4dabf97
Commit
f4dabf97
authored
Dec 22, 2015
by
Andriy Dyadyura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new buttons issue
parent
a72b71ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+2
-2
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_discussion.html.haml
+2
-2
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/note_form.scss
View file @
f4dabf97
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
.common-note-form
{
.common-note-form
{
margin
:
0
;
margin
:
0
;
background
:
#
F7F8FA
;
background
:
#
fff
;
padding
:
$gl-padding
;
padding
:
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-left
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
margin-right
:
-
$gl-padding
;
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
}
}
.note-form-actions
{
.note-form-actions
{
background
:
#
F9F9F9
;
background
:
#
fff
;
.note-form-option
{
.note-form-option
{
margin-top
:
8px
;
margin-top
:
8px
;
...
...
app/views/projects/issues/_discussion.html.haml
View file @
f4dabf97
-
content_for
:note_actions
do
-
content_for
:note_actions
do
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
can?
(
current_user
,
:update_issue
,
@issue
)
-
if
@issue
.
closed?
-
if
@issue
.
closed?
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-
reopen
js-note-target-reopen'
,
title:
'Reopen Issue'
=
link_to
'Reopen Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :reopen
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-
nr btn-success
js-note-target-reopen'
,
title:
'Reopen Issue'
-
else
-
else
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-
close
js-note-target-close'
,
title:
'Close Issue'
=
link_to
'Close Issue'
,
issue_path
(
@issue
,
issue:
{
state_event: :close
},
status_only:
true
),
method: :put
,
class:
'btn btn-grouped btn-
nr btn-warning
js-note-target-close'
,
title:
'Close Issue'
#notes
#notes
=
render
'projects/notes/notes_with_form'
=
render
'projects/notes/notes_with_form'
app/views/projects/notes/_form.html.haml
View file @
f4dabf97
...
@@ -13,6 +13,6 @@
...
@@ -13,6 +13,6 @@
.error-alert
.error-alert
.note-form-actions.clearfix
.note-form-actions.clearfix
=
f
.
submit
'Add Comment'
,
class:
"btn btn-
create
comment-btn btn-grouped js-comment-button"
=
f
.
submit
'Add Comment'
,
class:
"btn btn-
nr btn-success
comment-btn btn-grouped js-comment-button"
=
yield
(
:note_actions
)
=
yield
(
:note_actions
)
%a
.btn.btn-cancel.js-close-discussion-note-form
Cancel
%a
.btn.btn-cancel.js-close-discussion-note-form
Cancel
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