dashboard v1

Dmitriy Zaporozhets
1 parent 4107f2cc
Showing 24 changed files with 255 additions and 250 deletions Show diff stats
app/controllers/dashboard_controller.rb
app/controllers/user_issues_controller.rb
app/controllers/user_merge_requests_controller.rb
app/views/dashboard/_issues_feed.html.haml
app/views/dashboard/_merge_requests_feed.html.haml
app/views/dashboard/_projects_feed.html.haml
app/views/dashboard/_sidebar.html.haml
app/views/dashboard/index.html.haml
app/views/dashboard/index.js.haml
app/views/dashboard/issues.atom.builder
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.js.haml
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.js.haml
app/views/merge_requests/_merge_request.html.haml
app/views/user_issues/index.atom.builder
app/views/user_issues/index.html.haml
app/views/user_merge_requests/index.html.haml
config/routes.rb
spec/requests/dashboard_issues_spec.rb
 class DashboardController < ApplicationController
+  respond_to :js, :html
+
   def index
     @projects = current_user.projects.all
     @active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+    end
+  end
+
+  def merge_requests
+    @projects = current_user.projects.all
+    @merge_requests = current_user.assigned_merge_requests.order("created_at DESC").limit(40)
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+    end
+  end
+
+  def issues
+    @projects = current_user.projects.all
+    @user   = current_user
+    @issues = current_user.assigned_issues.opened.order("created_at DESC").limit(40)
+
+    @issues = @issues.includes(:author, :project)
+
+    respond_to do |format|
+      format.html
+      format.js { no_cache_headers }
+      format.atom { render :layout => false }
+    end
   end
 end
@@ -1,20 +0,0 @@
-class UserIssuesController < ApplicationController
-  before_filter :authenticate_user!
-
-  respond_to :js, :html
-
-  def index
-    @projects = current_user.projects.all
-    @user   = current_user
-    @issues = current_user.assigned_issues.opened
-
-    @issues = @issues.includes(:author, :project)
-
-    respond_to do |format|
-      format.html
-      format.js
-      format.atom { render :layout => false }
-    end
-  end
-
-end
@@ -1,8 +0,0 @@
-class UserMergeRequestsController < ApplicationController
-  before_filter :authenticate_user!
-
-  def index
-    @projects = current_user.projects.all
-    @merge_requests = current_user.assigned_merge_requests
-  end
-end
-#news-feed.news-feed
-  %div
-    = link_to dashboard_path, :class => "left" do 
-      .box-arrow
-        &larr;
-    %h2{:style => "width:86%; text-align:center"}
-      Issues
-    = link_to merge_requests_path, :class => "right" do 
-      .box-arrow 
-        &rarr;
+%div
+  = link_to dashboard_path, :remote => true, :class => "left" do 
+    .box-arrow
+      &larr;
+  %h2{:style => "width:86%; text-align:center"}
+    Issues
+  = link_to dashboard_merge_requests_path, :remote => true, :class => "right" do 
+    .box-arrow 
+      &rarr;
+#feeds_content_holder
   .project-box.project-updates.ui-box.ui-box-small.ui-box-big
     .data
       - @issues.each do |update|
         %a.project-update{:href => dashboard_feed_path(update.project, update)}
           = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
           %span.update-title
-            = dashboard_feed_title(update)
+            = truncate update.title, :length => 50
+            .right= update.project.name
           %span.update-author
             %strong= update.author_name
             authored
             = time_ago_in_words(update.created_at)
             ago
           .right
-            - klass = update.class.to_s.split("::").last.downcase
-            %span.tag{ :class => klass }= klass
+            - if update.critical
+              %span.tag.high critical
+            - if update.today?
+              %span.tag.today today
-#news-feed.news-feed
-  %div
-    = link_to issues_path, :class => "left" do 
-      .box-arrow
-        &larr;
-    %h2{:style => "width:86%; text-align:center"}
-      Merge Requests
-    = link_to dashboard_path, :class => "right" do 
-      .box-arrow 
-        &rarr;
+%div
+  = link_to dashboard_issues_path, :remote => true, :class => "left" do 
+    .box-arrow
+      &larr;
+  %h2{:style => "width:86%; text-align:center"}
+    Merge Requests
+  = link_to dashboard_path, :remote => true, :class => "right" do 
+    .box-arrow 
+      &rarr;
+#feeds_content_holder
   .project-box.project-updates.ui-box.ui-box-small.ui-box-big
     .data
       - @merge_requests.each do |update|
