Alphabet ordering

consts/consts.go

@@ -46,24 +46,24 @@ type BreadCrumb struct {
 
 // Template data
 type TmplSystem struct {
-	PathIcoFav           string
-	PathSvgLogo          string
-	PathCssStyles        string
-	PathCssCpStyles      string
+	CpModule             string
+	CpSubModule          string
+	InfoVersion          string
 	PathCssBootstrap     string
 	PathCssCpCodeMirror  string
+	PathCssCpStyles      string
 	PathCssCpWysiwygPell string
-	PathJsJquery         string
-	PathJsPopper         string
+	PathCssStyles        string
 	PathJsBootstrap      string
 	PathJsCpCodeMirror   string
 	PathJsCpScripts      string
 	PathJsCpWysiwygPell  string
-	PathThemeStyles      string
+	PathJsJquery         string
+	PathJsPopper         string
+	PathSvgLogo          string
 	PathThemeScripts     string
-	InfoVersion          string
-	CpModule             string
-	CpSubModule          string
+	PathThemeStyles      string
+	PathIcoFav           string
 }
 
 type TmplError struct {
@@ -76,19 +76,19 @@ type TmplData struct {
 }
 
 type TmplDataCpBase struct {
-	Title              string
-	Caption            string
 	BodyClasses        string
-	UserId             int
-	UserFirstName      string
-	UserLastName       string
-	UserEmail          string
-	UserPassword       string
-	UserAvatarLink     string
+	Caption            string
+	Content            template.HTML
+	ModuleCurrentAlias string
 	NavBarModules      template.HTML
 	NavBarModulesSys   template.HTML
-	ModuleCurrentAlias string
 	SidebarLeft        template.HTML
-	Content            template.HTML
 	SidebarRight       template.HTML
+	UserAvatarLink     string
+	UserEmail          string
+	UserFirstName      string
+	UserId             int
+	UserLastName       string
+	UserPassword       string
+	Title              string
 }

utils/utils.go

@@ -110,24 +110,24 @@ func GetAssetsUrl(filename string) string {
 
 func GetTmplSystemData(cpmod, cpsubmod string) consts.TmplSystem {
 	return consts.TmplSystem{
-		PathIcoFav:           GetAssetsUrl(consts.AssetsSysFaveIco),
-		PathSvgLogo:          GetAssetsUrl(consts.AssetsSysLogoSvg),
-		PathCssStyles:        GetAssetsUrl(consts.AssetsSysStylesCss),
-		PathCssCpStyles:      GetAssetsUrl(consts.AssetsCpStylesCss),
+		CpModule:             cpmod,
+		CpSubModule:          cpsubmod,
+		InfoVersion:          consts.ServerVersion,
 		PathCssBootstrap:     GetAssetsUrl(consts.AssetsBootstrapCss),
 		PathCssCpCodeMirror:  GetAssetsUrl(consts.AssetsCpCodeMirrorCss),
+		PathCssCpStyles:      GetAssetsUrl(consts.AssetsCpStylesCss),
 		PathCssCpWysiwygPell: GetAssetsUrl(consts.AssetsCpWysiwygPellCss),
-		PathJsJquery:         GetAssetsUrl(consts.AssetsJqueryJs),
-		PathJsPopper:         GetAssetsUrl(consts.AssetsPopperJs),
+		PathCssStyles:        GetAssetsUrl(consts.AssetsSysStylesCss),
 		PathJsBootstrap:      GetAssetsUrl(consts.AssetsBootstrapJs),
 		PathJsCpCodeMirror:   GetAssetsUrl(consts.AssetsCpCodeMirrorJs),
 		PathJsCpScripts:      GetAssetsUrl(consts.AssetsCpScriptsJs),
 		PathJsCpWysiwygPell:  GetAssetsUrl(consts.AssetsCpWysiwygPellJs),
-		PathThemeStyles:      "/assets/theme/styles.css",
+		PathJsJquery:         GetAssetsUrl(consts.AssetsJqueryJs),
+		PathJsPopper:         GetAssetsUrl(consts.AssetsPopperJs),
+		PathSvgLogo:          GetAssetsUrl(consts.AssetsSysLogoSvg),
 		PathThemeScripts:     "/assets/theme/scripts.js",
-		InfoVersion:          consts.ServerVersion,
-		CpModule:             cpmod,
-		CpSubModule:          cpsubmod,
+		PathThemeStyles:      "/assets/theme/styles.css",
+		PathIcoFav:           GetAssetsUrl(consts.AssetsSysFaveIco),
 	}
 }
 

utils/utils_test.go

@@ -114,24 +114,24 @@ func TestGetAssetsUrl(t *testing.T) {
 
 func TestGetTmplSystemData(t *testing.T) {
 	Expect(t, GetTmplSystemData("module", "module"), consts.TmplSystem{
-		PathIcoFav:           "/assets/sys/fave.ico?v=" + consts.AssetsVersion,
-		PathSvgLogo:          "/assets/sys/logo.svg?v=" + consts.AssetsVersion,
-		PathCssStyles:        "/assets/sys/styles.css?v=" + consts.AssetsVersion,
-		PathCssCpStyles:      "/assets/cp/styles.css?v=" + consts.AssetsVersion,
+		CpModule:             "module",
+		CpSubModule:          "module",
+		InfoVersion:          consts.ServerVersion,
 		PathCssBootstrap:     "/assets/bootstrap.css?v=" + consts.AssetsVersion,
 		PathCssCpCodeMirror:  "/assets/cp/tmpl-editor/codemirror.css?v=" + consts.AssetsVersion,
+		PathCssCpStyles:      "/assets/cp/styles.css?v=" + consts.AssetsVersion,
 		PathCssCpWysiwygPell: "/assets/cp/wysiwyg/pell.css?v=" + consts.AssetsVersion,
-		PathJsJquery:         "/assets/jquery.js?v=" + consts.AssetsVersion,
-		PathJsPopper:         "/assets/popper.js?v=" + consts.AssetsVersion,
+		PathCssStyles:        "/assets/sys/styles.css?v=" + consts.AssetsVersion,
 		PathJsBootstrap:      "/assets/bootstrap.js?v=" + consts.AssetsVersion,
 		PathJsCpCodeMirror:   "/assets/cp/tmpl-editor/codemirror.js?v=" + consts.AssetsVersion,
 		PathJsCpScripts:      "/assets/cp/scripts.js?v=" + consts.AssetsVersion,
 		PathJsCpWysiwygPell:  "/assets/cp/wysiwyg/pell.js?v=" + consts.AssetsVersion,
-		PathThemeStyles:      "/assets/theme/styles.css",
+		PathJsJquery:         "/assets/jquery.js?v=" + consts.AssetsVersion,
+		PathJsPopper:         "/assets/popper.js?v=" + consts.AssetsVersion,
+		PathSvgLogo:          "/assets/sys/logo.svg?v=" + consts.AssetsVersion,
 		PathThemeScripts:     "/assets/theme/scripts.js",
-		InfoVersion:          consts.ServerVersion,
-		CpModule:             "module",
-		CpSubModule:          "module",
+		PathThemeStyles:      "/assets/theme/styles.css",
+		PathIcoFav:           "/assets/sys/fave.ico?v=" + consts.AssetsVersion,
 	})
 }