diff options
| author | jaqra <48099350+jaqra@users.noreply.github.com> | 2019-09-12 12:31:36 +0300 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-12 12:31:36 +0300 |
| commit | 59b194f4d10168f16fb6c241e53005c38f1c8976 (patch) | |
| tree | 9ee24c86c597dc3e7b789bae5c918901274a7796 /templates | |
| parent | 52fda312dfd2ed93e512c8e210c5646e4ae53dbc (diff) | |
| download | gitea-59b194f4d10168f16fb6c241e53005c38f1c8976.tar.gz gitea-59b194f4d10168f16fb6c241e53005c38f1c8976.zip | |
Move ref (branch or tag) location on issue list page (#8157)
* Move ref (branch or tag) location on issue list page
* Make looks better
* move branch label also on milestone/{id} page
* [/issues page] Add milestone, Add Ref, Fix Assignees
* [repo issues page] reorder tasks, milestone and ref
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/issue/list.tmpl | 18 | ||||
| -rw-r--r-- | templates/repo/issue/milestone_issues.tmpl | 8 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 16 |
3 files changed, 28 insertions, 14 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8bdc0dfa92..4874d97da4 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -217,9 +217,6 @@ {{end}} {{end}} - {{if .Ref}} - <a class="ui label" href="{{$.RepoLink}}/src/branch/{{.Ref}}">{{.Ref}}</a> - {{end}} {{range .Labels}} <a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a> {{end}} @@ -242,6 +239,16 @@ {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{end}} + {{if .Milestone}} + <a class="milestone" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}"> + <span class="octicon octicon-milestone"></span> {{.Milestone.Name}} + </a> + {{end}} + {{if .Ref}} + <a class="ref" href="{{$.RepoLink}}/src/branch/{{.Ref}}"> + <span class="octicon octicon-git-branch"></span> {{.Ref}} + </a> + {{end}} {{$tasks := .GetTasks}} {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} @@ -249,11 +256,6 @@ <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 .Milestone}} - <a class="milestone" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}"> - <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> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 738ac4b816..889cd2c2f6 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -187,9 +187,6 @@ <div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div> <a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> - {{if .Ref}} - <a class="ui label" href="{{$.RepoLink}}/src/branch/{{.Ref}}">{{.Ref}}</a> - {{end}} {{range .Labels}} <a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&assignee={{$.AssigneeID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a> {{end}} @@ -208,6 +205,11 @@ {{else}} {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}} {{end}} + {{if .Ref}} + <a class="ref" href="{{$.RepoLink}}/src/branch/{{.Ref}}"> + <span class="octicon octicon-git-branch"></span> {{.Ref}} + </a> + {{end}} {{$tasks := .GetTasks}} {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 7083569164..3e1095606b 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -100,9 +100,19 @@ {{else}} {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}} {{end}} - {{if .Assignee}} - <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.GetDisplayName}}" data-variation="inverted" data-position="left center"> - <img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> + {{if .Milestone}} + <a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}"> + <span class="octicon octicon-milestone"></span> {{.Milestone.Name}} + </a> + {{end}} + {{if .Ref}} + <a class="ref" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/src/branch/{{.Ref}}"> + <span class="octicon octicon-git-branch"></span> {{.Ref}} + </a> + {{end}} + {{range .Assignees}} + <a class="ui right assignee poping up" href="{{.HomeLink}}" data-content="{{.GetDisplayName}}" data-variation="inverted" data-position="left center"> + <img class="ui avatar image" src="{{.RelAvatarLink}}"> </a> {{end}} {{$tasks := .GetTasks}} |