diff --git a/static/email/verify-email.html b/static/email/verify-email.html index 1d5589a6..951ab984 100644 --- a/static/email/verify-email.html +++ b/static/email/verify-email.html @@ -1,13 +1,10 @@ Hello! - -Welcome to Tectonic! Please verify that your email is {{ .email }} by clicking here: - - Click here to verify! - -Love, - -Your Pals at CoreOS +
+ Please verify that your email is {{ .email }} by clicking here: +
+
+ Click here to verify! diff --git a/static/email/verify-email.txt b/static/email/verify-email.txt index 6808a2b3..eb3a9eb9 100644 --- a/static/email/verify-email.txt +++ b/static/email/verify-email.txt @@ -1,9 +1,5 @@ Hello! -Welcome to Tectonic! Please verify that your email is {{ .email }} by clicking here: +Please verify that your email is {{ .email }} by clicking here: {{ .link }} - -Love, - -Your Pals at CoreOS diff --git a/static/html/footer.html b/static/html/footer.html new file mode 100644 index 00000000..5b6e2d65 --- /dev/null +++ b/static/html/footer.html @@ -0,0 +1,3 @@ + + + diff --git a/static/html/header.html b/static/html/header.html new file mode 100644 index 00000000..1aa0a86d --- /dev/null +++ b/static/html/header.html @@ -0,0 +1,214 @@ + + + + + + Dex + + + + + + + +
+ diff --git a/static/html/local-login.html b/static/html/local-login.html index 35649688..65689a5f 100644 --- a/static/html/local-login.html +++ b/static/html/local-login.html @@ -1,180 +1,29 @@ - - - - - - Login · CoreOS - - - - - - - - - -
+{{ template "header.html" }} - - - - -
-

Verify Your Identity

-
-
-
-
- Forgot? Reset Password -
- -
-
-
- {{ if .Error }} -
{{ .Message }}
- {{ end }} +
+

Log in to Your Account

+
+
+
+
- - Contact CoreOS + +
+
+
+ + Forgot? Reset Password +
+
- - + {{ if .Error }} +
{{ .Message }}
+ {{ end }} + + +
+
+ +{{ template "footer.html" }} diff --git a/static/html/login.html b/static/html/login.html index 479ec4b5..8a6cda3c 100644 --- a/static/html/login.html +++ b/static/html/login.html @@ -1,207 +1,78 @@ - - - - - - Login · CoreOS - - - - - - - - - -
+{{ template "header.html" }} - - - +
+ {{ if .ShowEmailVerifiedMessage }} +

Your email has been verified!

+ {{ end }} -
- {{ if .ShowEmailVerifiedMessage }} -

Your email has been verified! Now Log in to continue to the site.

- {{ end }} - {{ if .Error }} -

{{ .Message }}

- {{ else }} - {{ if .Register }} -

Create Your Account

- {{ else }} -

Verify Your Identity

- {{ end}} - {{ end }} -
- {{ if .Error }} -
{{ .Instruction }}
-
{{ .Detail }}
- {{ else }} + {{ if .Error }} +

{{ .Message }}

+ {{ else }} + {{ if and .Register (eq .MsgCode "") }} +

Create Your Account

+
Verify using either option below
+ {{ else }} +

Log in to Your Account

+ {{ end}} + {{ end }} - {{ if eq .MsgCode "login-maybe" }} -
This email address is already in use.
-
Looks like you've already registered. Try logging in instead:
- {{ end }} +
+ {{ if .Error }} +
{{ .Instruction }}
+
{{ .Detail }}
+ {{ else }} - {{ if eq .MsgCode "register-maybe" }} -
There's no account for this user.
-
Try registering with this first:
- {{ end }} + {{ if eq .MsgCode "login-maybe" }} +
This email address is already in use.
+
Looks like you've already registered. Try logging in instead:
+ {{ end }} - {{ if eq .MsgCode "wrong-connector" }} -
Wrong login method.
-
Try logging in again with this instead:
- {{ end }} - + {{ if eq .MsgCode "register-maybe" }} +
There's no account for this user.
+
Try registering with this first:
+ {{ end }} - {{ range $c := .Links }} - - {{ end }} - {{ end }} - -
-
+ {{ if eq .MsgCode "wrong-connector" }} +
Wrong login method.
+
Try logging in again with this instead:
+ {{ end }} {{ if .Register }} - Already have an account? Log in + {{ range $c := .Links }} +
+ + + +
+ {{ end }} {{ else }} - Don't have an account yet? Register + {{ range $c := .Links }} +
+ + + +
+ {{ end }} {{ end }} - Contact CoreOS -
+ {{ end }} +
- - +
+{{ if not .Error }} +
+ {{ if .Register }} + Already have an account? Log in + {{ else }} + Don't have an account yet? Register + {{ end }} +
+{{ end }} + +{{ template "footer.html" }} diff --git a/static/html/register.html b/static/html/register.html index 5d2408b1..7c57cbd5 100644 --- a/static/html/register.html +++ b/static/html/register.html @@ -1,35 +1,47 @@ - +{{ template "header.html" }} - - {{ if .Error }} -
- {{ .Message }} -
- {{ else }} +
+

