Skip to content

Commit c559a9f

Browse files
lunnylunny
committed
static url
1 parent 2739a0b commit c559a9f

File tree

8 files changed

+61
-54
lines changed

8 files changed

+61
-54
lines changed

‎custom/conf/app.ini.sample

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
151151
PROTOCOL = http
152152
DOMAIN = localhost
153153
ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
154+
; when STATIC_URL_PREFIX is empty it will follow APP_URL
155+
STATIC_URL_PREFIX =
154156
; The address to listen on. Either a IPv4/IPv6 address or the path to a unix socket.
155157
HTTP_ADDR = 0.0.0.0
156158
HTTP_PORT = 3000

‎modules/setting/setting.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ var (
104104
LetsEncryptTOS bool
105105
LetsEncryptDirectory string
106106
LetsEncryptEmail string
107+
StaticURLPrefix string
107108

108109
SSH = struct {
109110
Disabled bool `ini:"DISABLE_SSH"`
@@ -582,7 +583,7 @@ func NewContext() {
582583
defaultAppURL += ":" + HTTPPort
583584
}
584585
AppURL = sec.Key("ROOT_URL").MustString(defaultAppURL)
585-
AppURL = strings.TrimRight(AppURL, "/") + "/"
586+
AppURL = strings.TrimSuffix(AppURL, "/") + "/"
586587

587588
// Check if has app suburl.
588589
appURL, err := url.Parse(AppURL)
@@ -592,6 +593,7 @@ func NewContext() {
592593
// Suburl should start with '/' and end without '/', such as '/{subpath}'.
593594
// This value is empty if site does not have sub-url.
594595
AppSubURL = strings.TrimSuffix(appURL.Path, "/")
596+
StaticURLPrefix = strings.TrimSuffix(sec.Key("STATIC_URL_PREFIX").MustString(AppSubURL), "/")
595597
AppSubURLDepth = strings.Count(AppSubURL, "/")
596598
// Check if Domain differs from AppURL domain than update it to AppURL's domain
597599
// TODO: Can be replaced with url.Hostname() when minimal GoLang version is 1.8

‎modules/templates/helper.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ func NewFuncMap() []template.FuncMap {
4848
"AppSubUrl": func() string {
4949
return setting.AppSubURL
5050
},
51+
"StaticUrlPrefix": func() string {
52+
return setting.StaticURLPrefix
53+
},
5154
"AppUrl": func() string {
5255
return setting.AppURL
5356
},
@@ -110,12 +113,12 @@ func NewFuncMap() []template.FuncMap {
110113
}
111114
return str[start:end]
112115
},
113-
"EllipsisString": base.EllipsisString,
114-
"DiffTypeToStr": DiffTypeToStr,
115-
"DiffLineTypeToStr": DiffLineTypeToStr,
116-
"Sha1": Sha1,
117-
"ShortSha": base.ShortSha,
118-
"MD5": base.EncodeMD5,
116+
"EllipsisString": base.EllipsisString,
117+
"DiffTypeToStr": DiffTypeToStr,
118+
"DiffLineTypeToStr": DiffLineTypeToStr,
119+
"Sha1": Sha1,
120+
"ShortSha": base.ShortSha,
121+
"MD5": base.EncodeMD5,
119122
"ActionContent2Commits": ActionContent2Commits,
120123
"PathEscape": url.PathEscape,
121124
"EscapePound": func(str string) string {

‎templates/base/footer.tmpl

+21-21
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@
1212

1313
{{template "base/footer_content" .}}
1414

15-
<script src="{{AppSubUrl}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1"></script>
16-
<script src="{{AppSubUrl}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1"></script>
17-
<script src="{{AppSubUrl}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js"></script>
15+
<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1"></script>
16+
<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1"></script>
17+
<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js"></script>
1818
{{if .RequireSimpleMDE}}
19-
<script src="{{AppSubUrl}}/vendor/plugins/simplemde/simplemde.min.js"></script>
20-
<script src="{{AppSubUrl}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
21-
<script src="{{AppSubUrl}}/vendor/plugins/codemirror/mode/meta.js"></script>
19+
<script src="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.js"></script>
20+
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/addon/mode/loadmode.js"></script>
21+
<script src="{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/meta.js"></script>
2222
<script>
23-
CodeMirror.modeURL = "{{AppSubUrl}}/vendor/plugins/codemirror/mode/%N/%N.js";
23+
CodeMirror.modeURL = "{{StaticUrlPrefix}}/vendor/plugins/codemirror/mode/%N/%N.js";
2424
</script>
2525
{{end}}
2626
{{if .RequireGitGraph}}
2727
<!-- graph -->
28-
<script src="{{AppSubUrl}}/vendor/plugins/gitgraph/gitgraph.js"></script>
28+
<script src="{{StaticUrlPrefix}}/vendor/plugins/gitgraph/gitgraph.js"></script>
2929
<script src="{{AppSubUrl}}/js/draw.js"></script>
3030
{{end}}
3131

3232
<!-- Third-party libraries -->
3333
{{if .RequireHighlightJS}}
34-
<script src="{{AppSubUrl}}/vendor/plugins/highlight/highlight.pack.js"></script>
34+
<script src="{{StaticUrlPrefix}}/vendor/plugins/highlight/highlight.pack.js"></script>
3535
{{end}}
3636
{{if .RequireMinicolors}}
37-
<script src="{{AppSubUrl}}/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js"></script>
37+
<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.min.js"></script>
3838
{{end}}
3939
{{if .RequireDatetimepicker}}
40-
<script src="{{AppSubUrl}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js"></script>
40+
<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.js"></script>
4141
{{end}}
4242
{{if .RequireDropzone}}
43-
<script src="{{AppSubUrl}}/vendor/plugins/dropzone/dropzone.js"></script>
43+
<script src="{{StaticUrlPrefix}}/vendor/plugins/dropzone/dropzone.js"></script>
4444
{{end}}
4545
{{if .RequireU2F}}
46-
<script src="{{AppSubUrl}}/vendor/plugins/u2f/index.js"></script>
46+
<script src="{{StaticUrlPrefix}}/vendor/plugins/u2f/index.js"></script>
4747
{{end}}
4848
{{if .EnableCaptcha}}
4949
{{if eq .CaptchaType "recaptcha"}}
5050
<script src='{{ URLJoin .RecaptchaURL "api.js"}}' async></script>
5151
{{end}}
5252
{{end}}
5353
{{if .RequireTribute}}
54-
<script src="{{AppSubUrl}}/vendor/plugins/tribute/tribute.min.js"></script>
54+
<script src="{{StaticUrlPrefix}}/vendor/plugins/tribute/tribute.min.js"></script>
5555
<script>
5656
var issuesTribute = new Tribute({
5757
values: [
@@ -101,7 +101,7 @@
101101
return ':' + item.original + ':';
102102
},
103103
menuItemTemplate: function (item) {
104-
return '<img class="emoji" src="{{AppSubUrl}}/vendor/plugins/emojify/images/' + item.original + '.png"/>' + item.original;
104+
return '<img class="emoji" src="{{StaticUrlPrefix}}/vendor/plugins/emojify/images/' + item.original + '.png"/>' + item.original;
105105
}
106106
}]
107107
});
@@ -115,16 +115,16 @@
115115
}
116116
</script>
117117
{{end}}
118-
<script src="{{AppSubUrl}}/vendor/plugins/emojify/emojify.min.js"></script>
119-
<script src="{{AppSubUrl}}/vendor/plugins/clipboard/clipboard.min.js"></script>
120-
<script src="{{AppSubUrl}}/vendor/plugins/vue/vue.min.js"></script>
118+
<script src="{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.min.js"></script>
119+
<script src="{{StaticUrlPrefix}}/vendor/plugins/clipboard/clipboard.min.js"></script>
120+
<script src="{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js"></script>
121121

122122
<!-- JavaScript -->
123-
<script src="{{AppSubUrl}}/vendor/plugins/semantic/semantic.min.js"></script>
123+
<script src="{{StaticUrlPrefix}}/vendor/plugins/semantic/semantic.min.js"></script>
124124
<script src="{{AppSubUrl}}/js/index.js?v={{MD5 AppVer}}"></script>
125125
{{if .EnableHeatmap}}
126-
<script src="{{AppSubUrl}}/vendor/plugins/moment/moment.min.js" charset="utf-8"></script>
127-
<script src="{{AppSubUrl}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.browser.js" charset="utf-8"></script>
126+
<script src="{{StaticUrlPrefix}}/vendor/plugins/moment/moment.min.js" charset="utf-8"></script>
127+
<script src="{{StaticUrlPrefix}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.browser.js" charset="utf-8"></script>
128128
<script type="text/javascript">
129129
initHeatmap('user-heatmap', '{{.HeatmapUser}}');
130130
</script>

‎templates/base/footer_content.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{{end}}
1717
</div>
1818
</div>
19-
<a href="{{AppSubUrl}}/vendor/librejs.html" data-jslicense="1">JavaScript licenses</a>
19+
<a href="{{StaticUrlPrefix}}/vendor/librejs.html" data-jslicense="1">JavaScript licenses</a>
2020
{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
2121
<a target="_blank" rel="noopener noreferrer" href="https://gitea.io">{{.i18n.Tr "website"}}</a>
2222
{{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}}

‎templates/base/head.tmpl

+23-23
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta http-equiv="x-ua-compatible" content="ie=edge">
77
<title>{{if .Title}}{{.Title}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
8-
<link rel="manifest" href="{{AppSubUrl}}/manifest.json" crossorigin="use-credentials">
8+
<link rel="manifest" href="{{StaticUrlPrefix}}/manifest.json" crossorigin="use-credentials">
99

1010
<script>
1111
if ('serviceWorker' in navigator) {
@@ -70,35 +70,35 @@
7070
THE SOFTWARE.
7171
---
7272
Licensing information for additional javascript libraries can be found at:
73-
{{AppSubUrl}}/vendor/librejs.html
73+
{{StaticUrlPrefix}}/vendor/librejs.html
7474

7575
@licend The above is the entire license notice
7676
for the JavaScript code in this page.
7777
*/`}}
7878
</script>
7979

80-
<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />
81-
<link rel="mask-icon" href="{{AppSubUrl}}/img/gitea-safari.svg" color="#609926">
82-
<link rel="preload" href="{{AppSubUrl}}/vendor/assets/font-awesome/css/font-awesome.min.css" as="style" onload="this.rel='stylesheet'">
83-
<noscript><link rel="stylesheet" href="{{AppSubUrl}}/vendor/assets/font-awesome/css/font-awesome.min.css"></noscript>
84-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/assets/octicons/octicons.min.css">
80+
<link rel="shortcut icon" href="{{StaticUrlPrefix}}/img/favicon.png" />
81+
<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/gitea-safari.svg" color="#609926">
82+
<link rel="preload" href="{{StaticUrlPrefix}}/vendor/assets/font-awesome/css/font-awesome.min.css" as="style" onload="this.rel='stylesheet'">
83+
<noscript><link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/assets/font-awesome/css/font-awesome.min.css"></noscript>
84+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/assets/octicons/octicons.min.css">
8585

8686
{{if .RequireSimpleMDE}}
87-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/simplemde/simplemde.min.css">
87+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css">
8888
{{end}}
8989

9090
{{if .RequireGitGraph}}
9191
<!-- graph -->
92-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/gitgraph/gitgraph.css">
92+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/gitgraph/gitgraph.css">
9393
{{end}}
9494

9595
{{if .RequireTribute}}
96-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/tribute/tribute.css">
96+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/tribute/tribute.css">
9797
{{end}}
9898

9999
<!-- Stylesheet -->
100-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/semantic/semantic.min.css">
101-
<link rel="stylesheet" href="{{AppSubUrl}}/css/index.css?v={{MD5 AppVer}}">
100+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/semantic/semantic.min.css">
101+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
102102
<noscript>
103103
<style>
104104
.dropdown:hover > .menu { display: block; }
@@ -107,25 +107,25 @@
107107
</noscript>
108108

109109
{{if .RequireHighlightJS}}
110-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/highlight/github.css">
110+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/highlight/github.css">
111111
{{end}}
112112
{{if .RequireMinicolors}}
113-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css">
113+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css">
114114
{{end}}
115115
{{if .RequireDatetimepicker}}
116-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css">
116+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css">
117117
{{end}}
118118
{{if .RequireDropzone}}
119-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/dropzone/dropzone.css">
119+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/dropzone/dropzone.css">
120120
{{end}}
121121
{{if .EnableHeatmap}}
122-
<link rel="stylesheet" href="{{AppSubUrl}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.css">
122+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.css">
123123
{{end}}
124124
<style class="list-search-style"></style>
125125

126-
<script src="{{AppSubUrl}}/vendor/plugins/promise-polyfill/polyfill.min.js"></script>
127-
<script src="{{AppSubUrl}}/vendor/plugins/cssrelpreload/loadCSS.min.js"></script>
128-
<script src="{{AppSubUrl}}/vendor/plugins/cssrelpreload/cssrelpreload.min.js"></script>
126+
<script src="{{StaticUrlPrefix}}/vendor/plugins/promise-polyfill/polyfill.min.js"></script>
127+
<script src="{{StaticUrlPrefix}}/vendor/plugins/cssrelpreload/loadCSS.min.js"></script>
128+
<script src="{{StaticUrlPrefix}}/vendor/plugins/cssrelpreload/cssrelpreload.min.js"></script>
129129
{{if .PageIsUserProfile}}
130130
<meta property="og:title" content="{{.Owner.Name}}" />
131131
<meta property="og:type" content="profile" />
@@ -144,16 +144,16 @@
144144
{{else}}
145145
<meta property="og:title" content="{{AppName}}">
146146
<meta property="og:type" content="website" />
147-
<meta property="og:image" content="{{AppUrl}}img/gitea-lg.png" />
147+
<meta property="og:image" content="{{StaticUrlPrefix}}img/gitea-lg.png" />
148148
<meta property="og:url" content="{{AppUrl}}" />
149149
<meta property="og:description" content="{{MetaDescription}}">
150150
{{end}}
151151
{{if .IsSigned }}
152152
{{ if ne .SignedUser.Theme "gitea" }}
153-
<link rel="stylesheet" href="{{AppSubUrl}}/css/theme-{{.SignedUser.Theme}}.css">
153+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css">
154154
{{end}}
155155
{{else if ne DefaultTheme "gitea"}}
156-
<link rel="stylesheet" href="{{AppSubUrl}}/css/theme-{{DefaultTheme}}.css">
156+
<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{DefaultTheme}}.css">
157157
{{end}}
158158
{{template "custom/header" .}}
159159
</head>

‎templates/base/head_navbar.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ui container" id="navbar">
22
<div class="item brand" style="justify-content: space-between;">
33
<a href="{{AppSubUrl}}/">
4-
<img class="ui mini image" src="{{AppSubUrl}}/img/gitea-sm.png">
4+
<img class="ui mini image" src="{{StaticUrlPrefix}}/img/gitea-sm.png">
55
</a>
66
<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
77
<i class="sidebar icon"></i>

‎templates/home.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="ui stackable middle very relaxed page grid">
44
<div class="sixteen wide center aligned centered column">
55
<div>
6-
<img class="logo" src="{{AppSubUrl}}/img/gitea-lg.png" />
6+
<img class="logo" src="{{StaticUrlPrefix}}/img/gitea-lg.png" />
77
</div>
88
<div class="hero">
99
<h1 class="ui icon header title">

0 commit comments

Comments
 (0)