-        %a.project-update{:href => dashboard_feed_path(update.project, update)}
+        %a.project-update{:href => project_merge_request_path(update.project, update)}
           = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
           %span.update-title
-            = dashboard_feed_title(update)
+            = truncate update.title, :length => 70
+            .right= update.project.name
           %span.update-author
             %strong= update.author_name
             authored
             = time_ago_in_words(update.created_at)
             ago
           .right
-            - klass = update.class.to_s.split("::").last.downcase
-            %span.tag{ :class => klass }= klass
-
+            %span.tag.commit= update.source_branch
+            &rarr;
+            %span.tag.commit= update.target_branch
-#news-feed.news-feed
-  %div
-    = link_to merge_requests_path, :class => "left" do 
-      .box-arrow
-        &larr;
-    %h2{:style => "width:86%; text-align:center"}
-      Activities
-    = link_to issues_path, :class => "right" do 
-      .box-arrow 
-        &rarr;
+%div
+  = link_to dashboard_merge_requests_path, :remote => true, :class => "left", :id => "merge_requests_slide" do 
+    .box-arrow
+      &larr;
+  %h2{:style => "width:86%; text-align:center"}
+    Activities
+  = link_to dashboard_issues_path, :remote => true, :class => "right", :id => "issues_slide" do 
+    .box-arrow 
+      &rarr;
+#feeds_content_holder
   - @active_projects.first(3).each do |project|
     .project-box.project-updates.ui-box.ui-box-small.ui-box-big
       = link_to project, do 
@@ -0,0 +1,15 @@
+%aside
+  %h4
+    - if current_user.can_create_project?
+      %a.button-small.button-green{:href => new_project_path} New Project
+    Your Projects
+  %ol.project-list
+    - @projects.each do |project|
+      %li
+        %a{:href => project_path(project)}
+          %span.arrow →
+          %span.project-name= project.name
+          %span.time
+            %strong Last activity:
+            = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
+
 - content_for(:body_class, "dashboard-page")
 #dashboard-content.dashboard-content.content
-  %aside
-    %h4
-      - if current_user.can_create_project?
-        %a.button-small.button-green{:href => new_project_path} New Project
-      Your Projects
-    %ol.project-list
-      - @projects.each do |project|
-        %li
-          %a{:href => project_path(project)}
-            %span.arrow →
-            %span.project-name= project.name
-            %span.time
-              %strong Last activity:
-              = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
-  = render "dashboard/projects_feed"
+  = render "dashboard/sidebar"
+  #news-feed.news-feed= render "dashboard/projects_feed"
@@ -0,0 +1,7 @@
+:plain
+  $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
+    $("#news-feed").html("#{escape_javascript(render(:partial => "projects_feed"))}");
+    $("#feeds_content_holder").show("slide", { direction: "right" }, 150);
+    history.pushState({ path: this.path }, '', '#{dashboard_path}')
+  });
+
@@ -0,0 +1,24 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
+  xml.title   "#{@user.name} issues"
+  xml.link    :href => dashboard_issues_url(:atom, :private_token => @user.private_token), :rel => "self", :type => "application/atom+xml"
+  xml.link    :href => dashboard_issues_url(:private_token => @user.private_token), :rel => "alternate", :type => "text/html"
+  xml.id      dashboard_issues_url(:private_token => @user.private_token)
+  xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
+
+  @issues.each do |issue|
+    xml.entry do
+      xml.id      project_issue_url(issue.project, issue)
+      xml.link    :href => project_issue_url(issue.project, issue)
+      xml.title   truncate(issue.title, :length => 80)
+      xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
+      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
+      xml.author do |author|
+        xml.name issue.author_name
+        xml.email issue.author_email
+      end
+      xml.summary issue.title
+    end
+  end
+end
+
@@ -0,0 +1,5 @@
+- content_for(:body_class, "dashboard-page")
+
+#dashboard-content.dashboard-content.content
+  = render "dashboard/sidebar"
+  #news-feed.news-feed= render "dashboard/issues_feed"
@@ -0,0 +1,7 @@
+:plain
+  $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
+    $("#news-feed").html("#{escape_javascript(render(:partial => "issues_feed"))}");
+    $("#feeds_content_holder").show("slide", { direction: "right" }, 150);
+    history.pushState({ path: this.path }, '', '#{dashboard_issues_path}')
+  });
+
@@ -0,0 +1,5 @@
+- content_for(:body_class, "dashboard-page")
+
+#dashboard-content.dashboard-content.content
+  = render "dashboard/sidebar"
+  #news-feed.news-feed= render "dashboard/merge_requests_feed"
@@ -0,0 +1,7 @@
+:plain
+  $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
+    $("#news-feed").html("#{escape_javascript(render(:partial => "merge_requests_feed"))}");
+    $("#feeds_content_holder").show("slide", { direction: "right" }, 150);
+    history.pushState({ path: this.path }, '', '#{dashboard_merge_requests_path}')
+  });
+
@@ -3,9 +3,6 @@
   %span.update-title
     = merge_request.title
   %span.update-author