Create Your Account

+ + {{ if .Error }} +
{{ .Message }}
+ {{ else }} -
    - {{ range $fe := .FormErrors }} -
  • {{ $fe.Field }}: {{ $fe.Error }}
    • - {{ end }} -
- -

Please Register

- - -
- +
+
+ +
+ + {{ range $fe := .FormErrors }} + {{ if eq $fe.Field "email" }} +
{{ $fe.Error }}
+ {{ end }} + {{ end }} +
+ {{ if .Local }} - - -
+
+
+ +
+ + {{ range $fe := .FormErrors }} + {{ if eq $fe.Field "password" }} +
{{ $fe.Error }}
+ {{ end }} + {{ end }} +
{{ end }} + -
+ +{{ template "footer.html" }} diff --git a/static/html/reset-password.html b/static/html/reset-password.html index 5d8c5046..c3d01fcd 100644 --- a/static/html/reset-password.html +++ b/static/html/reset-password.html @@ -1,28 +1,74 @@ - - - {{ if .Success }} - Yay, you changed your password! - {{ else }} - {{ $lenError := len .Error }} - {{ $hasError := ne $lenError 0 }} - {{ if $hasError }} -

- {{ .Error }} -

-
- {{ .Message }} -
- {{ end }} +{{ template "header.html" }} - {{ if not .DontShowForm }} -
- - -
- - -
- {{ end }} +
+ + {{ if .Success }} +

Your password has been reset

+ {{ else }} + {{ $lenError := len .Error }} + {{ $hasError := ne $lenError 0 }} + + {{ if .DontShowForm }} + {{ if $hasError }} +
{{ .Error }}
+
{{ .Message }}
{{ end }} - - + {{ else }} +

Reset your password

+
+
+
+ +
+ +
+
+
+ +
+ +
+ + + {{ if $hasError }} +
+
{{ .Error }}
+
{{ .Message }}
+
+ {{ end }} + + + +
+ {{ end }} + {{ end }} + +
+ + + +{{ template "footer.html" }} diff --git a/static/html/send-reset-password.html b/static/html/send-reset-password.html index c2d115ff..af3db0ef 100644 --- a/static/html/send-reset-password.html +++ b/static/html/send-reset-password.html @@ -1,30 +1,37 @@ - +{{ template "header.html" }} - - {{ if .EmailSent }} +
+{{ if .EmailSent }} -

Thank you, please check your email!

+

Thank you, please check your email!

+
{{ .Email }} has been sent an email with instructions to reset your password. +
- {{ else }} +{{ else }} + +

Reset your password

+
We will send you an email with a link to reset your password.
+ +
+ +
+
+ +
+ +
{{ if .Error }} -
- {{ .Message }} -
+
{{ .Message }}
{{ end }} -

Reset Your Password

-

We will send you an email with a link to reset your password.

- - - -
- - - -
- {{ end }} - - - + + + + + +{{ end }} +
+ +{{ template "footer.html" }} diff --git a/static/html/verify-email.html b/static/html/verify-email.html index e10d3bb1..6dc20506 100644 --- a/static/html/verify-email.html +++ b/static/html/verify-email.html @@ -1,10 +1,8 @@ - - -

- {{ .Error }} -

-
- {{ .Message }} -
- - +{{ template "header.html" }} + +
+

{{ .Error }}

+
{{ .Message }}
+
+ +{{ template "footer.html" }}