IssueList: show until to duedate in opened issue

Show duedate itself on list instead of until to duedate if the issue is closed.
naver · Aug 20, 2014 · 046164f · 046164f
1 parent 2373dce
commit 046164f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/app/assets/stylesheets/less/_common.less b/app/assets/stylesheets/less/_common.less
@@ -201,6 +201,7 @@ input[type=number]::-webkit-outer-spin-button {
 .mr5 { margin-right:5px; }
 .mt5 { margin-top:5px; }
 .mt4 { margin-top:4px; }
+.mr3 { margin-right:3px; }
 
 .margin-top-20   { margin-top:20px;   }
 .margin-left-20  { margin-left: 20px; }

diff --git a/app/views/issue/partial_list.scala.html b/app/views/issue/partial_list.scala.html
@@ -101,13 +101,24 @@
                 }
             </div>
             @if(issue.dueDate != null) {
-            <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
-                <i class="yobicon-clock2"></i> 
-                @if(issue.isOverDueDate) {
-                    @Messages("issue.dueDate.overdue")
+            <div class="mr20 mt10 pull-right
+                 @if(issue.state == State.CLOSED){darkgray-txt}
+                 @if(issue.state == State.OPEN && issue.isOverDueDate){overdue}"
+                 @if(issue.state == State.OPEN){
+                    data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString"
+                 }>
+                <i class="yobicon-clock2 mr3 vmiddle"></i>
+                <span class="vmiddle">
+                @if(issue.state == State.OPEN){
+                    @if(issue.isOverDueDate) {
+                        @Messages("issue.dueDate.overdue")
+                    } else {
+                        @issue.until
+                    }
                 } else {
-                    @issue.until
+                    @issue.getDueDateString
                 }
+                </span>
             </div>
             }       
         </div>