Extract templates to separate files
This allows our users to easily copy the base templates should they wish to make changes to them
This commit is contained in:
		
							parent
							
								
									5fe947eb07
								
							
						
					
					
						commit
						756d385154
					
				|  | @ -0,0 +1,100 @@ | |||
| {{define "error.html"}} | ||||
| <!DOCTYPE html> | ||||
| <html lang="en" charset="utf-8"> | ||||
| <head> | ||||
| <meta charset="utf-8"> | ||||
| <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> | ||||
|   <title>{{.StatusCode}} {{.Title}}</title> | ||||
| <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"> | ||||
| <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"> | ||||
| 
 | ||||
| <script type="text/javascript"> | ||||
|   document.addEventListener('DOMContentLoaded', function() { | ||||
|     let cardToggles = document.getElementsByClassName('card-toggle'); | ||||
|     for (let i = 0; i < cardToggles.length; i++) { | ||||
|       cardToggles[i].addEventListener('click', e => { | ||||
|         e.currentTarget.parentElement.parentElement.childNodes[3].classList.toggle('is-hidden'); | ||||
|       }); | ||||
|     } | ||||
|   }); | ||||
| </script> | ||||
| 
 | ||||
| <style> | ||||
|   body { | ||||
|     height: 100vh; | ||||
|   } | ||||
|   .error-box { | ||||
|     margin: 1.25rem auto; | ||||
|     max-width: 600px; | ||||
|   } | ||||
|   .status-code { | ||||
|     font-size: 12rem; | ||||
|     font-weight: 600; | ||||
|   } | ||||
|   #more-info.card { | ||||
|     border: 1px solid #f0f0f0; | ||||
|   } | ||||
|   footer a { | ||||
|     text-decoration: underline; | ||||
|   } | ||||
| </style> | ||||
| </head> | ||||
| <body class="has-background-light"> | ||||
| <section class="section"> | ||||
|   <div class="box block error-box has-text-centered"> | ||||
|     <div class="status-code">{{.StatusCode}}</div> | ||||
|     <div class="block"> | ||||
|       <h1 class="subtitle is-1">{{.Title}}</h1> | ||||
|     </div> | ||||
| 
 | ||||
|     {{ if .Message }} | ||||
|     <div id="more-info" class="block card is-fullwidth is-shadowless"> | ||||
|       <header class="card-header is-shadowless"> | ||||
|         <p class="card-header-title">More Info</p> | ||||
|         <a class="card-header-icon card-toggle"> | ||||
|           <i class="fa fa-angle-down"></i> | ||||
|         </a> | ||||
|       </header> | ||||
|       <div class="card-content has-text-left is-hidden"> | ||||
|         <div class="content"> | ||||
|           {{.Message}} | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|     {{ end }} | ||||
| 
 | ||||
|     {{ if .Redirect }} | ||||
|     <hr> | ||||
| 
 | ||||
|     <div class="columns"> | ||||
|       <div class="column"> | ||||
|         <form method="GET" action="{{.Redirect}}"> | ||||
|           <button type="submit" class="button is-danger is-fullwidth">Go back</button> | ||||
|         </form> | ||||
|       </div> | ||||
|       <div class="column"> | ||||
|         <form method="GET" action="{{.ProxyPrefix}}/sign_in"> | ||||
|           <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
|           <button type="submit" class="button is-primary is-fullwidth">Sign in</button> | ||||
|         </form> | ||||
|       </div> | ||||
|     </div> | ||||
|     {{ end }} | ||||
| 
 | ||||
|   </div> | ||||
| </section> | ||||
| 
 | ||||
| <footer class="footer has-text-grey has-background-light is-size-7"> | ||||
|   <div class="content has-text-centered"> | ||||
|     {{ if eq .Footer "-" }} | ||||
|     {{ else if eq .Footer ""}} | ||||
|     <p>Secured with <a href="https://github.com/oauth2-proxy/oauth2-proxy#oauth2_proxy" class="has-text-grey">OAuth2 Proxy</a> version {{.Version}}</p> | ||||
|     {{ else }} | ||||
|     <p>{{.Footer}}</p> | ||||
|     {{ end }} | ||||
|   </div> | ||||
| </footer> | ||||
| 
 | ||||
