{{/* FIXME: here and below, the tw-overflow-visible is not quite right but it is still needed the moment: to show the important buttons when the width is narrow */}}
-
+
{{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}}
-
+
{{if not .LatestPullRequest}}
{{if .IsIncluded}}
@@ -150,7 +150,7 @@
{{end}}
{{/* FIXME: here and above, the tw-overflow-visible is not quite right */}}
-
+
{{if and $.IsWriter (not $.Repository.IsArchived) (not .DBBranch.IsDeleted)}}
{{if .Committer}}
-
{{DateUtils.TimeSince .Committer.When}}
+
{{DateUtils.TimeSince .Committer.When}}
{{else}}
-
{{DateUtils.TimeSince .Author.When}}
+
{{DateUtils.TimeSince .Author.When}}
{{end}}
-
+
{{svg "octicon-copy"}}
{{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}}
{{if not $.PageIsWiki}}
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 0770e287fb..19f2efecb7 100644
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -235,7 +235,7 @@
{{template "repo/upload" .}}
{{end}}
-
{{/* parent is flex, so use block here to keep sentence spaces */}}
+ {{ctx.Locale.Tr "repo.org_labels_desc"}}
+ {{if .IsOrganizationOwner}}
+ ({{ctx.Locale.Tr "repo.org_labels_desc_manage"}}):
+ {{end}}