-    - if not @project.present?
-      %strong= merge_request.project.name
-      = '-'
     %strong= merge_request.author_name
     authored
     = time_ago_in_words(merge_request.created_at)
@@ -1,24 +0,0 @@
-xml.instruct!
-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
-  xml.title   "#{@user.name} issues"
-  xml.link    :href => issues_url(:atom, :private_token => @user.private_token), :rel => "self", :type => "application/atom+xml"
-  xml.link    :href => issues_url(:private_token => @user.private_token), :rel => "alternate", :type => "text/html"
-  xml.id      issues_url(:private_token => @user.private_token)
-  xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
-
-  @issues.each do |issue|
-    xml.entry do
-      xml.id      project_issue_url(issue.project, issue)
-      xml.link    :href => project_issue_url(issue.project, issue)
-      xml.title   truncate(issue.title, :length => 80)
-      xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
-      xml.media   :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
-      xml.author do |author|
-        xml.name issue.author_name
-        xml.email issue.author_email
-      end
-      xml.summary issue.title
-    end
-  end
-end
-
@@ -1,18 +0,0 @@
-- content_for(:body_class, "dashboard-page")
-
-#dashboard-content.dashboard-content.content
-  %aside
-    %h4
-      - if current_user.can_create_project?
-        %a.button-small.button-green{:href => new_project_path} New Project
-      Your Projects
-    %ol.project-list
-      - @projects.each do |project|
-        %li
-          %a{:href => project_path(project)}
-            %span.arrow →
-            %span.project-name= project.name
-            %span.time
-              %strong Last activity:
-              = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
-  = render "dashboard/issues_feed"
@@ -1,18 +0,0 @@
-- content_for(:body_class, "dashboard-page")
-
-#dashboard-content.dashboard-content.content
-  %aside
-    %h4
-      - if current_user.can_create_project?
-        %a.button-small.button-green{:href => new_project_path} New Project
-      Your Projects
-    %ol.project-list
-      - @projects.each do |project|
-        %li
-          %a{:href => project_path(project)}
-            %span.arrow →
-            %span.project-name= project.name
-            %span.time
-              %strong Last activity:
-              = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
-  = render "dashboard/merge_requests_feed"
 Gitlab::Application.routes.draw do
-  get "user_issues/index"
   get 'tags'=> 'tags#index'
   get 'tags/:tag' => 'projects#index'
@@ -22,9 +21,10 @@ Gitlab::Application.routes.draw do
   put "profile/reset_private_token", :to => "profile#reset_private_token"
   put "profile/edit", :to => "profile#social_update"
   get "profile", :to => "profile#show"
+
   get "dashboard", :to => "dashboard#index"
-  get "issues", :to => "user_issues#index", :as => "issues"
-  get "merge_requests", :to => "user_merge_requests#index", :as => "merge_requests"
+  get "dashboard/issues", :to => "dashboard#issues"
+  get "dashboard/merge_requests", :to => "dashboard#merge_requests"
   #get "profile/:id", :to => "profile#show"