| </body> | ||||
| </html> | ||||
| {{end}} | ||||
|  | @ -0,0 +1,89 @@ | |||
| {{define "sign_in.html"}} | ||||
| <!DOCTYPE html> | ||||
| <html lang="en" charset="utf-8"> | ||||
|   <head> | ||||
|     <meta charset="utf-8"> | ||||
|     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> | ||||
|     <title>Sign In</title> | ||||
|     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"> | ||||
| 
 | ||||
|     <style> | ||||
|       body { | ||||
|         height: 100vh; | ||||
|       } | ||||
|       .sign-in-box { | ||||
|         max-width: 400px; | ||||
|         margin: 1.25rem auto; | ||||
|       } | ||||
|       footer a { | ||||
|         text-decoration: underline; | ||||
|       } | ||||
|     </style> | ||||
| 
 | ||||
|     <script> | ||||
|       if (window.location.hash) { | ||||
|         (function() { | ||||
|           var inputs = document.getElementsByName('rd'); | ||||
|           for (var i = 0; i < inputs.length; i++) { | ||||
|             // Add hash, but make sure it is only added once | ||||
|             var idx = inputs[i].value.indexOf('#'); | ||||
|             if (idx >= 0) { | ||||
|               // Remove existing hash from URL | ||||
|               inputs[i].value = inputs[i].value.substr(0, idx); | ||||
|             } | ||||
|             inputs[i].value += window.location.hash; | ||||
|           } | ||||
|         })(); | ||||
|       } | ||||
|     </script> | ||||
|   </head> | ||||
|   <body class="has-background-light"> | ||||
|   <section class="section"> | ||||
|     <div class="box block sign-in-box has-text-centered"> | ||||
|       <form method="GET" action="{{.ProxyPrefix}}/start"> | ||||
|         <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
|           {{ if .SignInMessage }} | ||||
|           <p class="block">{{.SignInMessage}}</p> | ||||
|           {{ end}} | ||||
|           <button type="submit" class="button block is-primary">Sign in with {{.ProviderName}}</button> | ||||
|       </form> | ||||
| 
 | ||||
|       {{ if .CustomLogin }} | ||||
|       <hr> | ||||
| 
 | ||||
|       <form method="POST" action="{{.ProxyPrefix}}/sign_in" class="block"> | ||||
|         <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
| 
 | ||||
|         <div class="field"> | ||||
|           <label class="label" for="username">Username</label> | ||||
|           <div class="control"> | ||||
|             <input class="input" type="email" placeholder="e.g. userx@example.com"  name="username" id="username"> | ||||
|           </div> | ||||
|         </div> | ||||
| 
 | ||||
|         <div class="field"> | ||||
|           <label class="label" for="password">Password</label> | ||||
|           <div class="control"> | ||||
|             <input class="input" type="password" placeholder="********" name="password" id="password"> | ||||
|           </div> | ||||
|         </div> | ||||
|         <button class="button is-primary">Sign in</button> | ||||
|         {{ end }} | ||||
|     </form> | ||||
|     </div> | ||||
|   </section> | ||||
| 
 | ||||
|   <footer class="footer has-text-grey has-background-light is-size-7"> | ||||
|     <div class="content has-text-centered"> | ||||
|     	{{ if eq .Footer "-" }} | ||||
|     	{{ else if eq .Footer ""}} | ||||
|     	<p>Secured with <a href="https://github.com/oauth2-proxy/oauth2-proxy#oauth2_proxy" class="has-text-grey">OAuth2 Proxy</a> version {{.Version}}</p> | ||||
|     	{{ else }} | ||||
|     	<p>{{.Footer}}</p> | ||||
|     	{{ end }} | ||||
|     </div> | ||||
| 	</footer> | ||||
| 
 | ||||
|   </body> | ||||
| </html> | ||||
| {{end}} | ||||
|  | @ -1,6 +1,9 @@ | |||
| package pagewriter | ||||
| 
 | ||||
