Merged activities & projects pages

Dmitriy Zaporozhets
1 parent 724ea16c
Showing 9 changed files with 11 additions and 65 deletions Show diff stats
app/assets/stylesheets/common.scss
app/controllers/dashboard_controller.rb
app/controllers/projects_controller.rb
app/views/dashboard/activities.html.haml
app/views/dashboard/index.html.haml
app/views/layouts/_app_menu.html.haml
app/views/projects/index.html.haml
app/views/projects/show.js.haml
spec/requests/dashboard_spec.rb
@@ -925,7 +925,7 @@ p.time {
   }
   a:last-child h4 { border:none; }
-  a.active { 
+  a:hover { 
     h4 {
       color:#111;
       border-right:4px solid $styled_border_color;
@@ -34,9 +34,4 @@ class DashboardController &lt; ApplicationController
       format.atom { render :layout => false }
     end
   end
-
-  def activities
-    @projects = current_user.projects.all
-    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
-  end
 end
@@ -13,6 +13,7 @@ class ProjectsController &lt; ApplicationController
   def index
     @projects = current_user.projects
     @projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
+    @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
   end
   def new
@@ -78,7 +79,6 @@ class ProjectsController &lt; ApplicationController
            render "projects/empty"
          end
       end
-      format.js
     end
   end
@@ -1,10 +0,0 @@
-- if @events.any?
-  %div.dashboard_category
-    %h3
-      %span.ico.activities
-      = link_to "Activities" , "#activities", :id => "activities"
-
-    %hr
-    = render @events
-- else
-  %h3 Nothing here
@@ -62,9 +62,6 @@
     %h3
       %span.ico.activities
       = link_to "Activities" , "#activities", :id => "activities"
-    %strong.right
-      = link_to dashboard_activities_path do 
-        Visit activities page &rarr; 
     %hr
     .row
 %nav.main_menu
   = render "layouts/const_menu_links"
   = link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"
-  = link_to "Activities", dashboard_activities_path, :class => "#{"current" if current_page?(dashboard_activities_path)}"
   = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do 
     Issues
     %span.count= current_user.assigned_issues.opened.count
 - if @projects.any?
   .row
-    .span4
+    .span11
+      = render @events
+    .span5.right
       %div.leftbar.ui-box
         %h5
           Projects
+          %small
+            (#{@projects.count})
           - if current_user.can_create_project?
             %span.right
               = link_to new_project_path, :class => "btn very_small info" do 
                 New Project
         .content_list
           - @projects.each do |project|
-            = link_to project_path(project), :remote => true, :class => dom_class(project) do
+            = link_to project_path(project), :class => dom_class(project) do
               %h4
                 %span.ico.project
-                = truncate(project.name, :length => 22)
-    .span12.right
-      .show_holder.ui-box.padded
-        .loading
+                = truncate(project.name, :length => 25)
+                %span.right
+                  &rarr;
 - else 
   %h3 Nothing here
@@ -31,20 +34,3 @@
           New Project » 
   - else 
     If you will be added to project - it will be displayed here
-
-
-:javascript
-  $(function(){
-    $("a.project").live("ajax:before", function() { 
-      $(".show_holder").html("<div class='loading'>");
-      $('a.project').removeClass("active");
-      $(this).addClass("active");
-    });
-    $('a.project:first-child').trigger("click");
-  });
-
-- if @projects.count == @limit
-  :javascript
-    $(function(){
-      Pager.init(#{@limit});
-    });
@@ -1,7 +0,0 @@
-- if @project.repo_exists? && @project.has_commits?
-  :plain
-    $(".show_holder").html("#{escape_javascript(render(:partial => 'projects/show'))}");
-- else 
-  :plain
-    $(".show_holder").html("#{escape_javascript(render(:template => 'projects/empty'))}");
-
@@ -23,18 +23,4 @@ describe &quot;Dashboard&quot; do
       page.should have_content(@project.name)
     end
   end
-
-  describe "GET /dashboard/activities" do
-    before do
-      visit dashboard_activities_path
-    end
-
-    it "should be on dashboard page" do
-      current_path.should == dashboard_activities_path
-    end
-
-    it "should have projects panel" do
-      page.should have_content(@project.name)
-    end
-  end
 end
	@@ -925,7 +925,7 @@ p.time {		@@ -925,7 +925,7 @@ p.time {
925	}	925	}
926	a:last-child h4 { border:none; }	926	a:last-child h4 { border:none; }
927		927
928	- a.active {	928	+ a:hover {
929	h4 {	929	h4 {
930	color:#111;	930	color:#111;
931	border-right:4px solid $styled_border_color;	931	border-right:4px solid $styled_border_color;
	@@ -34,9 +34,4 @@ class DashboardController < ApplicationController		@@ -34,9 +34,4 @@ class DashboardController < ApplicationController
34	format.atom { render :layout => false }	34	format.atom { render :layout => false }
35	end	35	end
36	end	36	end
37	-
38	- def activities
39	- @projects = current_user.projects.all
40	- @events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
41	- end
42	end	37	end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-- if @events.any?
2	- %div.dashboard_category
3	- %h3
4	- %span.ico.activities
5	- = link_to "Activities" , "#activities", :id => "activities"
6	-
7	- %hr
8	- = render @events
9	-- else
10	- %h3 Nothing here
1	%nav.main_menu	1	%nav.main_menu
2	= render "layouts/const_menu_links"	2	= render "layouts/const_menu_links"
3	= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"	3	= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"
4	- = link_to "Activities", dashboard_activities_path, :class => "#{"current" if current_page?(dashboard_activities_path)}"
5	= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do	4	= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
6	Issues	5	Issues
7	%span.count= current_user.assigned_issues.opened.count	6	%span.count= current_user.assigned_issues.opened.count
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-- if @project.repo_exists? && @project.has_commits?
2	- :plain
3	- $(".show_holder").html("#{escape_javascript(render(:partial => 'projects/show'))}");
4	-- else
5	- :plain
6	- $(".show_holder").html("#{escape_javascript(render(:template => 'projects/empty'))}");
7	-
	@@ -23,18 +23,4 @@ describe "Dashboard" do		@@ -23,18 +23,4 @@ describe "Dashboard" do
23	page.should have_content(@project.name)	23	page.should have_content(@project.name)
24	end	24	end
25	end	25	end
26	-
27	- describe "GET /dashboard/activities" do
28	- before do
29	- visit dashboard_activities_path
30	- end
31	-
32	- it "should be on dashboard page" do
33	- current_path.should == dashboard_activities_path
34	- end
35	-
36	- it "should have projects panel" do
37	- page.should have_content(@project.name)
38	- end
39	- end
40	end	26	end