Skip to content
Snippets Groups Projects
Commit 69e0ea62 authored by gitlabhq's avatar gitlabhq
Browse files

dashboard

parent 85265b1b
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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;
}
}
Loading
Loading
@@ -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|
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
@@ -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:
Loading
Loading
Loading
Loading
@@ -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"
Loading
Loading
@@ -15,6 +15,6 @@
=render "projects/recent_commits"
 
.span-11.right
%h3 Messages
%h3 Talk
=render "projects/recent_messages"
 
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment