Commit 18148664 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

dashboard

parent f9a8510e
...@@ -557,21 +557,44 @@ tbody tr:nth-child(2n) td, tbody tr.even td { ...@@ -557,21 +557,44 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
img { img {
padding-right:10px; padding-right:10px;
} }
background: #fff !important;
background: -webkit-gradient(linear,left top,left bottom,from(#fff),to(#EAEAEA)) !important;
background: -moz-linear-gradient(top,#fff,#EAEAEA) !important;
background: transparent 9 !important;
float: left; float: left;
margin: 0 20px 20px 0px; margin: 0 20px 20px 0px;
padding: 5px 5px;; padding: 5px 0px;;
width: 420px; width: 420px;
&.dash_wall{
border-bottom: 2px solid orange;
span {
background: orange;
color:black;
}
}
&.dash_issue{
border-bottom: 2px solid #ffbbbb;
span {
background: #ffbbbb;
color:black;
padding:2px;
}
}
&.dash_commit{
border-bottom: 2px solid #bbbbff;
span{
background: #bbbbff;
color:black;
padding:2px;
}
}
h4 { h4 {
margin-bottom:3px; margin-bottom:3px;
} }
span { .author {
background: #eaeaea;
color: #333;
} }
} }
...@@ -64,11 +64,11 @@ class ProjectsController < ApplicationController ...@@ -64,11 +64,11 @@ class ProjectsController < ApplicationController
@date = case params[:view] @date = case params[:view]
when "week" then Date.today - 7.days when "week" then Date.today - 7.days
else Date.today else Date.today
end end.at_beginning_of_day
@heads = @project.repo.heads @heads = @project.repo.heads
@commits = @heads.map do |h| @commits = @heads.map do |h|
@project.repo.log(h.name, nil, :since => @date - 1.day) @project.repo.log(h.name, nil, :since => @date)
end.flatten.uniq { |c| c.id } end.flatten.uniq { |c| c.id }
@commits.sort! do |x, y| @commits.sort! do |x, y|
......
...@@ -5,21 +5,24 @@ ...@@ -5,21 +5,24 @@
- case type - case type
- when "Issue" - when "Issue"
- css_class = "dash_issue"
- issue = parent - issue = parent
- item_code = issue.author.email - item_code = issue.author.email
- link_item_name = truncate(issue.title, :length => 50) - link_item_name = truncate(issue.title, :length => 50)
- link_to_item = project_issue_path(@project, issue) - link_to_item = project_issue_path(@project, issue)
- when "Commit" - when "Commit"
- css_class = "dash_commit"
- commit = parent - commit = parent
- item_code = commit.author.email - item_code = commit.author.email
- link_item_name = truncate_commit_message(commit, 50) - link_item_name = truncate_commit_message(commit, 50)
- link_to_item = project_commit_path(@project, :id => commit.id) - link_to_item = project_commit_path(@project, :id => commit.id)
- else - else
- css_class = "dash_wall"
- item_code = @project.name - item_code = @project.name
- link_item_name = "Project Wall" - link_item_name = "Project Wall"
- link_to_item = wall_project_path(@project) - link_to_item = wall_project_path(@project)
%div.recent_message_parent %div{ :class => "recent_message_parent #{css_class}"}
= image_tag gravatar_icon(item_code), :class => "left", :width => 40 = image_tag gravatar_icon(item_code), :class => "left", :width => 40
%h4 %h4
= link_to(link_item_name, link_to_item) = link_to(link_item_name, link_to_item)
...@@ -30,7 +33,7 @@ ...@@ -30,7 +33,7 @@
%div.message %div.message
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;" = image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;"
%p{:style => "margin-bottom: 3px;"} %p{:style => "margin-bottom: 3px;"}
= link_to truncate(note.note, :length => 50), "#" = link_to truncate(note.note, :length => 200), link_to_item + "#note_#{note.id}"
- if note.attachment.url - if note.attachment.url
%br %br
Attachment: Attachment:
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
= form_tag project_path(@project), :method => :get do = form_tag project_path(@project), :method => :get do
.span-2 .span-2
= radio_button_tag :view, "day", (params[:view] || "day") == "day", :onclick => "this.form.submit()", :id => "day_view" = radio_button_tag :view, "day", (params[:view] || "day") == "day", :onclick => "this.form.submit()", :id => "day_view"
= label_tag "day_view","Day" = label_tag "day_view","Today"
.span-2 .span-2
= radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view" = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view"
= label_tag "week_view","Week" = label_tag "week_view","Week"
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
=render "projects/recent_commits" =render "projects/recent_commits"
.span-11.right .span-11.right
%h3 Messages %h3 Talk
=render "projects/recent_messages" =render "projects/recent_messages"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment