diff options
author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-19 17:25:22 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-10-19 17:25:32 +0400 |
commit | 181486649facc8d4b985470356746035b67e18c6 (patch) | |
tree | 6ca3cbea0f7bcc53444175248a5b56d83ea1abfc | |
parent | f9a8510e786cd2e000d5fe116027b0ccd8a6b0ef (diff) |
dashboard
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 37 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 4 | ||||
-rw-r--r-- | app/views/projects/_recent_messages.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 4 |
4 files changed, 39 insertions, 13 deletions
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 4739a469e7d..8d5454357ff 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -557,21 +557,44 @@ tbody tr:nth-child(2n) td, tbody tr.even td { img { 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; margin: 0 20px 20px 0px; - padding: 5px 5px;; + padding: 5px 0px;; 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 { margin-bottom:3px; } - span { - + .author { + background: #eaeaea; + color: #333; } } diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6bcc14b5b20..8ce3ca97ccb 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -64,11 +64,11 @@ class ProjectsController < ApplicationController @date = case params[:view] when "week" then Date.today - 7.days else Date.today - end + end.at_beginning_of_day @heads = @project.repo.heads @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 } @commits.sort! do |x, y| diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml index 2191ed954aa..166123508ed 100644 --- a/app/views/projects/_recent_messages.html.haml +++ b/app/views/projects/_recent_messages.html.haml @@ -5,21 +5,24 @@ - case type - when "Issue" + - css_class = "dash_issue" - issue = parent - item_code = issue.author.email - link_item_name = truncate(issue.title, :length => 50) - link_to_item = project_issue_path(@project, issue) - when "Commit" + - css_class = "dash_commit" - commit = parent - item_code = commit.author.email - link_item_name = truncate_commit_message(commit, 50) - link_to_item = project_commit_path(@project, :id => commit.id) - else + - css_class = "dash_wall" - item_code = @project.name - link_item_name = "Project Wall" - 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 %h4 = link_to(link_item_name, link_to_item) @@ -30,7 +33,7 @@ %div.message = image_tag gravatar_icon(note.author.email), :class => "left", :width => 24, :style => "padding-right:5px;" %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 %br Attachment: diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 25cd7b947c4..ff6078c15a0 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -4,7 +4,7 @@ = form_tag project_path(@project), :method => :get do .span-2 = 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 = radio_button_tag :view, "week", params[:view] == "week", :onclick => "this.form.submit()", :id => "week_view" = label_tag "week_view","Week" @@ -15,6 +15,6 @@ =render "projects/recent_commits" .span-11.right - %h3 Messages + %h3 Talk =render "projects/recent_messages" |