Endless event loading for dsahboard
This commit is contained in:
parent
860fa1163a
commit
a69fc5dd23
|
@ -125,9 +125,6 @@ header {
|
|||
display: block;
|
||||
cursor: pointer;
|
||||
img {
|
||||
-moz-box-shadow: 0 0 5px #ccc;
|
||||
-webkit-box-shadow: 0 0 5px #ccc;
|
||||
box-shadow: 0 0 5px #ccc;
|
||||
border-radius: 4px;
|
||||
right: 5px;
|
||||
position: absolute;
|
||||
|
|
|
@ -70,8 +70,7 @@
|
|||
}
|
||||
}
|
||||
.separator {
|
||||
border-color:#444;
|
||||
background:#31363E;
|
||||
display:none;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -3,11 +3,12 @@ class DashboardController < ApplicationController
|
|||
|
||||
def index
|
||||
@projects = current_user.projects_with_events.page(params[:page]).per(40)
|
||||
@events = Event.recent_for_user(current_user).limit(20)
|
||||
@events = Event.recent_for_user(current_user).limit(20).offset(params[:offset] || 0)
|
||||
@last_push = current_user.recent_push
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
format.atom { render :layout => false }
|
||||
end
|
||||
end
|
||||
|
|
|
@ -10,9 +10,10 @@
|
|||
add new key
|
||||
to your profile
|
||||
- if @events.any?
|
||||
= render @events
|
||||
.content_list= render @events
|
||||
- else
|
||||
%h4.nothing_here_message Projects activity will be displayed here
|
||||
.loading.hide
|
||||
.side
|
||||
= render "events/event_last_push", :event => @last_push
|
||||
.projects_box
|
||||
|
@ -54,3 +55,7 @@
|
|||
New Project »
|
||||
- else
|
||||
If you will be added to project - it will be displayed here
|
||||
|
||||
|
||||
:javascript
|
||||
$(function(){ Pager.init(20); });
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
:plain
|
||||
$(".projects .activities").append("#{escape_javascript(render(@events))}");
|
||||
Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");
|
||||
|
|
Loading…
Reference in a new issue