@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "User Issues Dashboard", :js => true do
+  describe "GET /issues" do
+    before do
+
+      login_as :user
+
+      @project1 = Factory :project,
+        :path => "project1",
+        :code => "TEST1"
+
+      @project2 = Factory :project,
+        :path => "project2",
+        :code => "TEST2"
+
+      @project1.add_access(@user, :read, :write)
+      @project2.add_access(@user, :read, :write)
+
+      @issue1 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project1
+
+      @issue2 = Factory :issue,
+        :author => @user,
+        :assignee => @user,
+        :project => @project2
+
+      visit dashboard_path
+      click_link "issues_slide"
+    end
+
+    subject { page }
+
+    it { should have_content(@issue1.title[0..10]) }
+    it { should have_content(@issue1.project.name) }
+    it { should have_content(@issue1.assignee.name) }
+
+    it { should have_content(@issue2.title[0..10]) }
+    it { should have_content(@issue2.project.name) }
+    it { should have_content(@issue2.assignee.name) }
+
+    describe "atom feed", :js => false do
+      it "should render atom feed via private token" do
+        logout
+        visit dashboard_issues_path(:atom, :private_token => @user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", :text => "#{@user.name} issues")
+        page.body.should have_selector("author email", :text => @issue1.author_email)
+        page.body.should have_selector("entry summary", :text => @issue1.title)
+        page.body.should have_selector("author email", :text => @issue2.author_email)
+        page.body.should have_selector("entry summary", :text => @issue2.title)
+      end
+    end
+  end
+end
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "User MergeRequests", :js => true do
+  describe "GET /issues" do
+    before do
+
+      login_as :user
+
+      @project1 = Factory :project,
+        :path => "project1",
+        :code => "TEST1"
+
+      @project2 = Factory :project,
+        :path => "project2",
+        :code => "TEST2"
+
+      @project1.add_access(@user, :read, :write)
+      @project2.add_access(@user, :read, :write)
+
+      @merge_request1 = Factory :merge_request,
+        :author => @user,
+        :assignee => @user,
+        :project => @project1
+
+      @merge_request2 = Factory :merge_request,
+        :author => @user,
+        :assignee => @user,
+        :project => @project2
+
+      visit dashboard_path
+      click_link "merge_requests_slide"
+    end
+
+    subject { page }
+
+    it { should have_content(@merge_request1.title) }
+    it { should have_content(@merge_request1.project.name) }
+    it { should have_content(@merge_request1.target_branch) }
+    it { should have_content(@merge_request1.source_branch) }
+    it { should have_content(@merge_request1.assignee.name) }
+
+    it { should have_content(@merge_request2.title) }
+    it { should have_content(@merge_request2.project.name) }
+    it { should have_content(@merge_request2.target_branch) }
+    it { should have_content(@merge_request2.source_branch) }
+    it { should have_content(@merge_request2.assignee.name) }
+  end
+end
@@ -23,7 +23,7 @@ describe &quot;Issues&quot; do
     subject { page }
-    it { should have_content(@issue.title) }
+    it { should have_content(@issue.title[0..20]) }
     it { should have_content(@issue.project.name) }
     it { should have_content(@issue.assignee.name) }
@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe "User Issues Dashboard" do
-  describe "GET /issues" do
-    before do
-
-      login_as :user
-
-      @project1 = Factory :project,
-        :path => "project1",
-        :code => "TEST1"
-
-      @project2 = Factory :project,
-        :path => "project2",
-        :code => "TEST2"
-
-      @project1.add_access(@user, :read, :write)
-      @project2.add_access(@user, :read, :write)
-
-      @issue1 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project1
-
-      @issue2 = Factory :issue,
-        :author => @user,
-        :assignee => @user,
-        :project => @project2
-
-      visit issues_path
-    end
-
-    subject { page }
-
-    it { should have_content(@issue1.title) }
-    it { should have_content(@issue1.project.name) }
-    it { should have_content(@issue1.assignee.name) }
-
-    it { should have_content(@issue2.title) }
-    it { should have_content(@issue2.project.name) }
-    it { should have_content(@issue2.assignee.name) }
-
-    it "should render atom feed via private token" do
-      logout
-      visit issues_path(:atom, :private_token => @user.private_token)
-
-      page.response_headers['Content-Type'].should have_content("application/atom+xml")
-      page.body.should have_selector("title", :text => "#{@user.name} issues")
-      page.body.should have_selector("author email", :text => @issue1.author_email)
-      page.body.should have_selector("entry summary", :text => @issue1.title)
-      page.body.should have_selector("author email", :text => @issue2.author_email)
-      page.body.should have_selector("entry summary", :text => @issue2.title)
-    end
-  end
-end
@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe "User MergeRequests" do
-  describe "GET /issues" do
-    before do
-
-      login_as :user
-
-      @project1 = Factory :project,
-        :path => "project1",
-        :code => "TEST1"
-
-      @project2 = Factory :project,
-        :path => "project2",
-        :code => "TEST2"
-
-      @project1.add_access(@user, :read, :write)
-      @project2.add_access(@user, :read, :write)
-
-      @merge_request1 = Factory :merge_request,
-        :author => @user,
-        :assignee => @user,
-        :project => @project1
-
-      @merge_request2 = Factory :merge_request,
-        :author => @user,
-        :assignee => @user,
-        :project => @project2
-
-      visit merge_requests_path
-    end
-
-    subject { page }
-
-    it { should have_content(@merge_request1.title) }
-    it { should have_content(@merge_request1.project.name) }
-    it { should have_content(@merge_request1.target_branch) }
-    it { should have_content(@merge_request1.source_branch) }
-    it { should have_content(@merge_request1.assignee.name) }
-
-    it { should have_content(@merge_request2.title) }
-    it { should have_content(@merge_request2.project.name) }
-    it { should have_content(@merge_request2.target_branch) }
-    it { should have_content(@merge_request2.source_branch) }
-    it { should have_content(@merge_request2.assignee.name) }
-  end
-end
1	class DashboardController < ApplicationController	1	class DashboardController < ApplicationController
		2	+ respond_to :js, :html
		3	+
2	def index	4	def index
3	@projects = current_user.projects.all	5	@projects = current_user.projects.all
4	@active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse	6	@active_projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
		7	+
		8	+ respond_to do \|format\|
		9	+ format.html
		10	+ format.js { no_cache_headers }
		11	+ end
		12	+ end
		13	+
		14	+ def merge_requests
		15	+ @projects = current_user.projects.all
		16	+ @merge_requests = current_user.assigned_merge_requests.order("created_at DESC").limit(40)
		17	+
		18	+ respond_to do \|format\|
		19	+ format.html
		20	+ format.js { no_cache_headers }
		21	+ end
		22	+ end
		23	+
		24	+ def issues
		25	+ @projects = current_user.projects.all
		26	+ @user = current_user
		27	+ @issues = current_user.assigned_issues.opened.order("created_at DESC").limit(40)
		28	+
		29	+ @issues = @issues.includes(:author, :project)
		30	+
		31	+ respond_to do \|format\|
		32	+ format.html
		33	+ format.js { no_cache_headers }
		34	+ format.atom { render :layout => false }
		35	+ end
5	end	36	end
6	end	37	end
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-class UserIssuesController < ApplicationController
2	- before_filter :authenticate_user!
3	-
4	- respond_to :js, :html
5	-
6	- def index
7	- @projects = current_user.projects.all
8	- @user = current_user
9	- @issues = current_user.assigned_issues.opened
10	-
11	- @issues = @issues.includes(:author, :project)
12	-
13	- respond_to do \|format\|
14	- format.html
15	- format.js
16	- format.atom { render :layout => false }
17	- end
18	- end
19	-
20	-end
	@@ -1,8 +0,0 @@	@@ -1,8 +0,0 @@
1	-class UserMergeRequestsController < ApplicationController
2	- before_filter :authenticate_user!
3	-
4	- def index
5	- @projects = current_user.projects.all
6	- @merge_requests = current_user.assigned_merge_requests
7	- end
8	-end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+%aside
	2	+ %h4
	3	+ - if current_user.can_create_project?
	4	+ %a.button-small.button-green{:href => new_project_path} New Project
	5	+ Your Projects
	6	+ %ol.project-list
	7	+ - @projects.each do \|project\|
	8	+ %li
	9	+ %a{:href => project_path(project)}
	10	+ %span.arrow →
	11	+ %span.project-name= project.name
	12	+ %span.time
	13	+ %strong Last activity:
	14	+ = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
	15	+
1	- content_for(:body_class, "dashboard-page")	1	- content_for(:body_class, "dashboard-page")
2		2
3	#dashboard-content.dashboard-content.content	3	#dashboard-content.dashboard-content.content
4	- %aside
5	- %h4
6	- - if current_user.can_create_project?
7	- %a.button-small.button-green{:href => new_project_path} New Project
8	- Your Projects
9	- %ol.project-list
10	- - @projects.each do \|project\|
11	- %li
12	- %a{:href => project_path(project)}
13	- %span.arrow →
14	- %span.project-name= project.name
15	- %span.time
16	- %strong Last activity:
17	- = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
18	- = render "dashboard/projects_feed"	4	+ = render "dashboard/sidebar"
		5	+ #news-feed.news-feed= render "dashboard/projects_feed"
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+:plain
	2	+ $("#feeds_content_holder").hide("slide", { direction: "left" }, 150, function(){
	3	+ $("#news-feed").html("#{escape_javascript(render(:partial => "projects_feed"))}");
	4	+ $("#feeds_content_holder").show("slide", { direction: "right" }, 150);
	5	+ history.pushState({ path: this.path }, '', '#{dashboard_path}')
	6	+ });
	7	+
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+xml.instruct!
	2	+xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
	3	+ xml.title "#{@user.name} issues"
	4	+ xml.link :href => dashboard_issues_url(:atom, :private_token => @user.private_token), :rel => "self", :type => "application/atom+xml"
	5	+ xml.link :href => dashboard_issues_url(:private_token => @user.private_token), :rel => "alternate", :type => "text/html"
	6	+ xml.id dashboard_issues_url(:private_token => @user.private_token)
	7	+ xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
	8	+
	9	+ @issues.each do \|issue\|
	10	+ xml.entry do
	11	+ xml.id project_issue_url(issue.project, issue)
	12	+ xml.link :href => project_issue_url(issue.project, issue)
	13	+ xml.title truncate(issue.title, :length => 80)
	14	+ xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
	15	+ xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
	16	+ xml.author do \|author\|
	17	+ xml.name issue.author_name
	18	+ xml.email issue.author_email
	19	+ end
	20	+ xml.summary issue.title
	21	+ end
	22	+ end
	23	+end
	24	+
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+- content_for(:body_class, "dashboard-page")
	2	+
	3	+#dashboard-content.dashboard-content.content
	4	+ = render "dashboard/sidebar"
	5	+ #news-feed.news-feed= render "dashboard/issues_feed"
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-xml.instruct!
2	-xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do
3	- xml.title "#{@user.name} issues"
4	- xml.link :href => issues_url(:atom, :private_token => @user.private_token), :rel => "self", :type => "application/atom+xml"
5	- xml.link :href => issues_url(:private_token => @user.private_token), :rel => "alternate", :type => "text/html"
6	- xml.id issues_url(:private_token => @user.private_token)
7	- xml.updated @issues.first.created_at.strftime("%Y-%m-%dT%H:%M:%SZ") if @issues.any?
8	-
9	- @issues.each do \|issue\|
10	- xml.entry do
11	- xml.id project_issue_url(issue.project, issue)
12	- xml.link :href => project_issue_url(issue.project, issue)
13	- xml.title truncate(issue.title, :length => 80)
14	- xml.updated issue.created_at.strftime("%Y-%m-%dT%H:%M:%SZ")
15	- xml.media :thumbnail, :width => "40", :height => "40", :url => gravatar_icon(issue.author_email)
16	- xml.author do \|author\|
17	- xml.name issue.author_name
18	- xml.email issue.author_email
19	- end
20	- xml.summary issue.title
21	- end
22	- end
23	-end
24	-
	@@ -1,18 +0,0 @@	@@ -1,18 +0,0 @@
1	-- content_for(:body_class, "dashboard-page")
2	-
3	-#dashboard-content.dashboard-content.content
4	- %aside
5	- %h4
6	- - if current_user.can_create_project?
7	- %a.button-small.button-green{:href => new_project_path} New Project
8	- Your Projects
9	- %ol.project-list
10	- - @projects.each do \|project\|
11	- %li
12	- %a{:href => project_path(project)}
13	- %span.arrow →
14	- %span.project-name= project.name
15	- %span.time
16	- %strong Last activity:
17	- = project.last_activity_date ? time_ago_in_words(project.last_activity_date) + " ago" : "Never"
18	- = render "dashboard/issues_feed"