diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index c3a570036bb15d8eaf1674b59fd43baf2a6ad258..07eba39b275fdfe998775b789eb501835a84dc1a 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -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; diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss index 0fea61444319a8b8f4564f641428585ab04594c3..39dcab1d08562670f963a4e92cb51fa1582652da 100644 --- a/app/assets/stylesheets/themes/ui_mars.scss +++ b/app/assets/stylesheets/themes/ui_mars.scss @@ -70,8 +70,7 @@ } } .separator { - border-color:#444; - background:#31363E; + display:none; } } diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 14f6ab1c31a7af2cf5df4966e40e9ca59b63aa15..8508e2454d2b48e6c9bb8d574d251f8b4a0c3973 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -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 diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index b38544509b2da95db4f5e14393b078af3f6ab6f5..e1d7781927a10aa0510ebb223b02e482e0f1a65f 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -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); }); diff --git a/app/views/dashboard/index.js.haml b/app/views/dashboard/index.js.haml index aa038e7592816468c592d577505184bd3c486adb..7e5a148e5ef2d56f87c72403ee7525cffc8cfc14 100644 --- a/app/views/dashboard/index.js.haml +++ b/app/views/dashboard/index.js.haml @@ -1,2 +1,2 @@ :plain - $(".projects .activities").append("#{escape_javascript(render(@events))}"); + Pager.append(#{@events.count}, "#{escape_javascript(render(@events))}");