From 3845815c122255cb4fec7bd4d823524cece20bf2 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 1 Dec 2020 11:59:04 +0100
Subject: [PATCH 1/3] chore: a take on head_navbar links

---
 custom/templates/base/head_navbar.tmpl | 46 +++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/custom/templates/base/head_navbar.tmpl b/custom/templates/base/head_navbar.tmpl
index a6643ef..ca2bd44 100644
--- a/custom/templates/base/head_navbar.tmpl
+++ b/custom/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" src="{{StaticUrlPrefix}}/img/git.dotya.ml.svg" alt="git.dotya.ml icon">
+		<a href="/">
+			<img class="ui mini image" src="/img/git.dotya.ml.svg" alt="git.dotya.ml icon">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -10,24 +10,24 @@
 	{{if and .IsSigned .MustChangePassword}}
 		{{/* No links */}}
 	{{else if .IsSigned}}
-		<a class="item {{if .PageIsDashboard}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
+		<a class="item {{if .PageIsDashboard}}active{{end}}" href="/">{{.i18n.Tr "dashboard"}}</a>
 		{{if not .UnitIssuesGlobalDisabled}}
-		<a class="item {{if .PageIsIssues}}active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
+		<a class="item {{if .PageIsIssues}}active{{end}}" href="/issues">{{.i18n.Tr "issues"}}</a>
 		{{end}}
 		{{if not .UnitPullsGlobalDisabled}}
-		<a class="item {{if .PageIsPulls}}active{{end}}" href="{{AppSubUrl}}/pulls">{{.i18n.Tr "pull_requests"}}</a>
+		<a class="item {{if .PageIsPulls}}active{{end}}" href="/pulls">{{.i18n.Tr "pull_requests"}}</a>
 		{{end}}
 		{{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}}
