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
Kazuhiko Shiozaki
gitlab-ce
Commits
ae416a76
Commit
ae416a76
authored
Feb 14, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
per line comments improved. replaced from dbclick to link
parent
6473977a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
29 deletions
+76
-29
app/assets/images/comment_add.png
app/assets/images/comment_add.png
+0
-0
app/assets/stylesheets/notes.css.scss
app/assets/stylesheets/notes.css.scss
+33
-0
app/views/commits/_text_file.html.haml
app/views/commits/_text_file.html.haml
+15
-13
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+3
-2
app/views/notes/_per_line_form.html.haml
app/views/notes/_per_line_form.html.haml
+25
-14
No files found.
app/assets/images/comment_add.png
0 → 100644
View file @
ae416a76
1.16 KB
app/assets/stylesheets/notes.css.scss
View file @
ae416a76
...
...
@@ -62,3 +62,36 @@ tr.line_notes_row {
}
}
.line_notes_row
,
.per_line_form
{
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
}
.per_line_form
{
background
:
#f5f5f5
;
form
{
margin
:
0
;
}
td
{
border-bottom
:
1px
solid
#ddd
;
}
}
td
.line_note_link
{
position
:absolute
;
margin-left
:
-70px
;
margin-top
:
-10px
;
z-index
:
10
;
background
:
url("comment_add.png")
no-repeat
left
0
;
width
:
32px
;
height
:
32px
;
opacity
:
0
.0
;
filter
:
alpha
(
opacity
=
0
);
&
:hover
{
opacity
:
1
.0
;
filter
:
alpha
(
opacity
=
100
);
}
}
.diff_file_content
tr
.line_holder
:hover
>
td
{
background
:
$hover
!
important
;
}
.diff_file_content
tr
.line_holder
:hover
>
td
.line_note_link
{
opacity
:
1
.0
;
filter
:
alpha
(
opacity
=
100
);
}
app/views/commits/_text_file.html.haml
View file @
ae416a76
%table
-
each_diff_line
(
diff
.
diff
.
lines
.
to_a
,
index
)
do
|
line
,
type
,
line_code
,
line_new
,
line_old
|
%tr
.line_holder
-
if
type
==
"match"
%td
.old_line
=
"..."
%td
.new_line
=
"..."
%td
.line_content.matched
=
line
-
else
%td
.old_line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
:id
=>
line_code
%td
.new_line
=
link_to
raw
(
type
==
"old"
?
" "
:
line_new
)
,
"#
#{
line_code
}
"
,
:id
=>
line_code
%td
.line_content
{
:class
=>
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
raw
"
#{
line
}
"
-
if
type
==
"match"
%td
.old_line
=
"..."
%td
.new_line
=
"..."
%td
.line_content.matched
=
line
-
else
%td
.old_line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
:id
=>
line_code
=
link_to
""
,
"#"
,
:class
=>
"line_note_link"
,
"line_code"
=>
line_code
,
:title
=>
"Add note for this line"
%td
.new_line
=
link_to
raw
(
type
==
"old"
?
" "
:
line_new
)
,
"#
#{
line_code
}
"
,
:id
=>
line_code
%td
.line_content
{
:class
=>
"noteable_line #{type} #{line_code}"
,
"line_code"
=>
line_code
}=
raw
"
#{
line
}
"
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
).
reverse
-
unless
comments
.
empty?
-
comments
.
each
do
|
note
|
=
render
"notes/per_line_show"
,
:note
=>
note
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
-
comments
=
@line_notes
.
select
{
|
n
|
n
.
line_code
==
line_code
}.
sort_by
(
&
:created_at
).
reverse
-
unless
comments
.
empty?
-
comments
.
each
do
|
note
|
=
render
"notes/per_line_show"
,
:note
=>
note
-
@line_notes
.
reject!
{
|
n
|
n
==
note
}
app/views/commits/show.html.haml
View file @
ae416a76
...
...
@@ -22,10 +22,11 @@
:javascript
$
(
document
).
ready
(
function
(){
$
(
"
.
noteable_line
"
).
live
(
"
dbl
click
"
,
function
(
e
)
{
$
(
"
.
line_note_link
"
).
live
(
"
click
"
,
function
(
e
)
{
var
form
=
$
(
"
.per_line_form
"
);
$
(
this
).
parent
().
after
(
form
);
$
(
this
).
parent
().
parent
().
after
(
form
);
form
.
find
(
"
#note_line_code
"
).
val
(
$
(
this
).
attr
(
"
line_code
"
));
form
.
show
();
return
false
;
});
});
app/views/notes/_per_line_form.html.haml
View file @
ae416a76
%table
{
:style
=>
"display:none;"
}
%tr
.per_line_form
%td
{
:colspan
=>
3
}
%div
.well
=
form_for
[
@project
,
@note
],
:remote
=>
"true"
,
:multipart
=>
true
do
|
f
|
%h3
Leave a note
-
if
@note
.
errors
.
any?
.alert-message.block-message.error
-
@note
.
errors
.
full_messages
.
each
do
|
msg
|
%div
=
msg
=
form_for
[
@project
,
@note
],
:remote
=>
"true"
,
:multipart
=>
true
do
|
f
|
%h3
Leave a note
.row
.span16
-
if
@note
.
errors
.
any?
.alert-message.block-message.error
-
@note
.
errors
.
full_messages
.
each
do
|
msg
|
%div
=
msg
=
f
.
hidden_field
:noteable_id
=
f
.
hidden_field
:noteable_type
=
f
.
hidden_field
:line_code
=
f
.
text_area
:note
,
:size
=>
255
.prepend-top-10
=
f
.
submit
'Add note'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
.right
=
f
.
hidden_field
:noteable_id
=
f
.
hidden_field
:noteable_type
=
f
.
hidden_field
:line_code
=
f
.
text_area
:note
,
:size
=>
255
.actions
=
f
.
submit
'Add note'
,
:class
=>
"btn primary"
,
:id
=>
"submit_note"
=
link_to
"Close"
,
"#"
,
:class
=>
"btn hide-button"
.span6.entry
%h5
Notify via email:
.clearfix
=
label_tag
:notify
do
=
check_box_tag
:notify
,
1
,
@note
.
noteable_type
!=
"Commit"
%span
Project team
-
if
@note
.
notify_only_author?
(
current_user
)
=
label_tag
:notify_author
do
=
check_box_tag
:notify_author
,
1
,
@note
.
noteable_type
==
"Commit"
%span
Commit author
:javascript
$
(
function
(){
...
...
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