diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 3cb5974e..ccdc68fa 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -20,6 +20,7 @@ var config_nev = function () { var User = require('../../models/user.server.model'); + nev.configure({ persistentUserModel: User, tempUserCollection: config.tempUserCollection, @@ -30,7 +31,7 @@ var config_nev = function () { verifyMailOptions: { from: config.mailer.from, subject: 'Confirm your account', - html: '

Please verify your account by clicking this link. If you are unable to do so, copy and ' + + html: '

Please verify your account by clicking this link. If you are unable to do so, copy and ' + 'paste the following link into your browser:

${URL}

', text: 'Please verify your account by clicking the following link, or by copying and pasting it into your browser: ${URL}' }, @@ -86,7 +87,6 @@ exports.resendVerificationEmail = function(req, res, next){ } if (userFound){ - console.log('hello'); res.status(200).send('Verification email successfully Re-Sent'); }else { // user hasn't been found yet diff --git a/app/views/templates/verify-account-email.server.view.html b/app/views/templates/verify-account-email.server.view.html index 9ad68168..5611ec4c 100644 --- a/app/views/templates/verify-account-email.server.view.html +++ b/app/views/templates/verify-account-email.server.view.html @@ -1,18 +1,71 @@ - - - - - -

Dear {{name}},

-
-

- You have just created a new account at {{appName}}. To use your account you must activate it.s -

-

Please visit this url to activate your account:

-

{{url}}

- If you didn't make this request, you can ignore this email. -
-
-

The {{appName}} Support Team

- + + + + + + +
+ + + + +
+ + + + + + + +
+ + + + + + + + + + + + +
+ //- ----------------------------------------------------------------------------------- + //- Only Edit Here + //- ----------------------------------------------------------------------------------- + p Hello {{name}}! + p + | Welcome to {{appName}}! Here is a special link to activate your new account: + p + a(href='${URL}') Activate my account + p + | Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at  + a(href='mailto:{{contactEmail}}') {{contactEmail}} + | . + p   - The {{appName}} team + //- ---------------------------------------------------------------------------------- + +
+
+ + + + + + + +
+ + + + +
+ ©
+
+
+
+ + + diff --git a/public/modules/core/css/core.css b/public/modules/core/css/core.css index 3957f97b..9bbb32a1 100755 --- a/public/modules/core/css/core.css +++ b/public/modules/core/css/core.css @@ -19,12 +19,29 @@ body { border: 0; color: white!important; } -.navbar li > * { - border-bottom: 4px solid white; +.navbar .navbar-brand { + min-height: 60px; + padding: 10px; +} + +.navbar-nav { + min-height: 60px; +} + +.navbar-nav > li { + + min-height: 60px; +} +.navbar-nav > li > a { color: white; } -.navbar li:hover > * { - border-bottom: 2px solid #ddd; +.navbar-nav > li:hover, .navbar-nav > li.active { + background-color: #4b7096; +} +.navbar-inverse .navbar-nav>.open>a, .navbar-inverse .navbar-nav>.open>a:focus, .navbar-inverse .navbar-nav>.open>a:hover { + background-color: transparent; + color: inherit; + border: none; } .navbar-inverse .navbar-nav>li>a { @@ -43,6 +60,10 @@ body { display: none !important; } +.dropdown-menu>li>a { + color: #515151; +} + /*Hero Section CSS (for /home)*/ section.hero-section { width: 100%; diff --git a/public/modules/users/css/users.css b/public/modules/users/css/users.css index d6155e0a..2bf345ed 100755 --- a/public/modules/users/css/users.css +++ b/public/modules/users/css/users.css @@ -55,7 +55,7 @@ section.auth { color: #4c4c4c; } - .btn { + section.auth .btn { border-radius: 100px; font-size: 14px; padding: 12px 28px; diff --git a/public/modules/users/views/authentication/signin.client.view.html b/public/modules/users/views/authentication/signin.client.view.html index 7eb341d5..80007bb6 100755 --- a/public/modules/users/views/authentication/signin.client.view.html +++ b/public/modules/users/views/authentication/signin.client.view.html @@ -33,11 +33,11 @@
- +
- +
diff --git a/public/modules/users/views/authentication/signup.client.view.html b/public/modules/users/views/authentication/signup.client.view.html index 39a76559..e5b6ab07 100644 --- a/public/modules/users/views/authentication/signup.client.view.html +++ b/public/modules/users/views/authentication/signup.client.view.html @@ -55,7 +55,7 @@
-->
- +
@@ -63,7 +63,7 @@
- +
diff --git a/public/modules/users/views/settings/change-password.client.view.html b/public/modules/users/views/settings/change-password.client.view.html index a2a077b3..a6144c04 100755 --- a/public/modules/users/views/settings/change-password.client.view.html +++ b/public/modules/users/views/settings/change-password.client.view.html @@ -1,4 +1,6 @@ -
+
+ +

Change your password