From: silverwind Date: Sat, 8 May 2021 14:27:25 +0000 (+0200) Subject: Rename StaticUrlPrefix to AssetUrlPrefix (#15779) X-Git-Tag: v1.15.0-rc1~344 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=24ad131221d8cb0becf726e0570f53838262edf1;p=gitea.git Rename StaticUrlPrefix to AssetUrlPrefix (#15779) Use a new name for this template/frontend variable to make it distinct from the server variable StaticURLPrefix. --- diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 8f1362afc4..fed15d67d6 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -60,7 +60,7 @@ func NewFuncMap() []template.FuncMap { "AppSubUrl": func() string { return setting.AppSubURL }, - "StaticUrlPrefix": func() string { + "AssetUrlPrefix": func() string { return setting.StaticURLPrefix + "/assets" }, "AppUrl": func() string { diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index 9b251ec4cb..01e9e429a6 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -15,23 +15,23 @@ {{end}}

{{if eq .HookType "gitea"}} -

{{else if eq .HookType "gogs"}} -

{{else if eq .HookType "slack"}} -

{{else if eq .HookType "discord"}} -

{{else if eq .HookType "dingtalk"}} -

{{else if eq .HookType "telegram"}} -

{{else if eq .HookType "msteams"}} -

{{else if eq .HookType "feishu"}} -

{{else if eq .HookType "matrix"}} -

diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index bc45315ef9..25e163b19b 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -12,17 +12,17 @@ {{template "base/footer_content" .}} {{if .RequireSimpleMDE}} - - - + + + {{end}} {{if .RequireU2F}} - + {{end}} {{if .EnableCaptcha}} {{if eq .CaptchaType "recaptcha"}} @@ -32,7 +32,7 @@ {{end}} {{end}} - + {{template "custom/footer" .}} diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl index f0d8a6f5a4..e30fe70768 100644 --- a/templates/base/footer_content.tmpl +++ b/templates/base/footer_content.tmpl @@ -16,7 +16,7 @@ {{end}} - {{.i18n.Tr "licenses"}} + {{.i18n.Tr "licenses"}} {{if .EnableSwagger}}API{{end}} {{.i18n.Tr "website"}} {{template "custom/extra_links_footer" .}} diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index d4de8f7905..10fc2bad4a 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -29,7 +29,7 @@ window.config = { AppVer: '{{AppVer}}', AppSubUrl: '{{AppSubUrl}}', - StaticUrlPrefix: '{{StaticUrlPrefix}}', + AssetUrlPrefix: '{{AssetUrlPrefix}}', UseServiceWorker: {{UseServiceWorker}}, csrf: '{{.CsrfToken}}', HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}}, @@ -61,12 +61,12 @@ {{end}} }; - - + + {{if .RequireSimpleMDE}} - + {{end}} - +

