From d15ae200f36856865b31b8305cb3c250a2ad0dd2 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Wed, 13 Feb 2019 15:39:34 -0600 Subject: [PATCH] Add emoji to labels Minor cleanup of tribute code in footer.tmpl Signed-off-by: jolheiser --- options/locale/locale_en-US.ini | 4 ++-- routers/repo/issue_label.go | 1 + templates/base/footer.tmpl | 18 ++++++++++++++---- templates/repo/issue/labels.tmpl | 6 +++--- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 4 ++-- templates/repo/issue/view_content/sidebar.tmpl | 4 ++-- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ebbf73b05d..1e708b1762 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -690,8 +690,8 @@ issues.label_templates.info = No labels exist yet. Create a label with 'New Labe issues.label_templates.helper = Select a label set issues.label_templates.use = Use Label Set issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v -issues.add_label_at = added the
%s
label %s -issues.remove_label_at = removed the
%s
label %s +issues.add_label_at = added the
%s
label %s +issues.remove_label_at = removed the
%s
label %s issues.add_milestone_at = `added this to the %s milestone %s` issues.change_milestone_at = `modified the milestone from %s to %s %s` issues.remove_milestone_at = `removed this from the %s milestone %s` diff --git a/routers/repo/issue_label.go b/routers/repo/issue_label.go index 8631ef0d0b..556a24c33e 100644 --- a/routers/repo/issue_label.go +++ b/routers/repo/issue_label.go @@ -22,6 +22,7 @@ func Labels(ctx *context.Context) { ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsLabels"] = true ctx.Data["RequireMinicolors"] = true + ctx.Data["RequireTribute"] = true ctx.Data["LabelTemplates"] = models.LabelTemplates ctx.HTML(200, tplLabels) } diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 6868b918b6..2481b2187c 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -68,8 +68,11 @@ } return itemStr; } - }) - issuesTribute.attach(document.getElementById('content')) + }); + var content = document.getElementById('content'); + if (content != null) { + issuesTribute.attach(content); + } {{end}} diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 877ba1c176..956fc955a0 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -17,7 +17,7 @@
- +
@@ -98,7 +98,7 @@
  • -
    {{.Name}}
    +
    {{.Name}}
    {{.Description}} @@ -151,7 +151,7 @@
    - +
    diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index edf88ebf41..ebdd3dbb67 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -192,7 +192,7 @@ {{.Ref}} {{end}} {{range .Labels}} - {{.Name}} + {{.Name}} {{end}} {{if .NumComments}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index f05ea333ba..7dafc6766c 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -46,14 +46,14 @@
    {{.i18n.Tr "repo.issues.new.no_label"}} {{range .Labels}} - {{.Name}} + {{.Name}} {{end}}
    diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 4eb55cdd41..8cb01fe00e 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -10,7 +10,7 @@ @@ -19,7 +19,7 @@ {{.i18n.Tr "repo.issues.new.no_label"}} {{range .Labels}} {{end}}