| import ( | ||||
| 	// Import embed to allow importing default page templates
 | ||||
| 	_ "embed" | ||||
| 
 | ||||
| 	"fmt" | ||||
| 	"html/template" | ||||
| 	"os" | ||||
|  | @ -13,199 +16,14 @@ import ( | |||
| const ( | ||||
| 	errorTemplateName  = "error.html" | ||||
| 	signInTemplateName = "sign_in.html" | ||||
| 
 | ||||
| 	defaultErrorTemplate = `{{define "error.html"}} | ||||
| <!DOCTYPE html> | ||||
| <html lang="en" charset="utf-8"> | ||||
| <head> | ||||
|   <meta charset="utf-8"> | ||||
|   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> | ||||
|   	<title>{{.StatusCode}} {{.Title}}</title> | ||||
|   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"> | ||||
|   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"> | ||||
| 
 | ||||
|   <script type="text/javascript"> | ||||
|     document.addEventListener('DOMContentLoaded', function() { | ||||
|     	let cardToggles = document.getElementsByClassName('card-toggle'); | ||||
|     	for (let i = 0; i < cardToggles.length; i++) { | ||||
|     		cardToggles[i].addEventListener('click', e => { | ||||
|     			e.currentTarget.parentElement.parentElement.childNodes[3].classList.toggle('is-hidden'); | ||||
|     		}); | ||||
|     	} | ||||
|     }); | ||||
|   </script> | ||||
| 
 | ||||
|   <style> | ||||
|     body { | ||||
|       height: 100vh; | ||||
|     } | ||||
|     .error-box { | ||||
|       margin: 1.25rem auto; | ||||
|       max-width: 600px; | ||||
|     } | ||||
|     .status-code { | ||||
|       font-size: 12rem; | ||||
|       font-weight: 600; | ||||
|     } | ||||
|     #more-info.card { | ||||
|       border: 1px solid #f0f0f0; | ||||
|     } | ||||
|     footer a { | ||||
|       text-decoration: underline; | ||||
|     } | ||||
|   </style> | ||||
| </head> | ||||
| <body class="has-background-light"> | ||||
|   <section class="section"> | ||||
|     <div class="box block error-box has-text-centered"> | ||||
|       <div class="status-code">{{.StatusCode}}</div> | ||||
|       <div class="block"> | ||||
|         <h1 class="subtitle is-1">{{.Title}}</h1> | ||||
|       </div> | ||||
| 
 | ||||
|       {{ if .Message }} | ||||
|       <div id="more-info" class="block card is-fullwidth is-shadowless"> | ||||
|   			<header class="card-header is-shadowless"> | ||||
|   				<p class="card-header-title">More Info</p> | ||||
|   				<a class="card-header-icon card-toggle"> | ||||
|   					<i class="fa fa-angle-down"></i> | ||||
|   				</a> | ||||
|   			</header> | ||||
|   			<div class="card-content has-text-left is-hidden"> | ||||
|   				<div class="content"> | ||||
|   					{{.Message}} | ||||
|   				</div> | ||||
|   			</div> | ||||
|   		</div> | ||||
|       {{ end }} | ||||
| 
 | ||||
|       {{ if .Redirect }} | ||||
|       <hr> | ||||
| 
 | ||||
|       <div class="columns"> | ||||
|         <div class="column"> | ||||
|           <form method="GET" action="{{.Redirect}}"> | ||||
|             <button type="submit" class="button is-danger is-fullwidth">Go back</button> | ||||
|           </form> | ||||
|         </div> | ||||
|         <div class="column"> | ||||
|           <form method="GET" action="{{.ProxyPrefix}}/sign_in"> | ||||
|             <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
|             <button type="submit" class="button is-primary is-fullwidth">Sign in</button> | ||||
|           </form> | ||||
|         </div> | ||||
|       </div> | ||||
|       {{ end }} | ||||
| 
 | ||||
|     </div> | ||||
|   </section> | ||||
| 
 | ||||
|   <footer class="footer has-text-grey has-background-light is-size-7"> | ||||
|     <div class="content has-text-centered"> | ||||
|     	{{ if eq .Footer "-" }} | ||||
|     	{{ else if eq .Footer ""}} | ||||
|     	<p>Secured with <a href="https://github.com/oauth2-proxy/oauth2-proxy#oauth2_proxy" class="has-text-grey">OAuth2 Proxy</a> version {{.Version}}</p> | ||||
|     	{{ else }} | ||||
|     	<p>{{.Footer}}</p> | ||||
|     	{{ end }} | ||||
|     </div> | ||||
| 	</footer> | ||||
| 
 | ||||
|   </body> | ||||
| </html> | ||||
| {{end}}` | ||||
| 
 | ||||
| 	defaultSignInTemplate = `{{define "sign_in.html"}} | ||||
| <!DOCTYPE html> | ||||
| <html lang="en" charset="utf-8"> | ||||
|   <head> | ||||
|     <meta charset="utf-8"> | ||||
|     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> | ||||
|     <title>Sign In</title> | ||||
|     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css"> | ||||
| 
 | ||||
|     <style> | ||||
|       body { | ||||
|         height: 100vh; | ||||
|       } | ||||
|       .sign-in-box { | ||||
|         max-width: 400px; | ||||
|         margin: 1.25rem auto; | ||||
|       } | ||||
|       footer a { | ||||
|         text-decoration: underline; | ||||
|       } | ||||
|     </style> | ||||
| 
 | ||||
|     <script> | ||||
|       if (window.location.hash) { | ||||
|         (function() { | ||||
|           var inputs = document.getElementsByName('rd'); | ||||
|           for (var i = 0; i < inputs.length; i++) { | ||||
|             // Add hash, but make sure it is only added once
 | ||||
|             var idx = inputs[i].value.indexOf('#'); | ||||
|             if (idx >= 0) { | ||||
|               // Remove existing hash from URL
 | ||||
|               inputs[i].value = inputs[i].value.substr(0, idx); | ||||
|             } | ||||
|             inputs[i].value += window.location.hash; | ||||
|           } | ||||
|         })(); | ||||
|       } | ||||
|     </script> | ||||
|   </head> | ||||
|   <body class="has-background-light"> | ||||
|   <section class="section"> | ||||
|     <div class="box block sign-in-box has-text-centered"> | ||||
|       <form method="GET" action="{{.ProxyPrefix}}/start"> | ||||
|         <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
|           {{ if .SignInMessage }} | ||||
|           <p class="block">{{.SignInMessage}}</p> | ||||
|           {{ end}} | ||||
|           <button type="submit" class="button block is-primary">Sign in with {{.ProviderName}}</button> | ||||
|       </form> | ||||
| 
 | ||||
|       {{ if .CustomLogin }} | ||||
|       <hr> | ||||
| 
 | ||||
|       <form method="POST" action="{{.ProxyPrefix}}/sign_in" class="block"> | ||||
|         <input type="hidden" name="rd" value="{{.Redirect}}"> | ||||
| 
 | ||||
|         <div class="field"> | ||||
|           <label class="label" for="username">Username</label> | ||||
|           <div class="control"> | ||||
|             <input class="input" type="email" placeholder="e.g. userx@example.com"  name="username" id="username"> | ||||
|           </div> | ||||
|         </div> | ||||
| 
 | ||||
|         <div class="field"> | ||||
|           <label class="label" for="password">Password</label> | ||||
|           <div class="control"> | ||||
|             <input class="input" type="password" placeholder="********" name="password" id="password"> | ||||
|           </div> | ||||
|         </div> | ||||
|         <button class="button is-primary">Sign in</button> | ||||
|         {{ end }} | ||||
|     </form> | ||||
|     </div> | ||||
|   </section> | ||||
| 
 | ||||
|   <footer class="footer has-text-grey has-background-light is-size-7"> | ||||
|     <div class="content has-text-centered"> | ||||
|     	{{ if eq .Footer "-" }} | ||||
|     	{{ else if eq .Footer ""}} | ||||
|     	<p>Secured with <a href="https://github.com/oauth2-proxy/oauth2-proxy#oauth2_proxy" class="has-text-grey">OAuth2 Proxy</a> version {{.Version}}</p> | ||||
|     	{{ else }} | ||||
|     	<p>{{.Footer}}</p> | ||||
|     	{{ end }} | ||||
|     </div> | ||||
| 	</footer> | ||||
| 
 | ||||
|   </body> | ||||
| </html> | ||||
| {{end}}` | ||||
| ) | ||||
| 
 | ||||
| //go:embed error.html
 | ||||
| var defaultErrorTemplate string | ||||
| 
 | ||||
| //go:embed sign_in.html
 | ||||
| var defaultSignInTemplate string | ||||
| 
 | ||||
| // loadTemplates adds the Sign In and Error templates from the custom template
 | ||||
| // directory, or uses the defaults if they do not exist or the custom directory
 | ||||
| // is not provided.
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue