Bootstrap: Activities

app/views/dashboard/_issues_feed.html.haml

@@ -1,26 +1,10 @@
-#feeds_content_holder
-  - unless @issues.empty?
-    .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)}
-            .avatar= image_tag gravatar_icon(update.assignee_email), :class => "avatar", :width => 32
-            %div
-              = truncate update.title, :length => 35
-              .right= truncate update.project.name
-            %span.update-author
-              %strong= update.author_name
-              authored
-              = time_ago_in_words(update.created_at)
-              ago
-            .right
-              - if update.critical
-                %span.label.important critical
-              - if update.today?
-                %span.label.new today
-
-  - else 
-    %h2
-      No assigned
-      %span.tag.open open
-      issues
+- @issues.each do |issue|
+  .alert-message.entry
+    = link_to [issue.project, issue] do 
+      %p
+        %strong
+          = issue.project.name
+          –
+          Issue #
+          = issue.id
+        = truncate issue.title, :length => 50

app/views/dashboard/_merge_requests_feed.html.haml

@@ -1,24 +1,10 @@
-#feeds_content_holder
-  - unless @merge_requests.empty?
-    .project-box.project-updates.ui-box.ui-box-small.ui-box-big
-      .data
-        - @merge_requests.each do |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
-              = truncate update.title, :length => 35
-              .right= truncate update.project.name
-            %span.update-author
-              %strong= update.author_name
-              authored
-              = time_ago_in_words(update.created_at)
-              ago
-            .right
-              %span.tag.commit= update.source_branch
-              →
-              %span.tag.commit= update.target_branch
-  - else 
-    %h2
-      No authored or assigned
-      %span.tag.open open
-      merge requests
+- @merge_requests.each do |merge_request|
+  .alert-message.entry
+    = link_to [merge_request.project, merge_request] do 
+      %p
+        %strong
+          = merge_request.project.name
+          –
+          Issue #
+          = merge_request.id
+        = truncate merge_request.title, :length => 50

app/views/dashboard/_projects_feed.html.haml

@@ -1,19 +1,17 @@
-#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 
-        %h4= project.name
-        - project.updates(3).each do |update|
-          %a.project-update{:href => dashboard_feed_path(project, update)}
-            = image_tag gravatar_icon(update.author_email), :class => "avatar", :width => 32
-            %div
-              = dashboard_feed_title(update)
-            %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
+- @active_projects.first(3).each do |project|
+  = link_to project do 
+    %h4= project.name
+  - project.updates(3).each do |update|
+    %a.project-update{:href => dashboard_feed_path(project, update)}
+      = image_tag gravatar_icon(update.author_email), :class => "avatar", :width => 32
+      %div
+        = dashboard_feed_title(update)
+      %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
 

app/views/dashboard/issues.html.haml

@@ -1,6 +1,6 @@
 %h3
   Issues
-  %small ( authored or assigned to you )
+  %small ( assigned to you )
 
 %hr
-.news-feed= render "dashboard/issues_feed"
+= render "dashboard/issues_feed"

app/views/dashboard/merge_requests.html.haml

@@ -1,3 +1,6 @@
-%h3 Merge Requests
+%h3
+  Merge Requests
+  %small ( authored or assigned to you )
+
 %hr
-.news-feed= render "dashboard/merge_requests_feed"
+= render "dashboard/merge_requests_feed"