Browse Source

User error page 404 template vars

Vova Tkach 6 years ago
parent
commit
57714bde9e

+ 9 - 0
engine/fetdata/content.go

@@ -12,6 +12,9 @@ func (this *FERData) Name() string {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return this.DataRow.(*utils.MySql_page).A_name
 			return this.DataRow.(*utils.MySql_page).A_name
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return "404"
 	}
 	}
 	return ""
 	return ""
 }
 }
@@ -21,6 +24,9 @@ func (this *FERData) Alias() string {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return this.DataRow.(*utils.MySql_page).A_alias
 			return this.DataRow.(*utils.MySql_page).A_alias
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return "404"
 	}
 	}
 	return ""
 	return ""
 }
 }
@@ -30,6 +36,9 @@ func (this *FERData) Content() template.HTML {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return template.HTML(this.DataRow.(*utils.MySql_page).A_content)
 			return template.HTML(this.DataRow.(*utils.MySql_page).A_content)
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return template.HTML("The page what you looking for is not found")
 	}
 	}
 	return template.HTML("")
 	return template.HTML("")
 }
 }

+ 3 - 1
engine/fetdata/fetdata.go

@@ -8,14 +8,16 @@ import (
 type FERData struct {
 type FERData struct {
 	Wrap    *wrapper.Wrapper
 	Wrap    *wrapper.Wrapper
 	DataRow interface{}
 	DataRow interface{}
+	Is404   bool
 
 
 	bufferUser *utils.MySql_user
 	bufferUser *utils.MySql_user
 }
 }
 
 
-func New(wrap *wrapper.Wrapper, drow interface{}) *FERData {
+func New(wrap *wrapper.Wrapper, drow interface{}, is404 bool) *FERData {
 	fer := &FERData{
 	fer := &FERData{
 		Wrap:    wrap,
 		Wrap:    wrap,
 		DataRow: drow,
 		DataRow: drow,
+		Is404:   is404,
 	}
 	}
 	return fer.init()
 	return fer.init()
 }
 }

+ 9 - 0
engine/fetdata/meta_data.go

@@ -9,6 +9,9 @@ func (this *FERData) MetaTitle() string {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return this.DataRow.(*utils.MySql_page).A_meta_title
 			return this.DataRow.(*utils.MySql_page).A_meta_title
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return "Page not found"
 	}
 	}
 	return ""
 	return ""
 }
 }
@@ -18,6 +21,9 @@ func (this *FERData) MetaKeywords() string {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return this.DataRow.(*utils.MySql_page).A_meta_keywords
 			return this.DataRow.(*utils.MySql_page).A_meta_keywords
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return ""
 	}
 	}
 	return ""
 	return ""
 }
 }
@@ -27,6 +33,9 @@ func (this *FERData) MetaDescription() string {
 		if this.Wrap.CurrModule == "index" {
 		if this.Wrap.CurrModule == "index" {
 			return this.DataRow.(*utils.MySql_page).A_meta_description
 			return this.DataRow.(*utils.MySql_page).A_meta_description
 		}
 		}
+	} else if this.Is404 {
+		// Return it from settings
+		return ""
 	}
 	}
 	return ""
 	return ""
 }
 }

+ 1 - 30
hosts/localhost/template/header.html

@@ -34,33 +34,4 @@
 				</div>
 				</div>
 			</nav>
 			</nav>
 		</header>
 		</header>
-		<main role="main" class="pt-2">
-			<div class="container some-text pt-3">
-				<h2>MetaData</h2>
-				<div><b>MetaTitle:</b> {{$.Data.MetaTitle}}</div>
-				<div><b>MetaKeywords:</b> {{$.Data.MetaKeywords}}</div>
-				<div><b>MetaDescription:</b> {{$.Data.MetaDescription}}</div>
-			</div>
-			<div class="container some-text pt-3">
-				<h2>Http</h2>
-				<div><b>RequestURI:</b> {{$.Data.RequestURI}}</div>
-				<div><b>RequestURL:</b> {{$.Data.RequestURL}}</div>
-				<div><b>RequestGET:</b> {{$.Data.RequestGET}}</div>
-			</div>
-			<div class="container some-text pt-3">
-				<div><b>DateTime:</b> {{$.Data.DateTime}}</div>
-				<div><b>DateTimeFormat:</b> {{$.Data.DateTimeFormat "2006-01-02 15:04:05"}}</div>
-			</div>
-			<div class="container some-text pt-3">
-				<h2>User</h2>
-				<div><b>UserIsLoggedIn:</b> {{$.Data.UserIsLoggedIn}}</div>
-				<div><b>UserID:</b> {{$.Data.UserID}}</div>
-				<div><b>UserFirstName:</b> {{$.Data.UserFirstName}}</div>
-				<div><b>UserLastName:</b> {{$.Data.UserLastName}}</div>
-				<div><b>UserEmail:</b> {{$.Data.UserEmail}}</div>
-				<div><b>UserIsAdmin:</b> {{$.Data.UserIsAdmin}}</div>
-				<div><b>UserIsActive:</b> {{$.Data.UserIsActive}}</div>
-				{{if $.Data.UserIsLoggedIn}}
-					<div><b>Welcome, {{$.Data.UserFirstName}} {{$.Data.UserLastName}}!</b></div>
-				{{end}}
-			</div>
+		<main role="main" class="pt-2">

+ 2 - 2
modules/module_index.go

@@ -71,7 +71,7 @@ func (this *Modules) RegisterModule_Index() *Module {
 		} else if err == sql.ErrNoRows {
 		} else if err == sql.ErrNoRows {
 			// User error 404 page
 			// User error 404 page
 			wrap.W.WriteHeader(http.StatusNotFound)
 			wrap.W.WriteHeader(http.StatusNotFound)
-			wrap.RenderFrontEnd("404", fetdata.New(wrap, nil))
+			wrap.RenderFrontEnd("404", fetdata.New(wrap, nil, true))
 			return
 			return
 		}
 		}
 
 
@@ -87,7 +87,7 @@ func (this *Modules) RegisterModule_Index() *Module {
 		}
 		}
 
 
 		// Render template
 		// Render template
-		wrap.RenderFrontEnd(tmpl_name, fetdata.New(wrap, row))
+		wrap.RenderFrontEnd(tmpl_name, fetdata.New(wrap, row, false))
 	}, func(wrap *wrapper.Wrapper) (string, string, string) {
 	}, func(wrap *wrapper.Wrapper) (string, string, string) {
 		content := ""
 		content := ""
 		sidebar := ""
 		sidebar := ""