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 8f1362afc411376fe9871fa06716d098cbb29ffa..fed15d67d69f80a5019d31bfbdc82c2442c0a562 100644 (file)
--- 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 9b251ec4cbc1cfc956df22e647eb6e6385edad72..01e9e429a6c0dd3e8baae9012e1228d9b66318e8 100644 (file)
--- a/templates/admin/hook_new.tmpl
+++ b/templates/admin/hook_new.tmpl
@@ -15,23 +15,23 @@
                        {{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/base/footer.tmpl b/templates/base/footer.tmpl
index bc45315ef9d870fe9e432c211bac2963adac01f5..25e163b19b9d42b4a322f5738966ac200d2ea0bd 100644 (file)
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -12,17 +12,17 @@
 
        {{template "base/footer_content" .}}
 {{if .RequireSimpleMDE}}
-       <script src="{{StaticUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
-       <script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
-       <script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
+       <script src="{{AssetUrlPrefix}}/js/easymde.js?v={{MD5 AppVer}}"></script>
+       <script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
+       <script src="{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
        <script>
-               CodeMirror.modeURL = '{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js';
+               CodeMirror.modeURL = '{{AssetUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js';
        </script>
 {{end}}
 
 <!-- Third-party libraries -->
 {{if .RequireU2F}}
-       <script src="{{StaticUrlPrefix}}/vendor/plugins/u2f/index.js"></script>
+       <script src="{{AssetUrlPrefix}}/vendor/plugins/u2f/index.js"></script>
 {{end}}
 {{if .EnableCaptcha}}
        {{if eq .CaptchaType "recaptcha"}}
@@ -32,7 +32,7 @@
                <script src='https://hcaptcha.com/1/api.js' async></script>
        {{end}}
 {{end}}
-       <script src="{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
+       <script src="{{AssetUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
 {{template "custom/footer" .}}
 </body>
 </html>

diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
index f0d8a6f5a45021ed387fbac020f48e879da464df..e30fe70768632c1f0913728c955417078dc43471 100644 (file)
--- a/templates/base/footer_content.tmpl
+++ b/templates/base/footer_content.tmpl
@@ -16,7 +16,7 @@
                                        {{end}}
                                </div>
                        </div>
-                       <a href="{{StaticUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
+                       <a href="{{AssetUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
                        {{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
                        <a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.i18n.Tr "website"}}</a>
                        {{template "custom/extra_links_footer" .}}

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index d4de8f7905bc52f88fb3331695ed62ba74fff520..10fc2bad4a027d8a875877454c9584688c604dc7 100644 (file)
--- 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}}
                };
        </script>
-       <link rel="icon" href="{{StaticUrlPrefix}}/img/logo.svg" type="image/svg+xml">
-       <link rel="alternate icon" href="{{StaticUrlPrefix}}/img/favicon.png" type="image/png">
+       <link rel="icon" href="{{AssetUrlPrefix}}/img/logo.svg" type="image/svg+xml">
+       <link rel="alternate icon" href="{{AssetUrlPrefix}}/img/favicon.png" type="image/png">
 {{if .RequireSimpleMDE}}
-       <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
+       <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/easymde.css?v={{MD5 AppVer}}">
 {{end}}
-       <link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
+       <link rel="stylesheet" href="{{AssetUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
        <noscript>
                <style>
                        .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 7e476fa4a48f41878a77ce38e2ef907b7c896f3b..fcc5fb25e78b5f5d75ccb6178064003a253bbe51 100644 (file)
--- 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 61bc3946a16fc3999af8fae181e8ed22ad15e58c..2d07f659e7dfca3fde3958d4b2519fe2a5ea7dc1 100644 (file)
--- 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 249a3a7c4a2d422403d5262f350a8f49183fce67..f1f8b314d27171dd3ae7c9273c50e181d98aef16 100644 (file)
--- 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 c15d850e00b2dd9cb64603eef12e5e90e6232023..d070b8bc4bd016f956d148b998d5ce4c9e942406 100644 (file)
--- 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 4637e5a18581db7cb106a2d3a36b6b6208d58afe..4abfe171dddd9ba207d671afa2da61f1b98c2b25 100644 (file)
--- 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 4bb31dc1766cc8635d9790d32388dd1bec67fe99..e4a3ec81f713a92c057248c014506842520757c2 100644 (file)
--- 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 7594230545d2460a77c5a5b366dbcbcddeb7e92e..916272a97a7292013406968bf42a922de61d5d31 100644 (file)
--- 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 51038389f0502ef216290a4ab4a7101bfbdaa3d2..7c2e5b1a9061371089cab5b8da6c8ef4d818f1cd 100644 (file)
--- 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 b42283e23ee046f5abe3a34a059d2bcdca6ed3fd..e3a52a887083ac52474af7e66f37f580ba91dbde 100644 (file)
--- 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 6f572b43b3ad51203e37191bcebc1e237c6b2a57..728e5b272c1b7f2acfec6b857c95e8c7100db75f 100644 (file)
--- 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 3f1b205d3665c7ff98704a7e844425dc44fa4025..e2eeb407b8e4d85b11e06185289e96132b549378 100644 (file)
--- 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 4b4d7919797ee44eea1043ce0964dde8e696c070..d665a273c361fc3ad4fe510e75d07f0157b63ee7 100644 (file)
--- 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 0da61c4d56e6e0a1fba0fca8d3f13f6fbe336a5a..7a522b95fc63b6806749d0a565012aeeeb5d2050 100644 (file)
--- 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 400a33140b15af069dd7be5cfd1c922ee1b0df6c..57b2c399f6109346a885d18cde36bd418042e81e 100644 (file)
--- 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 6ffff9cb1916c2a62c6273179088d1466ceec3e9..5249b885166ffc03123f6be18d0061ecab863af3 100644 (file)
--- 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 38865aa6669e3b3d1853198c2ac47887a5eda424..bfc81b87658cfe925e295cbaad82b9121a1c723c 100644 (file)
--- 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(/\/[^/]*?\/[^/]*?$/, '/');