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
8b6dba74
Commit
8b6dba74
authored
Sep 13, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder notes view elements
parent
8f9a450e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
10 deletions
+13
-10
app/assets/javascripts/note.js
app/assets/javascripts/note.js
+4
-4
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+5
-1
app/views/notes/_notes.html.haml
app/views/notes/_notes.html.haml
+4
-5
No files found.
app/assets/javascripts/note.js
View file @
8b6dba74
...
@@ -106,8 +106,8 @@ var NoteList = {
...
@@ -106,8 +106,8 @@ var NoteList = {
type
:
"
GET
"
,
type
:
"
GET
"
,
url
:
this
.
notes_path
,
url
:
this
.
notes_path
,
data
:
"
?
"
+
this
.
target_params
,
data
:
"
?
"
+
this
.
target_params
,
complete
:
function
(){
$
(
'
.status
'
).
removeClass
(
"
loading
"
)},
complete
:
function
(){
$
(
'
.
notes-
status
'
).
removeClass
(
"
loading
"
)},
beforeSend
:
function
()
{
$
(
'
.status
'
).
addClass
(
"
loading
"
)
},
beforeSend
:
function
()
{
$
(
'
.
notes-
status
'
).
addClass
(
"
loading
"
)
},
dataType
:
"
script
"
});
dataType
:
"
script
"
});
},
},
...
@@ -136,8 +136,8 @@ var NoteList = {
...
@@ -136,8 +136,8 @@ var NoteList = {
type
:
"
GET
"
,
type
:
"
GET
"
,
url
:
this
.
notes_path
,
url
:
this
.
notes_path
,
data
:
"
first_id=
"
+
this
.
first_id
+
this
.
target_params
,
data
:
"
first_id=
"
+
this
.
first_id
+
this
.
target_params
,
complete
:
function
(){
$
(
'
.status
'
).
removeClass
(
"
loading
"
)},
complete
:
function
(){
$
(
'
.
notes-
status
'
).
removeClass
(
"
loading
"
)},
beforeSend
:
function
()
{
$
(
'
.status
'
).
addClass
(
"
loading
"
)
},
beforeSend
:
function
()
{
$
(
'
.
notes-
status
'
).
addClass
(
"
loading
"
)
},
dataType
:
"
script
"
});
dataType
:
"
script
"
});
},
},
...
...
app/assets/stylesheets/sections/notes.scss
View file @
8b6dba74
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
padding
:
0px
;
padding
:
0px
;
}
}
#n
ew_notes_list
li
:last-child
{
#n
otes-list
li
:last-child
{
border-bottom
:
1px
solid
#aaa
;
border-bottom
:
1px
solid
#aaa
;
}
}
...
@@ -71,6 +71,10 @@
...
@@ -71,6 +71,10 @@
}
}
}
}
.notes-status
{
margin
:
18px
;
}
p
.notify_controls
input
{
p
.notify_controls
input
{
margin
:
5px
;
margin
:
5px
;
...
...
app/views/notes/_notes.html.haml
View file @
8b6dba74
%ul
#notes-list
%ul
#new_notes_list
.notes-status
-
if
can?
current_user
,
:write_note
,
@project
-
if
can?
current_user
,
:write_note
,
@project
=
render
"notes/form"
=
render
"notes/form"
.clear
%hr
%ul
#new_notes_list
%ul
#notes-list
.status
:javascript
:javascript
...
...
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