Show due date in dashboard issues list (#8860)

* Show due date in dashboard issues list

Include due date when vieiwiing all issues on dashboard (matching what
we show for repo issue lists).

Fixes #8859

* Put in same order as repo issue list

* Add suggested changes and also update repo issue list to match

diff --git a/public/css/index.css b/public/css/index.css
index f7eb02b2968ce4542fe7612e625492e0b6f7a21f..3ec47eb85cd2d30255954dc67547dcf5fb64d00d 100644 (file)
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -818,6 +818,7 @@ i.icon.centerlock{top:1.5em}
 .issue.list>.item .desc .checklist{padding-left:5px}
 .issue.list>.item .desc .checklist .progress-bar{margin-left:2px;width:80px;height:6px;display:inline-block;background-color:#eee;overflow:hidden;border-radius:3px;vertical-align:2px!important}
 .issue.list>.item .desc .checklist .progress-bar .progress{background-color:#ccc;display:block;height:100%}
+.issue.list>.item .desc .due-date{padding-left:5px}
 .issue.list>.item .desc a.milestone{margin-left:5px;color:#999!important}
 .issue.list>.item .desc a.milestone:hover{color:#000!important}
 .issue.list>.item .desc a.ref{margin-left:8px;color:#999!important}

diff --git a/public/less/_repository.less b/public/less/_repository.less
index d585eb03a67adb54f2bbf6322c04f4ff2ecafc0c..84d59bbe91e54787df3f15b80560f2b20a43b922 100644 (file)
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -2073,6 +2073,10 @@
                 }
             }
 
+            .due-date {
+                padding-left: 5px;
+            }
+
             a.milestone {
                 margin-left: 5px;
                 color: #999999 !important;

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index d68e6dac26b38560aa290fe5431ca1dbc19cb16b..b4c2d88bfde400fc5e2f20e03b74b1b828b3e007 100644 (file)
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -258,8 +258,9 @@
                                                        </span>
                                                {{end}}
                                                {{if ne .DeadlineUnix 0}}
-                                                       <span class="octicon octicon-calendar"></span>
-                                                       <span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+                                                       <span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
+                                                               <span class="octicon octicon-calendar"></span><span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+                                                       </span>
                                                {{end}}
                                                {{range .Assignees}}
                                                        <a class="ui right assignee poping up" href="{{.HomeLink}}" data-content="{{.Name}}" data-variation="inverted" data-position="left center">

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index ac5f10a5994346597763d7340532eb80aca340d5..5418c6de47d3d9a0db386189d3932ad4551d1b7c 100644 (file)
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -126,6 +126,11 @@
                                                                                <span class="octicon octicon-checklist"></span> {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
                                                                        </span>
                                                                {{end}}
+                                                               {{if ne .DeadlineUnix 0}}
+                                                                       <span class="due-date poping up" data-content="{{$.i18n.Tr "repo.issues.due_date"}}" data-variation="tiny inverted" data-position="right center">
+                                                                               <span class="octicon octicon-calendar"></span><span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+                                                                       </span>
+                                                               {{end}}
                                                        </p>
                                                </li>
                                        {{end}}