diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2019-11-07 15:12:23 -0500 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-11-07 21:12:23 +0100 |
| commit | b747501337a50b847631efe0041cf2c994f4a7fa (patch) | |
| tree | a598b78c49131a9dd02676c4d78639050a2432db | |
| parent | 884acf8295500aa5387295bea2dd83b0bf841b9a (diff) | |
| download | gitea-b747501337a50b847631efe0041cf2c994f4a7fa.tar.gz gitea-b747501337a50b847631efe0041cf2c994f4a7fa.zip | |
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
| -rw-r--r-- | public/css/index.css | 1 | ||||
| -rw-r--r-- | public/less/_repository.less | 4 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 5 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 5 |
4 files changed, 13 insertions, 2 deletions
diff --git a/public/css/index.css b/public/css/index.css index f7eb02b296..3ec47eb85c 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 d585eb03a6..84d59bbe91 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 d68e6dac26..b4c2d88bfd 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 ac5f10a599..5418c6de47 100644 --- 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}} |