third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move ref (branch or tag) location on issue list page (#8157)

Browse Source 
* 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
tokarchuk/v1.17
jaqra 5 years ago committed by Lauris BH
parent 52fda312df
commit 59b194f4d1
5 changed files with 46 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      public/css/index.css
  2. 15
      public/less/_repository.less
  3. 18
      templates/repo/issue/list.tmpl
  4. 8
      templates/repo/issue/milestone_issues.tmpl
  5. 16
      templates/user/dashboard/issues.tmpl

5
public/css/index.css
Unescape View File

@ -782,8 +782,11 @@ footer .ui.left,footer .ui.right{line-height:40px}
.issue.list>.item .desc .checklist{padding-left:5px} .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{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 .checklist .progress-bar .progress{background-color:#ccc;display:block;height:100%}
.issue.list>.item .desc a.milestone{padding-left:5px;color:#999!important} .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.milestone:hover{color:#000!important}
.issue.list>.item .desc a.ref{margin-left:8px;color:#999!important}
.issue.list>.item .desc a.ref:hover{color:#000!important}
.issue.list>.item .desc a.ref span{margin-right:-4px}
.issue.list>.item .desc .assignee{margin-top:-5px;margin-right:5px} .issue.list>.item .desc .assignee{margin-top:-5px;margin-right:5px}
.issue.list>.item .desc .overdue{color:red} .issue.list>.item .desc .overdue{color:red}
.page.buttons{padding-top:15px} .page.buttons{padding-top:15px}

15
public/less/_repository.less
Unescape View File

@ -1985,12 +1985,25 @@
} }
a.milestone { a.milestone {
padding-left: 5px; margin-left: 5px;
color: #999999 !important;
&:hover {
color: #000000 !important;
}
}
a.ref {
margin-left: 8px;
color: #999999 !important; color: #999999 !important;
&:hover { &:hover {
color: #000000 !important; color: #000000 !important;
} }
span {
margin-right: -4px;
}
} }
.assignee { .assignee {

18
templates/repo/issue/list.tmpl
Unescape View File

@ -217,9 +217,6 @@
{{end}} {{end}}
{{end}} {{end}}
{{if .Ref}}
<a class="ui label" href="{{$.RepoLink}}/src/branch/{{.Ref}}">{{.Ref}}</a>
{{end}}
{{range .Labels}} {{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> <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}} {{end}}
@ -242,6 +239,16 @@
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
{{end}} {{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}} {{$tasks := .GetTasks}}
{{if gt $tasks 0}} {{if gt $tasks 0}}
{{$tasksDone := .GetTasksDone}} {{$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 class="octicon octicon-checklist"></span> {{$tasksDone}} / {{$tasks}} <span class="progress-bar"><span class="progress" style="width:calc(100% * {{$tasksDone}} / {{$tasks}});"></span></span>
</span> </span>
{{end}} {{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}} {{if ne .DeadlineUnix 0}}
<span class="octicon octicon-calendar"></span> <span class="octicon octicon-calendar"></span>
<span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> <span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span>

8
templates/repo/issue/milestone_issues.tmpl
Unescape View File

@ -187,9 +187,6 @@
<div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div> <div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div>
<a class="title has-emoji" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title}}</a> <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}} {{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> <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}} {{end}}
@ -208,6 +205,11 @@
{{else}} {{else}}
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}} {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
{{end}} {{end}}
{{if .Ref}}
<a class="ref" href="{{$.RepoLink}}/src/branch/{{.Ref}}">
<span class="octicon octicon-git-branch"></span> {{.Ref}}
</a>
{{end}}
{{$tasks := .GetTasks}} {{$tasks := .GetTasks}}
{{if gt $tasks 0}} {{if gt $tasks 0}}
{{$tasksDone := .GetTasksDone}} {{$tasksDone := .GetTasksDone}}

16
templates/user/dashboard/issues.tmpl
Unescape View File

@ -100,9 +100,19 @@
{{else}} {{else}}
{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}} {{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
{{end}} {{end}}
{{if .Assignee}} {{if .Milestone}}
<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.GetDisplayName}}" data-variation="inverted" data-position="left center"> <a class="milestone" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.Milestone.ID}}&assignee={{$.AssigneeID}}">
<img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> <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> </a>
{{end}} {{end}}
{{$tasks := .GetTasks}} {{$tasks := .GetTasks}}

Write Preview
Loading…
Cancel
Save