Bootstrap: application layout

app/views/dashboard/_issues_feed.html.haml

@@ -4,8 +4,8 @@
       .data
         - @issues.each do |update|
           %a.project-update{:href => dashboard_feed_path(update.project, update)}
-            %strong.issue-number= "##{update.id}"
-            %span.update-title
+            .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
@@ -15,9 +15,9 @@
               ago
             .right
               - if update.critical
-                %span.tag.high critical
+                %span.label.important critical
               - if update.today?
-                %span.tag.today today
+                %span.label.new today
 
   - else 
     %h2

app/views/dashboard/_projects_feed.html.haml

@@ -2,19 +2,18 @@
   - @active_projects.first(3).each do |project|
     .project-box.project-updates.ui-box.ui-box-small.ui-box-big
       = link_to project do 
-        %h3= project.name
-        .data
-          - project.updates(3).each do |update|
-            %a.project-update{:href => dashboard_feed_path(project, update)}
-              = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
-              %span.update-title
-                = 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
+        %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/_sidebar.html.haml

@@ -1,16 +0,0 @@
-%aside
-  %h4
-    Your Projects
-    - if current_user.can_create_project?
-      = link_to new_project_path, :class => "btn small" do 
-        New Project
-  %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_cached ? time_ago_in_words(project.last_activity_date_cached) + " ago" : "Never"
-

app/views/dashboard/index.html.haml

@@ -1 +1,3 @@
+%h3 Activities
+%hr
 .news-feed= render "dashboard/projects_feed"

app/views/dashboard/issues.html.haml

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

app/views/dashboard/merge_requests.html.haml

@@ -1 +1,3 @@
+%h3 Merge Requests
+%hr
 .news-feed= render "dashboard/merge_requests_feed"