Fix label display on new issues

PR go-gitea#13570 broke label rendering for new issues and pulls because
missed the fact that the code was relying on the DOM elements being
toggled by JavaScript.

On top of that, the label rendering for new issues and pull was using
an outdated template which I consolidated in a new shared template.

Author: silverwind

routers/repo/compare.go

@@ -184,6 +184,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *
 	ctx.Data["BaseIsCommit"] = baseIsCommit
 	ctx.Data["BaseIsBranch"] = baseIsBranch
 	ctx.Data["BaseIsTag"] = baseIsTag
+	ctx.Data["IsPull"] = true
 
 	// Now we have the repository that represents the base
 

templates/repo/issue/labels/label.tmpl

@@ -0,0 +1,11 @@
+<div class="item">
+	<a
+		class="ui label {{if not .label.IsChecked}}hide{{end}}"
+		id="label_{{.label.ID}}"
+		href="{{.root.RepoLink}}/{{if or .root.IsPull .root.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.label.ID}}"
+		style="color: {{.label.ForegroundColor}}; background-color: {{.label.Color}}"
+		title="{{.label.Description | RenderEmojiPlain}}"
+	>
+			{{.label.Name | RenderEmoji}}
+	</a>
+</div>

templates/repo/issue/new_form.tmpl

@@ -73,14 +73,10 @@
 			<div class="ui labels list">
 				<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
 				{{range .Labels}}
-					{{if .IsChecked}}
-						<a class="item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
-					{{end}}
+					{{template "repo/issue/labels/label" dict "root" $ "label" .}}
 				{{end}}
 				{{range .OrgLabels}}
-					{{if .IsChecked}}
-						<a class="item" id="label_{{.ID}}" href="/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
-					{{end}}
+					{{template "repo/issue/labels/label" dict "root" $ "label" .}}
 				{{end}}
 			</div>
 

templates/repo/issue/view_content/sidebar.tmpl

@@ -126,22 +126,12 @@
 			</div>
 		</div>
 		<div class="ui labels list">
-			{{if not .HasSelectedLabel}}
-				<span class="no-select item">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
-			{{end}}
+			<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
 			{{range .Labels}}
-				{{if .IsChecked}}
-					<div class="item">
-						<a class="ui label" id="label_{{.ID}}" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
-					</div>
-				{{end}}
+				{{template "repo/issue/labels/label" dict "root" $ "label" .}}
 			{{end}}
 			{{range .OrgLabels}}
-				{{if .IsChecked}}
-					<div class="item">
-						<a class="ui label" id="label_{{.ID}}" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
-					</div>
-				{{end}}
+				{{template "repo/issue/labels/label" dict "root" $ "label" .}}
 			{{end}}
 		</div>
 

web_src/less/_repository.less

@@ -133,11 +133,6 @@
           max-width: 100px;
         }
       }
-
-      .label.color {
-        padding: 0 8px;
-        margin-right: 5px;
-      }
     }
 
     #deadlineForm input {