From 7d52de8918cb33743888ce9ace582a71a18c9cbd Mon Sep 17 00:00:00 2001
From: "j. mccann" <info@mrsdizzie.com>
Date: Wed, 6 Nov 2019 16:59:43 -0500
Subject: [PATCH 1/3] 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
---
 templates/user/dashboard/issues.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index ac5f10a59943..1cd2bc633ac7 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -109,6 +109,10 @@
 										<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}
 									</a>
 								{{end}}
+								{{if ne .DeadlineUnix 0}}
+									<span class="octicon octicon-calendar"></span>
+									<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+								{{end}}
 								{{if .Ref}}
 									<a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/src/branch/{{.Ref}}">
 										<span class="octicon octicon-git-branch"></span> {{.Ref}}

From 55ce94f401c80684ec60e4cfa132fb42327cbd54 Mon Sep 17 00:00:00 2001
From: "j. mccann" <info@mrsdizzie.com>
Date: Wed, 6 Nov 2019 17:05:48 -0500
Subject: [PATCH 2/3] Put in same order as repo issue list

---
 templates/user/dashboard/issues.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 1cd2bc633ac7..030f36f0e428 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -109,10 +109,6 @@
 										<span class="octicon octicon-milestone"></span> {{.Milestone.Name}}
 									</a>
 								{{end}}
-								{{if ne .DeadlineUnix 0}}
-									<span class="octicon octicon-calendar"></span>
-									<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
-								{{end}}
 								{{if .Ref}}
 									<a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/src/branch/{{.Ref}}">
 										<span class="octicon octicon-git-branch"></span> {{.Ref}}
@@ -130,6 +126,10 @@
 										<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="octicon octicon-calendar"></span>
+									<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>
+								{{end}}
 							</p>
 						</li>
 					{{end}}

From 462d00ac446bdc6f68c870cb0b11f7b3e8345de1 Mon Sep 17 00:00:00 2001
From: "j. mccann" <info@mrsdizzie.com>
Date: Wed, 6 Nov 2019 23:43:17 -0500
Subject: [PATCH 3/3] Add suggested changes and also update repo issue list to
 match

---
 public/css/index.css                 | 1 +
 public/less/_repository.less         | 4 ++++
 templates/repo/issue/list.tmpl       | 5 +++--
 templates/user/dashboard/issues.tmpl | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index f7eb02b2968c..3ec47eb85cd2 100644
--- 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 d585eb03a67a..84d59bbe91e5 100644
--- 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 d68e6dac26b3..b4c2d88bfde4 100644
--- 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 030f36f0e428..5418c6de47d3 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -127,8 +127,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}}
 							</p>
 						</li>