-		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="{{AppSubUrl}}/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
+		{{if .ShowMilestonesDashboardPage}}<a class="item {{if .PageIsMilestonesDashboard}}active{{end}}" href="/milestones">{{.i18n.Tr "milestones"}}</a>{{end}}
 		{{end}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="/explore/repos">{{.i18n.Tr "explore"}}</a>
 	{{else if .IsLandingPageHome}}
-		<a class="item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "explore"}}</a>
+		<a class="item {{if .PageIsHome}}active{{end}}" href="/">{{.i18n.Tr "home"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="/explore/repos">{{.i18n.Tr "explore"}}</a>
 	{{else if .IsLandingPageExplore}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/repos">{{.i18n.Tr "home"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="/explore/repos">{{.i18n.Tr "home"}}</a>
 	{{else if .IsLandingPageOrganizations}}
-		<a class="item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{.i18n.Tr "home"}}</a>
+		<a class="item {{if .PageIsExplore}}active{{end}}" href="/explore/organizations">{{.i18n.Tr "home"}}</a>
 	{{end}}
 	{{template "custom/extra_links" .}}
 	{{/*
@@ -52,7 +52,7 @@
 						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
 					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+					<a class="item link-action" href data-url="/user/logout" data-redirect="/">
 						{{svg "octicon-sign-out" 16}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
@@ -61,7 +61,7 @@
 		</div>
 	{{else if .IsSigned}}
 		<div class="right stackable menu">
-			<a href="{{AppSubUrl}}/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
+			<a href="/notifications" class="item poping up" data-content='{{.i18n.Tr "notifications"}}' data-variation="tiny inverted">
 				<span class="text">
 					<span class="fitted">{{svg "octicon-bell" 16}}</span>
 					<span class="sr-mobile-only">{{.i18n.Tr "notifications"}}</span>
@@ -79,14 +79,14 @@
 					<span class="fitted not-mobile">{{svg "octicon-triangle-down" 16}}</span>
 				</span>
 				<div class="menu">
-					<a class="item" href="{{AppSubUrl}}/repo/create">
+					<a class="item" href="/repo/create">
 						<span class="fitted">{{svg "octicon-plus" 16}}</span> {{.i18n.Tr "new_repo"}}
 					</a>
-					<a class="item" href="{{AppSubUrl}}/repo/migrate">
+					<a class="item" href="/repo/migrate">
 						<span class="fitted">{{svg "octicon-repo-push" 16}}</span> {{.i18n.Tr "new_migrate"}}
 					</a>
 					{{if .SignedUser.CanCreateOrganization}}
-					<a class="item" href="{{AppSubUrl}}/org/create">
+					<a class="item" href="/org/create">
 						<span class="fitted">{{svg "octicon-organization" 16}}</span> {{.i18n.Tr "new_org"}}
 					</a>
 					{{end}}
@@ -104,15 +104,15 @@
 						{{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
 					</div>
 					<div class="divider"></div>
-					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
+					<a class="item" href="/{{.SignedUser.Name}}">
 						{{svg "octicon-person" 16}}
 						{{.i18n.Tr "your_profile"}}<!-- Your profile -->
 					</a>
-					<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}?tab=stars">
+					<a class="item" href="/{{.SignedUser.Name}}?tab=stars">
 						{{svg "octicon-star" 16}}
 						{{.i18n.Tr "your_starred"}}
 					</a>
-					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
+					<a class="{{if .PageIsUserSettings}}active{{end}} item" href="/user/settings">
 						{{svg "octicon-tools" 16}}
 						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 					</a>
@@ -122,13 +122,13 @@
 					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>
-						<a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
+						<a class="{{if .PageIsAdmin}}active{{end}} item" href="/admin">
 							<i class="icon settings"></i>
 							{{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
 						</a>
 					{{end}}
 					<div class="divider"></div>
-					<a class="item link-action" href data-url="{{AppSubUrl}}/user/logout" data-redirect="{{AppSubUrl}}/">
+					<a class="item link-action" href data-url="/user/logout" data-redirect="/">
 						{{svg "octicon-sign-out" 16}}
 						{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 					</a>
@@ -139,11 +139,11 @@
 		<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.i18n.Tr "help"}}</a>
 		<div class="right stackable menu">
 			{{if .ShowRegistrationButton}}
-				<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
+				<a class="item{{if .PageIsSignUp}} active{{end}}" href="/user/sign_up">
 					{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
 				</a>
 			{{end}}
-			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.CurrentURL}}">
+			<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="/user/login?redirect_to={{.CurrentURL}}">
 				{{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}}
 			</a>
 		</div><!-- end anonymous right menu -->
-- 
2.47.1


From 4f71d49bf9cf504c00683dc3b445de579dbca835 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 1 Dec 2020 12:07:08 +0100
Subject: [PATCH 2/3] chore: a take on base/footer_content.tmpl

---
 custom/templates/base/footer_content.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/custom/templates/base/footer_content.tmpl b/custom/templates/base/footer_content.tmpl
index d474ce3..904df66 100644
--- a/custom/templates/base/footer_content.tmpl
+++ b/custom/templates/base/footer_content.tmpl
@@ -16,8 +16,8 @@
 					{{end}}
 				</div>
 			</div>
-			<a href="{{StaticUrlPrefix}}/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
-			{{if .EnableSwagger}}<a href="{{AppSubUrl}}/api/swagger">API</a>{{end}}
+			<a href="/js/licenses.txt">{{.i18n.Tr "licenses"}}</a>
+			{{if .EnableSwagger}}<a href="/api/swagger">API</a>{{end}}
 			{{template "custom/extra_links_footer" .}}
 			{{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}}
 		</div>
-- 
2.47.1


From 9252ab99d220099ee6f475be6537df009688be6c Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 1 Dec 2020 12:10:39 +0100
Subject: [PATCH 3/3] chore: a take on pwa/manifest_json.tmpl

* since it's not a true offline-capable PWA, this should not break
  anything (network requests are still sent out) but hey, who knows really
---
 custom/templates/pwa/manifest_json.tmpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/custom/templates/pwa/manifest_json.tmpl b/custom/templates/pwa/manifest_json.tmpl
index 3dcad02..e409a79 100644
--- a/custom/templates/pwa/manifest_json.tmpl
+++ b/custom/templates/pwa/manifest_json.tmpl
@@ -3,28 +3,28 @@
     "name": "git.dotya.ml",
     "icons": [
       {
-        "src": "{{StaticUrlPrefix}}/img/gitea-lg.png",
+        "src": "/img/gitea-lg.png",
         "type": "image/png",
         "sizes": "880x880"
       },
       {
-        "src": "{{StaticUrlPrefix}}/img/gitea-sm.png",
+        "src": "/img/gitea-sm.png",
         "type": "image/png",
         "sizes": "120x120"
       },
       {
-        "src": "{{StaticUrlPrefix}}/img/gitea-512.png",
+        "src": "/img/gitea-512.png",
         "type": "image/png",
         "sizes": "512x512"
       },
       {
-        "src": "{{StaticUrlPrefix}}/img/gitea-192.png",
+        "src": "/img/gitea-192.png",
         "type": "image/png",
         "sizes": "192x192"
       }
     ],
-    "start_url": "{{AppSubUrl}}/",
-    "scope": "{{AppSubUrl}}/",
+    "start_url": "/",
+    "scope": "/",
     "background_color": "#FAFAFA",
     "display": "standalone",
     "theme_color": "{{ThemeColorMetaTag}}"
-- 
2.47.1