Activities page added. Dashboard few specs. Preparing for 2.3

This commit is contained in:
Dmitriy Zaporozhets 2012-03-19 22:52:16 +02:00
parent d87abbe9af
commit 724ea16c34
17 changed files with 122 additions and 73 deletions

View file

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

View file

@ -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")

View file

@ -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")

View file

@ -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
→

View file

@ -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

View file

@ -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