deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reorder notes view elements

Browse source
This commit is contained in:
Riyad Preukschas 2012-09-13 02:12:44 +02:00
parent 8f9a450eed
commit 8b6dba749a
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/note.js
View file

@ -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 = {
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"});
}, },

6
app/assets/stylesheets/sections/notes.scss
View file

@ -10,7 +10,7 @@
padding:0px; padding:0px;
} }
#new_notes_list li:last-child{ #notes-list li:last-child {
border-bottom:1px solid #aaa; border-bottom:1px solid #aaa;
} }
@ -71,6 +71,10 @@
} }
} }
.notes-status {
margin: 18px;
}
p.notify_controls input{ p.notify_controls input{
margin: 5px; margin: 5px;

9
app/views/notes/_notes.html.haml
View file

@ -1,10 +1,9 @@
%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