3 files changed, 40 insertions, 32 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
new file mode 100644
index 0000000..65bf2f0
--- /dev/null
+++ b/templates/base/footer.tmpl
@@ -0,0 +1,36 @@
+{{/*
+<html>
+<body>
+	<div>
+*/}}
+
+	{{template "custom/body_inner_post" .}}
+
+	</div>
+
+	{{template "custom/body_outer_post" .}}
+
+	{{template "base/footer_content" .}}
+
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery/jquery.min.js?v=3.4.1"></script>
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery-migrate/jquery-migrate.min.js?v=3.0.1"></script>
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/jquery.areyousure/jquery.are-you-sure.js"></script>
+
+<!-- Third-party libraries -->
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/emojify/emojify.custom.js"></script>
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/clipboard/clipboard.min.js"></script>
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js"></script>
+
+	<!-- JavaScript -->
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/fomantic/semantic.min.js?v={{MD5 AppVer}}"></script>
+	<script src="{{StaticUrlPrefix}}/js/index.js?v={{MD5 AppVer}}"></script>
+{{if .EnableHeatmap}}
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/moment/moment.min.js" charset="utf-8"></script>
+	<script src="{{StaticUrlPrefix}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.browser.js" charset="utf-8"></script>
+	<script type="text/javascript">
+		window.initHeatmap('user-heatmap', '{{.HeatmapUser}}');
+	</script>
+{{end}}
+{{template "custom/footer" .}}
+</body>
+</html>
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index f466c0d..df4ce00 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -95,14 +95,6 @@
 	<noscript><link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/assets/font-awesome/css/font-awesome.min.css"></noscript>
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/assets/octicons/octicons.min.css">
 
-{{if .RequireSimpleMDE}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css">
-{{end}}
-
-{{if .RequireTribute}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/tribute/tribute.css">
-{{end}}
-
 	<!-- Stylesheet -->
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/fomantic/semantic.min.css?v={{MD5 AppVer}}">
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
@@ -113,26 +105,11 @@
 		</style>
 	</noscript>
 
-{{if .RequireHighlightJS}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/highlight/github.css">
-{{end}}
-{{if .RequireMinicolors}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css">
-{{end}}
-{{if .RequireDatetimepicker}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.datetimepicker/jquery.datetimepicker.css">
-{{end}}
-{{if .RequireDropzone}}
-	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/dropzone/dropzone.css">
-{{end}}
 {{if .EnableHeatmap}}
 	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/vue-calendar-heatmap/vue-calendar-heatmap.css">
 {{end}}
 	<style class="list-search-style"></style>
 
-	<script src="{{StaticUrlPrefix}}/vendor/plugins/promise-polyfill/polyfill.min.js"></script>
-	<script src="{{StaticUrlPrefix}}/vendor/plugins/cssrelpreload/loadCSS.min.js"></script>
-	<script src="{{StaticUrlPrefix}}/vendor/plugins/cssrelpreload/cssrelpreload.min.js"></script>
 {{if .PageIsUserProfile}}
 	<meta property="og:title" content="{{.Owner.Name}}" />
 	<meta property="og:type" content="profile" />
diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 60c2b84..c985963 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -1,8 +1,7 @@
 <div class="ui container" id="navbar">
 	<div class="item brand" style="justify-content: space-between;">
-		<a title="Head back to https://www.thedroneely.com" href="/">
-      <img style="display: inline;" class="ui mini image" src="{{AppSubUrl}}/img/favicon.png">
-      <span style="margin-left: 0.65em;">www.thedroneely.com</span>
+		<a href="{{AppSubUrl}}/">
+			<img class="ui mini image" src="{{StaticUrlPrefix}}/img/gitea-sm.png">
 		</a>
 		<div class="ui basic icon button mobile-only" id="navbar-expand-toggle">
 			<i class="sidebar icon"></i>
@@ -75,7 +74,7 @@
 				<span class="text">
 					<img class="ui tiny avatar image" src="{{.SignedUser.RelAvatarLink}}">
 					<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
-					<span class="mobile-only">{{.SignedUser.Name}}</span>
+					<span>{{.SignedUser.Name}}</span>
 					<i class="fitted octicon octicon-triangle-down not-mobile" tabindex="-1"></i>
 				</span>
 				<div class="menu user-menu" tabindex="-1">
@@ -96,10 +95,6 @@
 						<i class="octicon octicon-settings"></i>
 						{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 					</a>
-					<a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">
-						<i class="octicon octicon-question"></i>
-						{{.i18n.Tr "help"}}<!-- Help -->
-					</a>
 					{{if .IsAdmin}}
 						<div class="divider"></div>
 
@@ -120,7 +115,7 @@
 
 	{{else}}
 
-		<!-- <a class="item" target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io">{{.i18n.Tr "help"}}</a> -->
+		<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">