deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Dashboard tabs restyle, messages if no issue or merge request

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-12-15 09:22:24 +02:00
parent ed3f3a0d4d
commit 42c46f3720
5 changed files with 65 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/projects.css.scss
View file

@ -496,14 +496,23 @@ h4.dash-tabs {
font-weight: bold; text-transform: uppercase; font-weight: bold; text-transform: uppercase;
background: #F7F7F7; background: #F7F7F7;
margin-bottom:20px; margin-bottom:20px;
height:13px;
} }
.dash-button { .dash-button {
margin-right:5px; border-right: 1px solid #ddd;
@include round-borders-all(4px);
border: 1px solid #ddd;
background:none; background:none;
padding: 10px 15px;
float:left;
position:relative;
top:-10px;
left:0px;
height:13px;
&:first-child {
border-left: 1px solid #ddd;
}
&.active { &.active {
background: #eaeaea; background: #eaeaea;
} }

4
app/controllers/dashboard_controller.rb
View file

@ -11,9 +11,10 @@ class DashboardController < ApplicationController
end end
end end
# Get authored or assigned open merge requests
def merge_requests def merge_requests
@projects = current_user.projects.all @projects = current_user.projects.all
@merge_requests = current_user.assigned_merge_requests.order("created_at DESC").limit(40) @merge_requests = MergeRequest.where("author_id = :id or assignee_id = :id", :id => current_user.id).opened.order("created_at DESC").limit(40)
respond_to do |format| respond_to do |format|
format.html format.html
@ -21,6 +22,7 @@ class DashboardController < ApplicationController
end end
end end
# Get only assigned issues
def issues def issues
@projects = current_user.projects.all @projects = current_user.projects.all
@user = current_user @user = current_user

42
app/views/dashboard/_issues_feed.html.haml
View file

@ -1,20 +1,26 @@
#feeds_content_holder #feeds_content_holder
.project-box.project-updates.ui-box.ui-box-small.ui-box-big - unless @issues.empty?
.data .project-box.project-updates.ui-box.ui-box-small.ui-box-big
- @issues.each do |update| .data
%a.project-update{:href => dashboard_feed_path(update.project, update)} - @issues.each do |update|
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40 %a.project-update{:href => dashboard_feed_path(update.project, update)}
%span.update-title %strong.issue-number= "##{update.id}"
= truncate update.title, :length => 50 %span.update-title
.right= update.project.name = truncate update.title, :length => 35
%span.update-author .right= truncate update.project.name
%strong= update.author_name %span.update-author
authored %strong= update.author_name
= time_ago_in_words(update.created_at) authored
ago = time_ago_in_words(update.created_at)
.right ago
- if update.critical .right
%span.tag.high critical - if update.critical
- if update.today? %span.tag.high critical
%span.tag.today today - if update.today?
%span.tag.today today
- else
%h2
No assigned
%span.tag.open open
issues

6
app/views/dashboard/_menu.html.haml
View file

@ -1,7 +1,7 @@
%h4.dash-tabs %h4.dash-tabs
= link_to "Activities", dashboard_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide" = link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
= link_to "Issues", dashboard_issues_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide" = link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "button-small dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" = link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= image_tag "ajax-loader-facebook.gif", :class => "dashboard-loader" = image_tag "ajax-loader-facebook.gif", :class => "dashboard-loader"
:javascript :javascript

42
app/views/dashboard/_merge_requests_feed.html.haml
View file

@ -1,20 +1,24 @@
#feeds_content_holder #feeds_content_holder
.project-box.project-updates.ui-box.ui-box-small.ui-box-big - unless @merge_requests.empty?
.data .project-box.project-updates.ui-box.ui-box-small.ui-box-big
- @merge_requests.each do |update| .data
%a.project-update{:href => project_merge_request_path(update.project, update)} - @merge_requests.each do |update|
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40 %a.project-update{:href => project_merge_request_path(update.project, update)}
%span.update-title = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
- state = update.closed ? 'closed' : 'open' %span.update-title
%span.tag{ :class => state } #{state.capitalize} = truncate update.title, :length => 35
= truncate update.title, :length => 70 .right= truncate update.project.name
.right= update.project.name %span.update-author
%span.update-author %strong= update.author_name
%strong= update.author_name authored
authored = time_ago_in_words(update.created_at)
= time_ago_in_words(update.created_at) ago
ago .right
.right %span.tag.commit= update.source_branch
%span.tag.commit= update.source_branch &rarr;
&rarr; %span.tag.commit= update.target_branch
%span.tag.commit= update.target_branch - else
%h2
No authored or assigned
%span.tag.open open
merge requests