We use cookies to ensure you get the best experience on our website
Home Explore Help
Sign In
mirror
/
golang-fave
mirror of https://github.com/vladimirok5959/golang-fave.git
2
0
Fork 0
Files Wiki
Browse Source

Login form fixes

Vova Tkach 6 years ago
parent
b7ab201030
commit
7bab7b7c79
3 changed files with 11 additions and 7 deletions
Split View Show Diff Stats
  1. 1 1
      engine/wrapper/resources/templates/cp.login.go
  2. 6 6
      engine/wrapper/resources/templates/cp.login.html
  3. 4 0
      engine/wrapper/wrapper.go

+ 1 - 1
engine/wrapper/resources/templates/cp.login.go
View File 

@@ -1,3 +1,3 @@
 
 package templates
 
 
-var CpLogin = []byte(`<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="theme-color" content="#205081" /><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><title>Please login</title><link rel="stylesheet" href="/assets/sys/bootstrap.css"><link rel="stylesheet" href="/assets/cp/styles.css"><link rel="shortcut icon" href="/assets/sys/fave.ico" type="image/x-icon" /><style type="text/css">html{height:100%;}</style></head><body class="cp-login text-center"><form class="form-signin" action="/cp/" method="post"><h1 class="h3 mb-3 font-weight-normal">Please login</h1><label for="login" class="sr-only">Email address</label><input type="email" id="login" class="form-control" placeholder="Login" required autofocus><label for="password" class="sr-only">Password</label><input type="password" id="password" class="form-control" placeholder="Password" required><div class="checkbox mb-3"><label><input type="checkbox" value="remember-me"> Remember me</label></div><button class="btn btn-lg btn-primary btn-block" type="submit">Login</button></form><script src="/assets/sys/jquery.js"></script><script src="/assets/sys/popper.js"></script><script src="/assets/sys/bootstrap.js"></script></body></html>`)
 
+var CpLogin = []byte(`<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="theme-color" content="#205081" /><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><title>Please login</title><link rel="stylesheet" href="{{$.System.PathCssBootstrap}}"><link rel="stylesheet" href="{{$.System.PathCssCpStyles}}"><link rel="shortcut icon" href="{{$.System.PathIcoFav}}" type="image/x-icon" /><style type="text/css">html{height:100%;}</style></head><body class="cp-login text-center"><form class="form-signin" action="/cp/" method="post"><h1 class="h3 mb-3 font-weight-normal">Please login</h1><label for="login" class="sr-only">Email address</label><input type="email" id="login" class="form-control" placeholder="Login" required autofocus><label for="password" class="sr-only">Password</label><input type="password" id="password" class="form-control" placeholder="Password" required><div class="checkbox mb-3"><label><input type="checkbox" value="remember-me"> Remember me</label></div><button class="btn btn-lg btn-primary btn-block" type="submit">Login</button></form><script src="{{$.System.PathJsJquery}}"></script><script src="{{$.System.PathJsPopper}}"></script><script src="{{$.System.PathJsBootstrap}}"></script></body></html>`)

+ 6 - 6
engine/wrapper/resources/templates/cp.login.html
View File 

@@ -5,9 +5,9 @@
 
 		<meta name="theme-color" content="#205081" />
 
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 		<title>Please login</title>
 
-		<link rel="stylesheet" href="/assets/sys/bootstrap.css">
 
-		<link rel="stylesheet" href="/assets/cp/styles.css">
 
-		<link rel="shortcut icon" href="/assets/sys/fave.ico" type="image/x-icon" />
 
+		<link rel="stylesheet" href="{{$.System.PathCssBootstrap}}">
 
+		<link rel="stylesheet" href="{{$.System.PathCssCpStyles}}">
 
+		<link rel="shortcut icon" href="{{$.System.PathIcoFav}}" type="image/x-icon" />
 
 		<style type="text/css">html{height:100%;}</style>
 
 	</head>
 
 	<body class="cp-login text-center">
 
@@ -22,8 +22,8 @@
 
 			</div>
 
 			<button class="btn btn-lg btn-primary btn-block" type="submit">Login</button>
 
 		</form>
 
-		<script src="/assets/sys/jquery.js"></script>
 
-		<script src="/assets/sys/popper.js"></script>
 
-		<script src="/assets/sys/bootstrap.js"></script>
 
+		<script src="{{$.System.PathJsJquery}}"></script>
 
+		<script src="{{$.System.PathJsPopper}}"></script>
 
+		<script src="{{$.System.PathJsBootstrap}}"></script>
 
 	</body>
 
 </html>

+ 4 - 0
engine/wrapper/wrapper.go
View File 

@@ -15,6 +15,8 @@ type handleRun func(e *Wrapper) bool
 
 
 type tmplDataSystem struct {
 
 	PathIcoFav       string
 
+	PathCssStyles    string
 
+	PathCssCpStyles  string
 
 	PathCssBootstrap string
 
 	PathJsJquery     string
 
 	PathJsPopper     string
 
@@ -43,6 +45,8 @@ type Wrapper struct {
 
 func (e *Wrapper) tmplGetSystemData() tmplDataSystem {
 
 	return tmplDataSystem{
 
 		PathIcoFav:       e.R.URL.Scheme + "://" + e.R.Host + "/assets/sys/fave.ico",
 
+		PathCssStyles:    e.R.URL.Scheme + "://" + e.R.Host + "/assets/sys/styles.css",
 
+		PathCssCpStyles:  e.R.URL.Scheme + "://" + e.R.Host + "/assets/cp/styles.css",
 
 		PathCssBootstrap: e.R.URL.Scheme + "://" + e.R.Host + "/assets/sys/bootstrap.css",
 
 		PathJsJquery:     e.R.URL.Scheme + "://" + e.R.Host + "/assets/sys/jquery.js",
 
 		PathJsPopper:     e.R.URL.Scheme + "://" + e.R.Host + "/assets/sys/popper.js",