Commit 75cf927d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Issues & MR legend

parent b64ceadb
...@@ -606,3 +606,92 @@ li.note { ...@@ -606,3 +606,92 @@ li.note {
.mr_show_all_commits { .mr_show_all_commits {
cursor:pointer; cursor:pointer;
} }
/**
* Issues, MRs legend
*
*/
.list_legend {
float:left;
margin-right:20px;
.icon {
width:16px;
height:16px;
float:left;
margin-right:5px;
@include border-radius(4px);
&.critical {
background: #EAA;
border:1px solid #B88;
}
&.today{
background: #ADA;
border:1px solid #8B8;
}
&.closed {
background: #DDD;
border:1px solid #BBB;
}
&.yours {
background: #AAD;
border:1px solid #88B;
}
&.merged {
background: #DAD;
border:1px solid #B8B;
}
}
.text {
padding-bottom: 10px;
float:left;
}
}
.merge_request,
.issue {
.list_legend {
margin-right: 5px;
margin-top: 10px;
.icon {
width:16px;
height:16px;
float:left;
margin-right:5px;
@include border-radius(4px);
border:1px solid #ddd;
}
}
&.critical {
.icon {
background: #EAA;
border:1px solid #B88;
}
}
&.today{
.icon {
background: #ADA;
border:1px solid #8B8;
}
}
&.closed {
.icon {
background: #DDD;
border:1px solid #BBB;
}
}
&.yours {
.icon {
background: #AAD;
border:1px solid #88B;
}
}
&.merged {
.icon {
background: #DAD;
border:1px solid #B8B;
}
}
}
...@@ -25,3 +25,5 @@ ...@@ -25,3 +25,5 @@
@extend .bottom_box_content; @extend .bottom_box_content;
} }
} }
...@@ -25,4 +25,12 @@ module IssuesHelper ...@@ -25,4 +25,12 @@ module IssuesHelper
issue.author_name issue.author_name
end end
end end
def issue_css_classes issue
classes = "issue"
classes << " critical" if issue.critical
classes << " closed" if issue.closed
classes << " today" if issue.today?
classes
end
end end
...@@ -31,4 +31,12 @@ module MergeRequestsHelper ...@@ -31,4 +31,12 @@ module MergeRequestsHelper
} }
) )
end end
def mr_css_classes mr
classes = "merge_request"
classes << " closed" if mr.closed
classes << " merged" if mr.merged?
classes << " today" if mr.today?
classes
end
end end
...@@ -93,6 +93,10 @@ class MergeRequest < ActiveRecord::Base ...@@ -93,6 +93,10 @@ class MergeRequest < ActiveRecord::Base
self.save self.save
end end
def today?
Date.today == created_at.to_date
end
def new? def new?
today? && created_at == updated_at today? && created_at == updated_at
end end
......
...@@ -4,6 +4,15 @@ ...@@ -4,6 +4,15 @@
%small.right #{@issues.total_count} issues %small.right #{@issues.total_count} issues
%br %br
.issues_legend
.list_legend
.icon.critical
.text Critical
.list_legend
.icon.today
.text Today
.clearfix
- if @issues.any? - if @issues.any?
- @issues.group_by(&:project).each do |group| - @issues.group_by(&:project).each do |group|
%div.ui-box %div.ui-box
......
%li.wll{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) }
.list_legend
.icon
.right .right
- if issue.notes.any? - if issue.notes.any?
%span.btn.small.disabled.padded= pluralize issue.notes.count, 'note' %span.btn.small.disabled.padded= pluralize issue.notes.count, 'note'
...@@ -15,12 +17,8 @@ ...@@ -15,12 +17,8 @@
%span.update-author %span.update-author
assigned to assigned to
%strong= issue.assignee_name %strong= issue.assignee_name
- if issue.critical
%span.label.important critical
- if issue.today?
%span.label.success today
- if issue.upvotes > 0 - if issue.upvotes > 0
%span.label.success= "+#{issue.upvotes}" %span.badge.badge-success= "+#{issue.upvotes}"
= link_to project_issue_path(issue.project, issue) do = link_to project_issue_path(issue.project, issue) do
%p.row_title= truncate(issue.title, :length => 100) %p.row_title= truncate(issue.title, :length => 100)
...@@ -14,6 +14,21 @@ ...@@ -14,6 +14,21 @@
= search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' } = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search span3 right neib' }
%br %br
.issues_legend
.list_legend
.icon.critical
.text Critical
.list_legend
.icon.closed
.text Closed
.list_legend
.icon.today
.text Today
.clearfix
%div#issues-table-holder.ui-box %div#issues-table-holder.ui-box
.title .title
.row .row
......
%li.wll %li.wll{ :class => mr_css_classes(merge_request) }
.list_legend
.icon
.right .right
.left .left
- if merge_request.notes.any? - if merge_request.notes.any?
...@@ -14,6 +16,6 @@ ...@@ -14,6 +16,6 @@
= time_ago_in_words(merge_request.created_at) = time_ago_in_words(merge_request.created_at)
ago ago
- if merge_request.upvotes > 0 - if merge_request.upvotes > 0
%span.label.success= "+#{merge_request.upvotes}" %span.badge.badge-success= "+#{merge_request.upvotes}"
= link_to project_merge_request_path(merge_request.project, merge_request) do = link_to project_merge_request_path(merge_request.project, merge_request) do
%p.row_title= truncate(merge_request.title, :length => 80) %p.row_title= truncate(merge_request.title, :length => 80)
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
%br %br
.mrs_legend
.list_legend
.icon.today
.text Today
.list_legend
.icon.merged
.text Merged
.list_legend
.icon.closed
.text Closed
.clearfix
.ui-box .ui-box
.title .title
%ul.nav.nav-pills %ul.nav.nav-pills
...@@ -26,7 +40,7 @@ ...@@ -26,7 +40,7 @@
= render @merge_requests = render @merge_requests
- if @merge_requests.blank? - if @merge_requests.blank?
%li %li
%p.padded Nothing to show here %h4.nothing_here_message Nothing to show here
- if @merge_requests.present? - if @merge_requests.present?
%li.bottom %li.bottom
.row .row
......
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