diff options
author | gitlabhq <m@gitlabhq.com> | 2011-10-28 13:22:09 +0400 |
---|---|---|
committer | gitlabhq <m@gitlabhq.com> | 2011-10-28 13:22:09 +0400 |
commit | a0171813391c8226802621a710798e376fea2f1e (patch) | |
tree | 8022e71a0661d670ef564e576ff452f073eb55ab /app | |
parent | 56d9761844b2665e9e48d50f15f7ac3a63d60618 (diff) |
new issue format
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/projects.css.scss | 4 | ||||
-rw-r--r-- | app/controllers/issues_controller.rb | 2 | ||||
-rw-r--r-- | app/views/issues/_show.html.haml | 2 | ||||
-rw-r--r-- | app/views/issues/show.html.haml | 13 |
4 files changed, 17 insertions, 4 deletions
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index f9c7592bd91..bde9aa5d15f 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -662,6 +662,10 @@ tbody tr:nth-child(2n) td, tbody tr.even td { background: #4466cc; color:white; } + &.normal { + background: #2c5ca6; + color:white; + } &.notes { background: #2c5c66; color:white; diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 26e4a5734c2..d0fad8ed647 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -34,7 +34,7 @@ class IssuesController < ApplicationController end def show - @notes = @issue.notes + @notes = @issue.notes.order("created_at ASC") @note = @project.notes.new(:noteable => @issue) end diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 9cce2871331..94cc03d17ae 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -7,7 +7,7 @@ = truncate issue.assignee.name, :lenght => 20 %td ##{issue.id} %td - = truncate(html_escape(issue.title), :length => 50) + = truncate(html_escape(issue.title), :length => 60) %br - if issue.critical %span.tag.high critical diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index eb972d33abd..c61052839f9 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -1,6 +1,5 @@ %h2 - = "Issue ##{@issue.id} - #{truncate @issue.title, :length => 50}" - + = "Issue ##{@issue.id} - #{html_escape(@issue.title)}" .span-15 -#= simple_format html_escape(@issue.content) .issue_notes= render "notes/notes" @@ -29,6 +28,16 @@ %td = image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;" = @issue.assignee.name + %tr + %td Tags + %td + - if @issue.critical + %span.tag.high critical + - else + %span.tag.normal normal + + - if @issue.today? + %span.tag.today today %tr %td Closed? %td |