From 90b9f7e08ca2e027cc587199537aa653ddd94d91 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 6 Apr 2017 17:27:57 -0400 Subject: pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL} --- templates/repo/commits_table.tmpl | 4 ++-- templates/repo/create.tmpl | 2 +- templates/repo/editor/edit.tmpl | 4 ++-- templates/repo/forks.tmpl | 4 ++-- templates/repo/header.tmpl | 4 ++-- templates/repo/issue/comment_tab.tmpl | 6 +++--- templates/repo/issue/view_content.tmpl | 10 +++++----- templates/repo/migrate.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 4 ++-- templates/repo/release/list.tmpl | 4 ++-- templates/repo/release/new.tmpl | 4 ++-- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/webhook/list.tmpl | 6 +++--- templates/repo/settings/webhook/new.tmpl | 4 ++-- templates/repo/view_file.tmpl | 2 +- templates/repo/view_list.tmpl | 4 ++-- templates/repo/wiki/new.tmpl | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) (limited to 'templates/repo') diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index e68dd76f..717af85d 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -34,7 +34,7 @@ {{if .User}} -   {{.Author.Name}} +   {{.Author.Name}} {{else}}   {{.Author.Name}} {{end}} @@ -45,7 +45,7 @@ {{if not (and $.Username $.Reponame)}} {{ShortSHA1 .ID.String}} {{else}} - {{ShortSHA1 .ID.String}} + {{ShortSHA1 .ID.String}} {{end}} {{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 4bf9081d..06daa360 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -106,7 +106,7 @@ - {{.i18n.Tr "cancel"}} + {{.i18n.Tr "cancel"}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 67a679d9..a9ce124b 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -30,13 +30,13 @@
{{if .IsNewFile}}{{.i18n.Tr "repo.editor.new_file"}}{{else}}{{.i18n.Tr "repo.editor.edit_file"}}{{end}} {{if not .IsNewFile}} - {{.i18n.Tr "repo.release.preview"}} + {{.i18n.Tr "repo.release.preview"}} {{.i18n.Tr "repo.editor.preview_changes"}} {{end}}
@@ -13,5 +13,5 @@
{{if .IsAttachmentEnabled}}
-
+
{{end}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 3c14e219..2bb40409 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -41,9 +41,9 @@
{{range .Issue.Attachments}} - + {{if FilenameIsImage .Name}} - + {{else}} {{end}} @@ -102,9 +102,9 @@
{{range .Attachments}} - + {{if FilenameIsImage .Name}} - + {{else}} {{end}} @@ -361,7 +361,7 @@
{{$.i18n.Tr "repo.release.write"}} - {{$.i18n.Tr "repo.release.preview"}} + {{$.i18n.Tr "repo.release.preview"}}
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 1aeb2280..608f0ca3 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -97,7 +97,7 @@ - {{.i18n.Tr "cancel"}} + {{.i18n.Tr "cancel"}}
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index a6192996..eda3d027 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -37,7 +37,7 @@
- {{.ForkFrom}} + {{.ForkFrom}}
@@ -61,7 +61,7 @@ - {{.i18n.Tr "cancel"}} + {{.i18n.Tr "cancel"}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index c4414534..3ee84a71 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -40,7 +40,7 @@

- {{.Publisher.DisplayName}} + {{.Publisher.DisplayName}} {{if .Created}}{{TimeSince .Created $.Lang}}{{end}} {{$.i18n.Tr "repo.release.ahead" .NumCommitsBehind .Target | Str2html}} @@ -53,7 +53,7 @@

    {{range .Attachments}}
  • - {{.Name}} + {{.Name}}
    • {{end}} {{if not .IsDraft}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index a32313f9..a6bc7870 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -55,7 +55,7 @@ {{range .attachments}} - {{.Name}} + {{.Name}} @@ -67,7 +67,7 @@
{{if .IsAttachmentEnabled}}
-
+
{{end}}
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 319adcee..79934fc5 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -13,7 +13,7 @@ {{range .Collaborators}}
- + {{.DisplayName}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 765082d0..c596b755 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -45,7 +45,7 @@ {{end}}

-

{{.i18n.Tr "repo.settings.deploy_keys_helper" AppSubUrl "/user/settings/ssh" | Safe}}

+

{{.i18n.Tr "repo.settings.deploy_keys_helper" AppSubURL "/user/settings/ssh" | Safe}}

{{.i18n.Tr "repo.settings.add_deploy_key"}} diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index 3599172d..b558f869 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -10,15 +10,15 @@ {{range .Types}} {{if eq . "gogs"}} - Gogs + Gogs {{else if eq . "slack"}} - Slack + Slack {{else if eq . "discord"}} - Discord + Discord {{end}} {{end}} diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index f7e23631..12944ae9 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -10,9 +10,9 @@ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
{{if eq .HookType "gogs"}} - + {{else}} - + {{end}}

diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 4096741a..92bd7139 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -67,7 +67,7 @@ {{.i18n.Tr "repo.video_not_supported_in_browser"}} {{else if .IsPDFFile}} - + {{else}} {{.i18n.Tr "repo.file_view_raw"}} {{end}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 1b7ae9e0..6e246df5 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -4,7 +4,7 @@ {{if .LatestCommitUser}} - {{.LatestCommit.Author.Name}} + {{.LatestCommit.Author.Name}} {{else}} {{.LatestCommit.Author.Name}} @@ -30,7 +30,7 @@ {{if $entry.IsSubModule}} - {{$refURL := $commit.RefURL AppUrl $.BranchLink}} + {{$refURL := $commit.RefURL AppURL $.BranchLink}} {{if $refURL}} {{$entry.Name}} @ {{ShortSHA1 $commit.RefID}} {{else}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 39b0e5f6..74069758 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -18,7 +18,7 @@
- +
-- cgit v1.2.3