+
+ {{template "base/alert" .ctxData}} +
{{template "admin/navbar" .ctxData}}
- {{template "base/alert" .ctxData}} {{/* block: admin-setting-content */}} {{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 967b31e7a8f5..445df520a9f3 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -15,8 +15,11 @@
{{if $.RenderedDescription}}
{{$.RenderedDescription|Str2html}}
{{end}}
- {{if .Org.Location}}
{{svg "octicon-location"}} {{.Org.Location}}
{{end}} - {{if .Org.Website}}
{{svg "octicon-link"}} {{.Org.Website}}
{{end}} + {{if .Org.Location}}
{{svg "octicon-location"}} {{.Org.Location}}
{{end}} + {{if .Org.Website}}
{{svg "octicon-link"}} {{.Org.Website}}
{{end}} + {{if $.IsSigned}} + {{if .Org.Email}}
{{svg "octicon-mail"}} {{.Org.Email}}
{{end}} + {{end}}
+
+ + +
diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index f5fc27315ad0..8652a720522d 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -31,27 +31,27 @@ {{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}} - + {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} {{if or (not $.HidePRRefs) (SliceUtils.Contains $.SelectedBranches .Name)}} - - {{svg "octicon-git-pull-request" 16 "gt-mr-2"}}#{{.ShortName}} + + {{svg "octicon-git-pull-request"}} #{{.ShortName}} {{end}} {{else if eq $refGroup "tags"}} - - {{svg "octicon-tag" 16 "gt-mr-2"}}{{.ShortName}} + + {{svg "octicon-tag"}} {{.ShortName}} {{else if eq $refGroup "remotes"}} - - {{svg "octicon-cross-reference" 16 "gt-mr-2"}}{{.ShortName}} + + {{svg "octicon-cross-reference"}} {{.ShortName}} {{else if eq $refGroup "heads"}} - - {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}} + + {{svg "octicon-git-branch"}} {{.ShortName}} {{else}} diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 3666154b202d..214d77a12d43 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -13,7 +13,7 @@ {{- else if .IsBlockedByOutdatedBranch}}red {{- else if .IsBlockedByChangedProtectedFiles}}red {{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}red - {{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}yellow + {{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending)}}yellow {{- else if and .AllowMerge .RequireSigned (not .WillSign)}}red {{- else if .Issue.PullRequest.IsChecking}}yellow {{- else if .Issue.PullRequest.IsEmpty}}grey diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 6f7dc09a66c2..1b32aa675d6c 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -12,9 +12,9 @@ {{end}} {{template "base/alert" .}} -
+ {{.CsrfTokenHtml}} -
+
{{if .PageIsEditRelease}} {{.tag_name}}@{{.tag_target}} @@ -44,7 +44,7 @@ {{end}}
-
+
@@ -83,9 +83,9 @@
{{end}}
-
-
-
+
+
+
{{if not .PageIsEditRelease}}
@@ -103,30 +103,27 @@
{{.locale.Tr "repo.release.prerelease_helper"}} -
+
+
{{if .PageIsEditRelease}} - + {{.locale.Tr "repo.release.cancel"}} - + {{$.locale.Tr "repo.release.delete_release"}} {{if .IsDraft}} - - + {{else}} - {{end}} {{else}} - {{if not .tag_name}} - - {{end}} - - {{end}} diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 4d469a364e97..0d3a618e8d9e 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -12,11 +12,9 @@ {{range .LFSFiles}} - - - {{ShortSha .Oid}} - - + + {{ShortSha .Oid}} + {{FileSize .Size}} {{TimeSince .CreatedUnix.AsTime $.locale}} diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 5f0cf3164d9f..0fffdadc3f36 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -22,41 +22,31 @@ {{.locale.Tr "repo.settings.lfs_pointers.sha"}} {{.locale.Tr "repo.settings.lfs_pointers.oid"}} - {{.locale.Tr "repo.settings.lfs_pointers.inRepo"}} {{.locale.Tr "repo.settings.lfs_pointers.exists"}} {{.locale.Tr "repo.settings.lfs_pointers.accessible"}} + {{range .Pointers}} - - - {{ShortSha .SHA}} - - + + {{ShortSha .SHA}} + - - {{if and .Exists .InRepo}} - - {{ShortSha .Oid}} - - {{else}} - - {{end}} - - - - {{$.locale.Tr "repo.settings.lfs_findcommits"}} + + {{ShortSha .Oid}} + {{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .Accessible}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} + + {{$.locale.Tr "repo.settings.lfs_findcommits"}} + {{end}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 0765cb2c353d..cda192454402 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -6,8 +6,8 @@
{{.locale.Tr "repo.wiki.new_page"}} {{if .PageIsWikiEdit}} - @@ -37,6 +37,7 @@
+
{{if eq .Status 1}} -
-
+
+ -
-