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