.dropdown:hover > .menu { display: block; } @@ -105,17 +105,17 @@ {{else}} <meta property="og:title" content="{{AppName}}"> <meta property="og:type" content="website" /> - <meta property="og:image" content="{{StaticUrlPrefix}}/img/logo.png" /> + <meta property="og:image" content="{{AssetUrlPrefix}}/img/logo.png" /> <meta property="og:url" content="{{AppUrl}}" /> <meta property="og:description" content="{{MetaDescription}}"> {{end}} <meta property="og:site_name" content="{{AppName}}" /> {{if .IsSigned }} {{ if ne .SignedUser.Theme "gitea" }} - <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}"> + <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}"> {{end}} {{else if ne DefaultTheme "gitea"}} - <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}"> + <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}"> {{end}} {{template "custom/header" .}} </head> diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 7e476fa4a4..fcc5fb25e7 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -1,7 +1,7 @@ <div class="ui container" id="navbar"> <div class="item brand" style="justify-content: space-between;"> <a href="{{AppSubUrl}}/"> - <img class="ui mini image" with="30" height="30" src="{{StaticUrlPrefix}}/img/logo.svg"> + <img class="ui mini image" with="30" height="30" src="{{AssetUrlPrefix}}/img/logo.svg"> </a> <div class="ui basic icon button mobile-only" id="navbar-expand-toggle"> <i class="sidebar icon"></i> diff --git a/templates/home.tmpl b/templates/home.tmpl index 61bc3946a1..2d07f659e7 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -3,7 +3,7 @@ <div class="ui stackable middle very relaxed page grid"> <div class="sixteen wide center aligned centered column"> <div> - <img class="logo" width="220" height="220" src="{{StaticUrlPrefix}}/img/logo.svg"/> + <img class="logo" width="220" height="220" src="{{AssetUrlPrefix}}/img/logo.svg"/> </div> <div class="hero"> <h1 class="ui icon header title"> diff --git a/templates/install.tmpl b/templates/install.tmpl index 249a3a7c4a..f1f8b314d2 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -321,5 +321,5 @@ </div> </div> </div> -<img style="display: none" src="{{StaticUrlPrefix}}/img/loading.png"/> +<img style="display: none" src="{{AssetUrlPrefix}}/img/loading.png"/> {{template "base/footer" .}} diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index c15d850e00..d070b8bc4b 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -10,23 +10,23 @@ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} <div class="ui right"> {{if eq .HookType "gitea"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg"> {{else if eq .HookType "gogs"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico"> {{else if eq .HookType "slack"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png"> {{else if eq .HookType "discord"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png"> {{else if eq .HookType "dingtalk"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.ico"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico"> {{else if eq .HookType "telegram"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png"> {{else if eq .HookType "msteams"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png"> {{else if eq .HookType "feishu"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png"> {{else if eq .HookType "matrix"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg"> {{end}} </div> </h4> diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index 4637e5a185..4abfe171dd 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -7,7 +7,7 @@ <div class="ui stackable middle very relaxed page grid"> <div id="repo_migrating" class="sixteen wide center aligned centered column"> <div> - <img src="{{StaticUrlPrefix}}/img/loading.png"/> + <img src="{{AssetUrlPrefix}}/img/loading.png"/> </div> </div> </div> diff --git a/templates/repo/migrate/migrating.tmpl b/templates/repo/migrate/migrating.tmpl index 4bb31dc176..e4a3ec81f7 100644 --- a/templates/repo/migrate/migrating.tmpl +++ b/templates/repo/migrate/migrating.tmpl @@ -9,12 +9,12 @@ <div class="ui stackable middle very relaxed page grid"> <div id="repo_migrating" class="sixteen wide center aligned centered column" task="{{.MigrateTask.ID}}"> <div> - <img src="{{StaticUrlPrefix}}/img/loading.png"/> + <img src="{{AssetUrlPrefix}}/img/loading.png"/> </div> </div> <div id="repo_migrating_failed_image" class="sixteen wide center aligned centered column" style="display: none;"> <div> - <img src="{{StaticUrlPrefix}}/img/failed.png"/> + <img src="{{AssetUrlPrefix}}/img/failed.png"/> </div> </div> </div> diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 7594230545..916272a97a 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -5,31 +5,31 @@ <div class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_webhook"}}</div> <div class="menu"> <a class="item" href="{{.BaseLinkNew}}/gitea/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/gitea.svg">Gitea + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/gitea.svg">Gitea </a> <a class="item" href="{{.BaseLinkNew}}/gogs/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/gogs.ico">Gogs + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/gogs.ico">Gogs </a> <a class="item" href="{{.BaseLinkNew}}/slack/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/slack.png">Slack + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/slack.png">Slack </a> <a class="item" href="{{.BaseLinkNew}}/discord/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/discord.png">Discord + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/discord.png">Discord </a> <a class="item" href="{{.BaseLinkNew}}/dingtalk/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/dingtalk.ico">Dingtalk + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/dingtalk.ico">Dingtalk </a> <a class="item" href="{{.BaseLinkNew}}/telegram/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/telegram.png">Telegram + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/telegram.png">Telegram </a> <a class="item" href="{{.BaseLinkNew}}/msteams/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/msteams.png">Microsoft Teams + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/msteams.png">Microsoft Teams </a> <a class="item" href="{{.BaseLinkNew}}/feishu/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/feishu.png">Feishu + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/feishu.png">Feishu </a> <a class="item" href="{{.BaseLinkNew}}/matrix/new"> - <img width="20" height="20" src="{{StaticUrlPrefix}}/img/matrix.svg">Matrix + <img width="20" height="20" src="{{AssetUrlPrefix}}/img/matrix.svg">Matrix </a> </div> </div> diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 51038389f0..7c2e5b1a90 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -8,23 +8,23 @@ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} <div class="ui right"> {{if eq .HookType "gitea"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/gitea.svg"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gitea.svg"> {{else if eq .HookType "gogs"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/gogs.ico"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/gogs.ico"> {{else if eq .HookType "slack"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/slack.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/slack.png"> {{else if eq .HookType "discord"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/discord.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/discord.png"> {{else if eq .HookType "dingtalk"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/dingtalk.ico"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/dingtalk.ico"> {{else if eq .HookType "telegram"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/telegram.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/telegram.png"> {{else if eq .HookType "msteams"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/msteams.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png"> {{else if eq .HookType "feishu"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/feishu.png"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/feishu.png"> {{else if eq .HookType "matrix"}} - <img width="26" height="26" src="{{StaticUrlPrefix}}/img/matrix.svg"> + <img width="26" height="26" src="{{AssetUrlPrefix}}/img/matrix.svg"> {{end}} </div> </h4> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index b42283e23e..e3a52a8870 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -82,7 +82,7 @@ <strong>{{.i18n.Tr "repo.audio_not_supported_in_browser"}}</strong> </audio> {{else if .IsPDFFile}} - <iframe width="100%" height="600px" src="{{StaticUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{EscapePound $.RawFileLink}}"></iframe> + <iframe width="100%" height="600px" src="{{AssetUrlPrefix}}/vendor/plugins/pdfjs/web/viewer.html?file={{EscapePound $.RawFileLink}}"></iframe> {{else}} <a href="{{EscapePound $.RawFileLink}}" rel="nofollow" class="btn btn-gray btn-radius">{{.i18n.Tr "repo.file_view_raw"}}</a> {{end}} diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index 6f572b43b3..728e5b272c 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -2,7 +2,7 @@ <div class="page-content ui container center full-screen-width {{if .IsRepo}}repository{{end}}"> {{if .IsRepo}}{{template "repo/header" .}}{{end}} <div class="ui container center"> - <p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/404.png" alt="404"/></p> + <p style="margin-top: 100px"><img class="ui centered image" src="{{AssetUrlPrefix}}/img/404.png" alt="404"/></p> <div class="ui divider"></div> <br> <p>{{.i18n.Tr "error404" | Safe}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 3f1b205d36..e2eeb407b8 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} <div class="page-content ui container full-screen-width center"> - <p style="margin-top: 100px"><img class="ui centered image" src="{{StaticUrlPrefix}}/img/500.png" alt="500"/></p> + <p style="margin-top: 100px"><img class="ui centered image" src="{{AssetUrlPrefix}}/img/500.png" alt="500"/></p> <div class="ui divider"></div> <br> {{if .ErrorMsg}}<p>{{.i18n.Tr "error.occurred"}}:</p> diff --git a/templates/swagger/ui.tmpl b/templates/swagger/ui.tmpl index 4b4d791979..d665a273c3 100644 --- a/templates/swagger/ui.tmpl +++ b/templates/swagger/ui.tmpl @@ -3,11 +3,11 @@ <head> <meta charset="UTF-8"> <title>Gitea API</title> - <link href="{{StaticUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet"> + <link href="{{AssetUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}" rel="stylesheet"> </head> <body> <a class="swagger-back-link" href="{{AppUrl}}">{{svg "octicon-reply"}}{{.i18n.Tr "return_to_gitea"}}</a> <div id="swagger-ui" data-source="{{AppUrl}}swagger.{{.APIJSONVersion}}.json"></div> - <script src="{{StaticUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script> + <script src="{{AssetUrlPrefix}}/js/swagger.js?v={{MD5 AppVer}}"></script> </body> </html> diff --git a/web_src/js/features/emoji.js b/web_src/js/features/emoji.js index 0da61c4d56..7a522b95fc 100644 --- a/web_src/js/features/emoji.js +++ b/web_src/js/features/emoji.js @@ -1,6 +1,6 @@ import emojis from '../../../assets/emoji.json'; -const {StaticUrlPrefix} = window.config; +const {AssetUrlPrefix} = window.config; const tempMap = {gitea: ':gitea:'}; for (const {emoji, aliases} of emojis) { @@ -24,7 +24,7 @@ for (const key of emojiKeys) { export function emojiHTML(name) { let inner; if (name === 'gitea') { - inner = `<img alt=":${name}:" src="${StaticUrlPrefix}/img/emoji/gitea.png">`; + inner = `<img alt=":${name}:" src="${AssetUrlPrefix}/img/emoji/gitea.png">`; } else { inner = emojiString(name); } diff --git a/web_src/js/features/serviceworker.js b/web_src/js/features/serviceworker.js index 400a33140b..57b2c399f6 100644 --- a/web_src/js/features/serviceworker.js +++ b/web_src/js/features/serviceworker.js @@ -31,7 +31,7 @@ export default async function initServiceWorker() { if (UseServiceWorker) { try { - // normally we'd serve the service worker as a static asset from StaticUrlPrefix but + // normally we'd serve the service worker as a static asset from AssetUrlPrefix but // the spec strictly requires it to be same-origin so it has to be AppSubUrl to work await Promise.all([ checkCacheValidity(), diff --git a/web_src/js/index.js b/web_src/js/index.js index 6ffff9cb19..5249b88516 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -25,7 +25,7 @@ import {renderMarkupContent} from './markup/content.js'; import {stripTags, mqBinarySearch} from './utils.js'; import {svg, svgs} from './svg.js'; -const {AppSubUrl, StaticUrlPrefix, csrf} = window.config; +const {AppSubUrl, AssetUrlPrefix, csrf} = window.config; let previewFileModes; const commentMDEditors = {}; @@ -3138,7 +3138,7 @@ function initVueComponents() { finalPage: 1, searchQuery, isLoading: false, - staticPrefix: StaticUrlPrefix, + staticPrefix: AssetUrlPrefix, counts: {}, repoTypes: { all: { diff --git a/web_src/js/publicpath.js b/web_src/js/publicpath.js index 38865aa666..bfc81b8765 100644 --- a/web_src/js/publicpath.js +++ b/web_src/js/publicpath.js @@ -1,9 +1,9 @@ // This sets up the URL prefix used in webpack's chunk loading. // This file must be imported before any lazy-loading is being attempted. -const {StaticUrlPrefix} = window.config; +const {AssetUrlPrefix} = window.config; -if (StaticUrlPrefix) { - __webpack_public_path__ = StaticUrlPrefix.endsWith('/') ? StaticUrlPrefix : `${StaticUrlPrefix}/`; +if (AssetUrlPrefix) { + __webpack_public_path__ = AssetUrlPrefix.endsWith('/') ? AssetUrlPrefix : `${AssetUrlPrefix}/`; } else { const url = new URL(document.currentScript.src); __webpack_public_path__ = url.pathname.replace(/\/[^/]*?\/[^/]*?$/, '/');