Activities page added. Dashboard few specs. Preparing for 2.3

app/views/dashboard/_events_feed.html.haml

@@ -1,2 +0,0 @@
-= render @events
-

app/views/dashboard/_issues_feed.html.haml

@@ -3,8 +3,10 @@
     = link_to [issue.project, issue] do 
       %p
         %strong
-          %span.label= issue.project.name
+          %span.pretty_label= issue.project.name
           –
           Issue #
           = issue.id
         = truncate issue.title, :length => 50
+        %span.right.cgray
+          = issue.updated_at.stamp("Aug 21, 2011")

app/views/dashboard/_merge_requests_feed.html.haml

@@ -3,8 +3,9 @@
     = link_to [merge_request.project, merge_request] do 
       %p
         %strong
-          %span.label= merge_request.project.name
+          %span.pretty_label= merge_request.project.name
           –
-          Merge Request #
-          = merge_request.id
+          Merge Request ##{merge_request.id}
         = truncate merge_request.title, :length => 50
+        %span.right.cgray
+          = merge_request.updated_at.stamp("Aug 21, 2011")

app/views/dashboard/_projects_feed.html.haml

@@ -1,5 +1,5 @@
 - projects.first(5).each do |project|
-  .wll
+  %div.dash_project_item
     = link_to project do 
       %h4
         %span.ico.project
@@ -7,3 +7,5 @@
         %small
           last activity at 
           = project.last_activity_date.stamp("Aug 25, 2011")
+        %span.right.arrow
+          →

app/views/dashboard/activities.html.haml

@@ -0,0 +1,10 @@
+- if @events.any?
+  %div.dashboard_category
+    %h3
+      %span.ico.activities
+      = link_to "Activities" , "#activities", :id => "activities"
+
+    %hr
+    = render @events
+- else
+  %h3 Nothing here

app/views/dashboard/index.html.haml

@@ -62,7 +62,10 @@
     %h3
       %span.ico.activities
       = link_to "Activities" , "#activities", :id => "activities"
+    %strong.right
+      = link_to dashboard_activities_path do 
+        Visit activities page → 
 
     %hr
     .row
-      .dashboard_block= render "dashboard/events_feed"
+      .dashboard_block= render @events

app/views/layouts/_app_menu.html.haml

@@ -1,11 +1,12 @@
 %nav.main_menu
   = render "layouts/const_menu_links"
   = link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"
-  = link_to "Search", search_path, :class => "#{"current" if current_page?(search_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
   = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
     Requests
     %span.count= current_user.cared_merge_requests.count
+  = link_to "Search", search_path, :class => "#{"current" if current_page?(search_path)}"
   = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"

app/views/profile/password.html.haml

@@ -1,42 +1,46 @@
-%h3 Password
-%hr
-= form_for @user, :url => profile_password_path, :method => :put do |f|
-  .data
-    .alert-message.block-message.warning
-      %p After successfull password update you will be redirected to login page where you should login with new password
-    -if @user.errors.any?
-      .alert-message.block-message.error
-        %ul
-          - @user.errors.full_messages.each do |msg|
-            %li= msg
-
-    .clearfix
-      = f.label :password
-      .input= f.password_field :password
-    .clearfix
-      = f.label :password_confirmation
-      .input= f.password_field :password_confirmation
-  .actions
-    = f.submit 'Save', :class => "btn"
-  
-%h3 
-  Private token
-  %span.cred.right
-    keep it in secret!
-%hr
-= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
-  .data
-    %p Private token used to access application resources without authentication.
-    %p For example its required to access commits feed.
+.row
+  .span8
+    %h3 Password
     %hr
-    %p.cgray
-      - if current_user.private_token
-        = text_field_tag "token", current_user.private_token
-      - else
-        You don`t have one yet. Click generate to fix it.
-  .actions
-    - if current_user.private_token
-      = f.submit 'Reset', :confirm => "Are you sure?", :class => "btn"
-    - else
-      = f.submit 'Generate', :class => "btn"
+    = form_for @user, :url => profile_password_path, :method => :put do |f|
+      .data
+        .alert-message.block-message.warning
+          %p After successfull password update you will be redirected to login page where you should login with new password
+        -if @user.errors.any?
+          .alert-message.block-message.error
+            %ul
+              - @user.errors.full_messages.each do |msg|
+                %li= msg
+
+        .clearfix
+          = f.label :password
+          .input= f.password_field :password
+        .clearfix
+          = f.label :password_confirmation
+          .input= f.password_field :password_confirmation
+      .actions
+        = f.submit 'Save', :class => "btn"
+
+  .span7.right
+    %h3 
+      Private token
+      %span.cred.right
+        keep it in secret!
+    %hr
+    = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
+      .data
+        .alert-message.block-message.warning
+          %p Private token used to access application resources without authentication.
+          %hr
+          %p * required for rss feed
+        %p.cgray
+          - if current_user.private_token
+            = text_field_tag "token", current_user.private_token
+          - else
+            You don`t have one yet. Click generate to fix it.
+      .actions
+        - if current_user.private_token
+          = f.submit 'Reset', :confirm => "Are you sure?", :class => "btn"
+        - else
+          = f.submit 'Generate', :class => "btn"
 

app/views/projects/_show.html.haml

@@ -1,4 +1,4 @@
-%h4.title
+%h5.title
   = @project.name
 %br
 %div

app/views/projects/empty.html.haml

@@ -6,7 +6,7 @@
       %li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq. 
 
 .alert-message.block-message.error
-  %ul.alert_holder
+  %ul.unstyled.alert_holder
     %li You should push repository to proceed.
     %li After push you will be able to browse code, commits etc. 
 

app/views/projects/show.html.haml

@@ -21,9 +21,13 @@
       = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
 
 - if @project.description.present?
-  = markdown @project.description
+  .prettyprint= markdown @project.description
 - unless @events.blank?
-  %h5.cgray Recent Activity
+  %br
+  %h5.cgray
+    %span.ico.activities
+    Recent Activity
+  %hr
   .content_list= render @events