diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-26 20:08:44 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-26 20:08:44 +0400 |
| commit | 0321a3c9b404b4c1a68a92a5a2bdc4d07ed7a527 (patch) | |
| tree | 2eb2bcdd6bb89c4d8d83c6f7b4a4b080496d3356 /app/views/issues | |
| parent | 89d3366e76c73e5d34f6773ece5ba07492a54922 (diff) | |
MR: merged badge. Removed colors from MR list
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/issues/index.html.haml | 8 | ||||
| -rw-r--r-- | app/views/issues/show.html.haml | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index e7dc3f835b2..492cedf629b 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -19,6 +19,6 @@ %strong= issue.assignee_name - if issue.upvotes > 0 %span.badge.badge-success= "+#{issue.upvotes}" - + = link_to project_issue_path(issue.project, issue) do %p.row_title= truncate(issue.title, :length => 100) diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index ade80dade8f..1c34ad25d80 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -17,16 +17,16 @@ .issues_legend .list_legend + .icon.today + .text Today + + .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 diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 4b94339d3e3..0d3c4e19097 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -1,5 +1,6 @@ %h3 Issue ##{@issue.id} + %small created at = @issue.created_at.stamp("Aug 21, 2011") @@ -48,6 +49,11 @@ %strong = truncate(milestone.title, :length => 20) + .right + - if @issue.critical + %span.label.label-important + Critical + - if @issue.description.present? .bottom_box_content = preserve do |