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

public/css/index.css

@@ -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 .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 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.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 .overdue{color:red}
 .page.buttons{padding-top:15px}

public/less/_repository.less

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

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>

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}}

templates/user/dashboard/issues.tmpl

@@ -100,9 +100,19 @@
 								{{else}}
 									{{$.i18n.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName|Escape) | Safe}}
 								{{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>
 								{{end}}
 								{{$tasks := .GetTasks}}