From 221a14315b09946db2485036bbf4a80295dc4889 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 2 Jul 2014 16:22:51 -0400 Subject: password reset / username dupe stuff from PH --- views/controls/editor/media-editor.ejs | 30 ++++++++++++++ views/controls/editor/settings.ejs | 4 +- views/mail/password.html.ejs | 25 ++++++++++++ views/mail/password.text.ejs | 11 +++++ views/mail/welcome.html.ejs | 17 ++++++++ views/mail/welcome.text.ejs | 4 ++ views/partials/scripts.ejs | 3 ++ views/partials/sign-in.ejs | 75 ++++++++++++++++++++++++++++++++++ 8 files changed, 166 insertions(+), 3 deletions(-) create mode 100644 views/controls/editor/media-editor.ejs create mode 100644 views/mail/password.html.ejs create mode 100644 views/mail/password.text.ejs create mode 100644 views/mail/welcome.html.ejs create mode 100644 views/mail/welcome.text.ejs (limited to 'views') diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs new file mode 100644 index 0000000..93405fc --- /dev/null +++ b/views/controls/editor/media-editor.ejs @@ -0,0 +1,30 @@ +
+ + + +
+ +
+ +
+ +
+ +
+
+ + + + +
+
+ +
+ +
+ +
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs index a7d6213..867d5f3 100644 --- a/views/controls/editor/settings.ejs +++ b/views/controls/editor/settings.ejs @@ -16,9 +16,7 @@
-
- -
+
diff --git a/views/mail/password.html.ejs b/views/mail/password.html.ejs new file mode 100644 index 0000000..f266488 --- /dev/null +++ b/views/mail/password.html.ejs @@ -0,0 +1,25 @@ + + + +

+ Hey there, +

+ +

+ We received a request to reset the password associated with this email address. +

+ +

+ Click the link below to make a new password: +

+ +

+ http://vvalls.com/auth/password?nonce=[[- passwordNonce ]] +

+ +

+ If this was requested in error, please disregard this message. +

+ + + diff --git a/views/mail/password.text.ejs b/views/mail/password.text.ejs new file mode 100644 index 0000000..67e4b60 --- /dev/null +++ b/views/mail/password.text.ejs @@ -0,0 +1,11 @@ + +Hey there, + +We received a request to reset the password associated with this email address. + +Click the link below to make a new password: + +http://vvalls.com/auth/password?nonce=[[- passwordNonce ]] + +If this was requested in error, please disregard this message. + diff --git a/views/mail/welcome.html.ejs b/views/mail/welcome.html.ejs new file mode 100644 index 0000000..8b7194b --- /dev/null +++ b/views/mail/welcome.html.ejs @@ -0,0 +1,17 @@ + + + +

+ +

+ +

+ Welcome to Vvalls, [[- username ]] +

+ +

+ www.vvalls.com +

+ + + diff --git a/views/mail/welcome.text.ejs b/views/mail/welcome.text.ejs new file mode 100644 index 0000000..cab9c15 --- /dev/null +++ b/views/mail/welcome.text.ejs @@ -0,0 +1,4 @@ + +Welcome to Vvalls, [[- username ]] + +http://www.posthang.com diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 80be29f..9f0c2f2 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -65,6 +65,9 @@ + + + diff --git a/views/partials/sign-in.ejs b/views/partials/sign-in.ejs index 3341aec..11b930f 100644 --- a/views/partials/sign-in.ejs +++ b/views/partials/sign-in.ejs @@ -74,4 +74,79 @@
+
+
+
+
  • + Forgot your password? Enter the email address you used to sign up + and we can reset it for you. +
  • +
  • + +
    + +
    +
  • +
  • + +
  • +
    +
    There was a problem with your submission:
    +
    +
    +
    +
    +
    + +
    +
    +
    + + Please reset your password. +

    +
  • + +
    + +
    +
  • +
  • + +
    + +
    +
  • +
  • + +
  • +
    +
    +
    +
    +
    +
    + +
    +
    +
    + We're sorry, the username [[- username ]] is already being used. +

    + Please choose another username. +

    +
  • + +
    + +
    +
  • +
  • + +
  • +
    +
    +
    +
    +
    +
    + [[ } ]] -- cgit v1.2.3-70-g09d2