Browse Source

Theme styles and JS file to template variables

Vova Tkach 6 years ago
parent
commit
7474b98c0f
4 changed files with 11 additions and 2 deletions
  1. 2 0
      consts/consts.go
  2. 5 2
      hosts/localhost/template/header.html
  3. 2 0
      utils/utils.go
  4. 2 0
      utils/utils_test.go

+ 2 - 0
consts/consts.go

@@ -48,6 +48,8 @@ type TmplSystem struct {
 	PathJsPopper     string
 	PathJsBootstrap  string
 	PathJsCpScripts  string
+	PathThemeStyles  string
+	PathThemeScripts string
 }
 
 type TmplError struct {

+ 5 - 2
hosts/localhost/template/header.html

@@ -14,8 +14,11 @@
 		<meta name="description" content="{{$.Data.MetaDescription}}" />
 		<link rel="shortcut icon" href="{{$.System.PathIcoFav}}" type="image/x-icon" />
 
-		<!-- Template CSS file from public folder -->
-		<link rel="stylesheet" href="/assets/theme/styles.css">
+		<!-- Template CSS file from template folder -->
+		<link rel="stylesheet" href="{{$.System.PathThemeStyles}}?v=1">
+
+		<!-- Template JavaScript file from template folder -->
+		<script src="{{$.System.PathThemeScripts}}?v=1"></script>
 	</head>
 	<body class="fixed-top-bar1">
 		<div id="wrap">

+ 2 - 0
utils/utils.go

@@ -102,6 +102,8 @@ func GetTmplSystemData() consts.TmplSystem {
 		PathJsPopper:     GetAssetsUrl(consts.AssetsPopperJs),
 		PathJsBootstrap:  GetAssetsUrl(consts.AssetsBootstrapJs),
 		PathJsCpScripts:  GetAssetsUrl(consts.AssetsCpScriptsJs),
+		PathThemeStyles:  "/assets/theme/styles.css",
+		PathThemeScripts: "/assets/theme/scripts.js",
 	}
 }
 

+ 2 - 0
utils/utils_test.go

@@ -96,6 +96,8 @@ func TestGetTmplSystemData(t *testing.T) {
 		PathJsPopper:     "/assets/popper.js?v=" + consts.AssetsVersion,
 		PathJsBootstrap:  "/assets/bootstrap.js?v=" + consts.AssetsVersion,
 		PathJsCpScripts:  "/assets/cp/scripts.js?v=" + consts.AssetsVersion,
+		PathThemeStyles:  "/assets/theme/styles.css",
+		PathThemeScripts: "/assets/theme/scripts.js",
 	})
 }