Main merge to user management system - files are now at /main/public/

16 files changed, 647 insertions, 0 deletions

diff --git a/main/app/sprinkles/account/templates/forms/settings-account.html.twig b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
new file mode 100755
index 0000000..996b27b
--- /dev/null
+++ b/main/app/sprinkles/account/templates/forms/settings-account.html.twig
@@ -0,0 +1,37 @@
+<form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
+    <div class="box-header">
+        <h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
+    </div>
+    <div class="box-body">
+        {% include "forms/csrf.html.twig" %}
+        <!-- Prevent browsers from trying to autofill the password field.  See http://stackoverflow.com/a/23234498/2970321 -->
+        <input type="text" style="display:none">
+        <input type="password" style="display:none">
+
+        {% block settings_account %}
+            <div class="form-group">
+                <label for="input-email" class="ccontrol-label">{{translate("EMAIL")}}</label>
+                <input type="text" id="input-email" class="form-control" name="email" value="{{current_user.email}}" autocomplete="off" placeholder="{{translate("EMAIL.YOUR")}}" {{page.visibility}}>
+            </div>
+            {% if page.visibility != "disabled" %}
+                <div class="form-group">
+                    <label for="input-password" class="control-label">{{translate("PASSWORD.NEW")}}</label>
+                    <input type="password" id="input-password" class="form-control" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 100})}} ({{translate("OPTIONAL")}})">
+                </div>
+                <div class="form-group">
+                    <label for="input-passwordc" class="control-label">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
+                    <input type="password" id="input-passwordc" class="form-control" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_HELP")}}">
+                </div>
+                <hr>
+                <div class="form-group">
+                    <label for="input-passwordcheck" class="control-label">{{translate("PASSWORD.CURRENT")}}</label>
+                    <input type="password" id="input-passwordcheck" class="form-control" name="passwordcheck" placeholder="{{translate("PASSWORD.CURRENT_EXPLAIN")}}">
+                </div>
+            {% endif %}
+        {% endblock %}
+    </div>
+    <div class="box-footer text-center">
+        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/forms/settings-profile.html.twig b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
new file mode 100755
index 0000000..0b0a788
--- /dev/null
+++ b/main/app/sprinkles/account/templates/forms/settings-profile.html.twig
@@ -0,0 +1,40 @@
+<form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
+    <div class="box-header">
+        <h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
+    </div>
+    <div class="box-body">
+        {% include "forms/csrf.html.twig" %}
+
+        {% block settings_profile %}
+            <label for="input-first-name" class="control-label">{{translate("NAME")}}</label>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <input type="text" id="input-first-name" class="form-control" name="first_name" value="{{current_user.first_name}}" placeholder="{{translate("FIRST_NAME")}}" {{page.visibility}}>
+                    </div>
+                </div>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <input type="text" id="input-last-name" class="form-control" name="last_name" value="{{current_user.last_name}}" placeholder="{{translate("LAST_NAME")}}" {{page.visibility}}>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="input-locale" class="control-label">{{translate("LOCALE")}}</label>
+                <select id="input-locale" class="form-control js-select2" name="locale" {{page.visibility}}>
+                    {% for option, label in locales %}
+                        {% if label is not empty %}
+                            <option value="{{option}}" {% if (option == current_user.locale) %}selected{% endif %}>{{label}}</option>
+                        {% endif %}
+                    {% endfor %}
+                </select>
+                <p class="help-block">{{translate("LOCALE.ACCOUNT")}}.</p>
+            </div>
+        {% endblock %}
+    </div>
+    <div class="box-footer text-center">
+        <button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
+        <button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
+    </div>
+</form>
diff --git a/main/app/sprinkles/account/templates/mail/password-reset.html.twig b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
new file mode 100755
index 0000000..37096ce
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/password-reset.html.twig
@@ -0,0 +1,22 @@
+{% block subject %}
+    {{site.title}} - your password reset request
+{% endblock %}
+
+{% block body %}
+<p>Dear {{user.first_name}},
+</p>
+<p>
+A lost password request has been submitted for your account with {{site.title}} ({{site.uri.public}}) on {{request_date | date('m/d/Y g:i A')}}.
+</p>
+<p>
+If you or someone you trust sent this request, and you wish to set a new password, please click this link: <a href="{{site.uri.public}}/account/set-password/confirm?token={{token}}">{{site.uri.public}}/account/set-password/confirm?token={{token}}</a>
+</p>
+
+<p>
+If you did <b>not</b> expect this email, you may click this link to cancel the request: <a href="{{site.uri.public}}/account/set-password/deny?token={{token}}">{{site.uri.public}}/account/set-password/deny?token={{token}}</a>, or simply do nothing and the request will expire on its own.
+</p>
+<p>
+With regards,<br>
+The {{site.title}} Team
+</p>
+{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/mail/resend-verification.html.twig b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
new file mode 100755
index 0000000..ba1c243
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/resend-verification.html.twig
@@ -0,0 +1,17 @@
+{% block subject %}
+    {{site.title}} - verify your account
+{% endblock %}
+
+{% block body %}
+<p>Dear {{user.first_name}},
+</p>
+<p>
+We have received a new verification request for your account with {{site.title}} ({{site.uri.public}}).  Please follow the link below to verify your account.  If your account is already active, please disregard this message.
+</p>
+<a href="{{site.uri.public}}/account/verify?token={{token}}">{{site.uri.public}}/account/verify?token={{token}}</a>
+</p>
+<p>
+With regards,<br>
+The {{site.title}} Team
+</p>
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/mail/verify-account.html.twig b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
new file mode 100755
index 0000000..aa342c7
--- /dev/null
+++ b/main/app/sprinkles/account/templates/mail/verify-account.html.twig
@@ -0,0 +1,21 @@
+{% block subject %}
+    Welcome to {{site.title}} - please verify your account
+{% endblock %}
+
+{% block body %}
+<p>Dear {{user.first_name}},
+</p>
+<p>
+You are receiving this email because you registered with {{site.title}} ({{site.uri.public}}).
+</p>
+<p>
+You will need to verify your account before you can login. Please follow the link below to verify your account.
+</p>
+<p>
+<a href="{{site.uri.public}}/account/verify?token={{token}}">{{site.uri.public}}/account/verify?token={{token}}</a>
+</p>
+<p>
+With regards,<br>
+The {{site.title}} Team
+</p>
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/modals/tos.html.twig b/main/app/sprinkles/account/templates/modals/tos.html.twig
new file mode 100755
index 0000000..d51d897
--- /dev/null
+++ b/main/app/sprinkles/account/templates/modals/tos.html.twig
@@ -0,0 +1,16 @@
+{% extends 'modals/modal.html.twig' %}
+
+{% block modal_title %}
+    {{translate("TOS_FOR", {title: site.title})}}
+{% endblock %}
+
+{% block modal_body %}
+    <div class="text-left">
+        {% include 'pages/partials/legal.html.twig' %}
+        {% include 'pages/partials/privacy.html.twig' %}
+    </div>
+{% endblock %}
+
+{% block modal_footer %}
+    <button type="button" data-dismiss="modal" class="btn btn-primary btn-block">Got it!</button>
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/navigation/main-nav.html.twig b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
new file mode 100755
index 0000000..e44c9c8
--- /dev/null
+++ b/main/app/sprinkles/account/templates/navigation/main-nav.html.twig
@@ -0,0 +1,13 @@
+{# This extend the same file from core to add a sign-up/sign-in or "my account" link to the "home page" nav menu. #}
+{% extends "@core/navigation/main-nav.html.twig" %}
+
+{% block secondary_nav %}
+    {{parent()}}
+    {% if not checkAuthenticated() %}
+        <li>
+            <a href="{{site.uri.public}}/account/sign-in" class="nav-highlight">{{translate("SIGNIN")}}</a>
+        </li>
+    {% else %}
+        {% include "navigation/user-card.html.twig" %}
+    {% endif %}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/navigation/user-card.html.twig b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
new file mode 100755
index 0000000..47e18f1
--- /dev/null
+++ b/main/app/sprinkles/account/templates/navigation/user-card.html.twig
@@ -0,0 +1,33 @@
+{% block userCard %}
+<li class="dropdown user user-menu">
+    {% block userCard_nav %}
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+      <img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
+      <span class="hidden-xs">{{current_user.first_name}} {{current_user.last_name}}</span>
+      <i class="fa fa-chevron-down"></i>
+    </a>
+    {% endblock %}
+    <ul class="dropdown-menu">
+      {% block userCard_userInfo %}
+      <!-- User image -->
+      <li class="user-header">
+        <img src="{{ current_user.avatar }}" class="img-circle" alt="User Image">
+        <p>
+          {{current_user.first_name}} {{current_user.last_name}}
+          <small>({{current_user.user_name}})</small>
+        </p>
+      </li>
+      {% endblock %}
+
+      <!-- Menu Footer-->
+      <li class="user-footer">
+          {% block userCard_menu %}
+              {% if checkAccess('uri_account_settings') %}
+                <a href="{{site.uri.public}}/account/settings" class="btn btn-default btn-flat btn-block">{{translate("ACCOUNT.MY")}}</a>
+              {% endif %}
+              <a href="{{site.uri.public}}/account/logout" class="btn btn-default btn-flat btn-block">{{translate("LOGOUT")}}</a>
+          {% endblock %}
+      </li>
+    </ul>
+</li>
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/account-settings.html.twig b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
new file mode 100755
index 0000000..61cd3d0
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
@@ -0,0 +1,45 @@
+{% extends forcedLayout ? forcedLayout  : "pages/abstract/default.html.twig" %}
+
+{% set page_active = "account-settings" %}
+
+{% block stylesheets_page %}
+    <!-- Page-specific CSS asset bundle -->
+    {{ assets.css('css/form-widgets') | raw }}
+{% endblock %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("ACCOUNT.SETTINGS")}}{% endblock %}
+
+{% block page_description %}{{translate("ACCOUNT.SETTINGS.DESCRIPTION")}}{% endblock %}
+
+{% block body_matter %}
+
+    <div class="row">
+        <div class="col-lg-6">
+            {% block settings_profile_box %}
+                <div class="box box-primary">
+                    {% include "forms/settings-profile.html.twig" %}
+                </div>
+            {% endblock %}
+        </div>
+        <div class="col-lg-6">
+            {% block settings_account_box %}
+                <div class="box box-primary">
+                    {% include "forms/settings-account.html.twig" %}
+                </div>
+            {% endblock %}
+        </div>
+    </div>
+{% endblock %}
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+    {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include form widgets JS -->
+    {{ assets.js('js/form-widgets') | raw }}
+
+    <!-- Include page-specific JS -->
+    {{ assets.js('js/pages/account-settings') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
new file mode 100755
index 0000000..6048619
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
@@ -0,0 +1,11 @@
+{% extends "pages/abstract/error.html.twig" %}
+
+{% block page_title %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
+
+{% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
+
+{% block heading %}
+    <i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
+        'url' : site.uri.public ~ '/account/sign-in'
+    }) | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/forgot-password.html.twig b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
new file mode 100755
index 0000000..72b1a2a
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
@@ -0,0 +1,46 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.FORGOTTEN")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.FORGET.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body login-form">
+        <p class="login-box-msg"><strong>{{translate("PASSWORD.FORGOTTEN")}}</strong></p>
+        <p class="login-box-msg">{{translate("PASSWORD.FORGET.EMAIL")}}</p>
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form id="request-password-reset" role="form" action="{{site.uri.public}}/account/forgot-password" method="post" class="r-form">
+            {% include "forms/csrf.html.twig" %}
+            <div class="form-group">
+                <label class="sr-only" for="reset-form-email">{{translate("EMAIL")}}</label>
+                <input type="text" name="email" placeholder="{{translate("EMAIL")}}" class="form-control" id="reset-form-email">
+            </div>
+            <button type="submit" class="btn btn-block btn-primary">{{translate("PASSWORD.FORGET.EMAIL_SEND")}}</button>
+        </form>
+    </div>
+    <!-- /.login-box-body -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+    {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include page-specific JS bundle -->
+    {{ assets.js('js/pages/forgot-password') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/register.html.twig b/main/app/sprinkles/account/templates/pages/register.html.twig
new file mode 100755
index 0000000..bd155ba
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/register.html.twig
@@ -0,0 +1,105 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate('REGISTER')}}{% endblock %}
+
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body register-form">
+        <p class="login-box-msg"><strong>{{translate('REGISTER')}}</strong></p>
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form id="register" role="form" action="{{site.uri.public}}/account/register" method="post" class="r-form">
+            {% include "forms/csrf.html.twig" %}
+            <label for="r-form-first-name">{{translate('NAME_AND_EMAIL')}}</label>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label class="sr-only" for="r-form-first-name">{{translate('FIRST_NAME')}}</label>
+                        <input type="text" name="first_name" placeholder="{{translate('FIRST_NAME')}}" class="form-control" id="r-form-first-name" autocomplete="off">
+                    </div>
+                </div>
+                <div class="col-md-6">
+                    <div class="form-group">
+                        <label class="sr-only" for="r-form-last-name">{{translate('LAST_NAME')}}</label>
+                        <input type="text" name="last_name" placeholder="{{translate('LAST_NAME')}}" class="form-control" id="r-form-last-name" autocomplete="off">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <input type="text" name="email" placeholder="{% if site.registration.require_email_verification %}{{translate('EMAIL.VERIFICATION_REQUIRED')}}{% else %}{{translate('EMAIL.YOUR')}}{% endif %}" class="form-control" id="r-form-email">
+            </div>
+            <div class="form-group">
+                <label for="r-form-username">{{translate('USERNAME')}}</label>
+                <span class="pull-right"><a href="#" id="form-register-username-suggest">[{{translate('SUGGEST')}}]</a></span>
+                <input type="text" name="user_name" placeholder="{{translate('USERNAME.CHOOSE')}}" class="form-control" id="r-form-username" autocomplete="off">
+            </div>
+            <div class="form-group">
+                <label for="r-form-password">{{translate('PASSWORD')}}</label>
+                <input type="password" name="password" placeholder="{{translate('PASSWORD.BETWEEN', {min: 12, max: 100})}}" class="form-control" id="r-form-password">
+            </div>
+            <div class="form-group">
+                <label class="sr-only" for="r-form-passwordc">{{translate('PASSWORD.CONFIRM')}}</label>
+                <input type="password" name="passwordc" placeholder="{{translate('PASSWORD.CONFIRM')}}" class="form-control" id="r-form-passwordc">
+            </div>
+            {% if site.registration.captcha %}
+                <div class="form-group">
+                    <label class="sr-only" for="r-form-passwordc">{{translate('CAPTCHA.VERIFY')}}</label>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <input type="text" name="captcha" placeholder="{{translate('CAPTCHA.SPECIFY')}}" class="form-control" id="r-form-captcha">
+                        </div>
+                        <div class="col-md-6 form-col-captcha">
+                                <img src="{{site.uri.public}}/account/captcha" id="captcha" data-target="#r-form-captcha">
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+            <div class="collapse">
+                <label>Spiderbro: Don't change me bro, I'm tryin'a catch some flies!</label>
+                <input name="spiderbro" id="spiderbro" value="http://"/>
+            </div>
+            <div class="text-left">
+                <p>
+                    {{translate('TOS_AGREEMENT', {
+                        'site_title' : site.title,
+                        'link_attributes' : 'class="js-show-tos" href="#" data-toggle="modal"'
+                    }) | raw}}
+                </p>
+            </div>
+            <div>
+                <button type="submit" class="btn btn-block btn-primary">{{translate('REGISTER_ME')}}</button>
+            </div>
+            <div style="padding-top: 10px;">
+                {{translate('SIGN_IN_HERE', {
+                    'url' : site.uri.public ~'/account/sign-in'
+                }) | raw}}
+            </div>
+        </form>
+    </div>
+    <!-- /.login-box-body -->
+
+</div>
+<!-- /.login-box -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+        {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include page-specific JS -->
+    {{ assets.js('js/pages/register') | raw }}
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/resend-verification.html.twig b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
new file mode 100755
index 0000000..627dce0
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
@@ -0,0 +1,46 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("ACCOUNT.VERIFICATION.RESEND")}}{% endblock %}
+
+{% block page_description %}{{translate("ACCOUNT.VERIFICATION.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body login-form">
+        <p class="login-box-msg"><strong>{{translate("ACCOUNT.VERIFICATION.RESEND")}}</strong></p>
+        <p class="login-box-msg">{{translate("ACCOUNT.VERIFICATION.EMAIL")}}</p>
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form id="request-verification-email" role="form" action="{{site.uri.public}}/account/resend-verification" method="post" class="r-form">
+            {% include "forms/csrf.html.twig" %}
+            <div class="form-group">
+                <label class="sr-only" for="verification-form-email">{{translate("EMAIL")}}</label>
+                <input type="text" name="email" placeholder="{{translate("EMAIL")}}" class="form-control" id="verification-form-email">
+            </div>
+            <button type="submit" class="btn btn-block btn-primary">{{translate("ACCOUNT.VERIFICATION.SEND")}}</button>
+        </form>
+    </div>
+    <!-- /.login-box-body -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+    {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include page-specific JS -->
+    {{ assets.js('js/pages/resend-verification') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/reset-password.html.twig b/main/app/sprinkles/account/templates/pages/reset-password.html.twig
new file mode 100755
index 0000000..8e3a24a
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/reset-password.html.twig
@@ -0,0 +1,56 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.RESET")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.RESET.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body login-form">
+        <p class="login-box-msg"><strong>{{translate("PASSWORD.RESET")}}</strong></p>
+        <p class="login-box-msg">{{translate("PASSWORD.RESET.CHOOSE")}}</p>
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form id="set-or-reset-password" role="form" action="{{site.uri.public}}/account/set-password" method="post" class="r-form">
+            {% include "forms/csrf.html.twig" %}
+            {# Prevent browsers from trying to autofill the password field.  See http://stackoverflow.com/a/23234498/2970321 #}
+            <input type="text" style="display:none">
+            <input type="password" style="display:none">
+
+            <div class="form-group">
+                <label class="sr-only" for="form-password">{{translate("PASSWORD.NEW")}}</label>
+                <input type="password" name="password" placeholder="{{translate("PASSWORD.BETWEEN", {min: 12, max: 100})}}" class="form-control" id="form-password">
+            </div>
+
+            <div class="form-group">
+                <label class="sr-only" for="form-passwordc">{{translate("PASSWORD.CONFIRM_NEW")}}</label>
+                <input type="password" name="passwordc" placeholder="{{translate("PASSWORD.CONFIRM_NEW_EXPLAIN")}}" class="form-control" id="form-passwordc">
+            </div>
+            <input type="hidden" name="token" value="{{token}}">
+            <button type="submit" class="btn btn-block btn-primary">{{translate("PASSWORD.RESET.SEND")}}</button>
+        </form>
+    </div>
+    <!-- /.login-box-body -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+    {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include page-specific JS bundle -->
+    {{ assets.js('js/pages/set-or-reset-password') | raw }}
+
+{% endblock %}
diff --git a/main/app/sprinkles/account/templates/pages/set-password.html.twig b/main/app/sprinkles/account/templates/pages/set-password.html.twig
new file mode 100755
index 0000000..3c4fe2b
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/set-password.html.twig
@@ -0,0 +1,55 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate("PASSWORD.CREATE")}}{% endblock %}
+
+{% block page_description %}{{translate("PASSWORD.CREATE.PAGE")}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body login-form">
+        <p class="login-box-msg"><strong>{{translate("PASSWORD.CREATE")}}</strong></p>
+        <p class="login-box-msg">{{translate("WELCOME_TO", {'title': site.title})}} {{translate("PASSWORD.CREATE.PAGE")}}</p>
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form id="set-or-reset-password" role="form" action="{{site.uri.public}}/account/set-password" method="post" class="r-form">
+            {% include "forms/csrf.html.twig" %}
+            {# Prevent browsers from trying to autofill the password field.  See http://stackoverflow.com/a/23234498/2970321 #}
+            <input type="text" style="display:none">
+            <input type="password" style="display:none">
+
+            <div class="form-group">
+                <label class="sr-only" for="form-password">{{translate('PASSWORD')}}</label>
+                <input type="password" name="password" placeholder="{{translate('PASSWORD.BETWEEN', {min: 12, max: 100})}}" class="form-control" id="form-password">
+            </div>
+            <div class="form-group">
+                <label class="sr-only" for="form-passwordc">{{translate('PASSWORD.CONFIRM')}}</label>
+                <input type="password" name="passwordc" placeholder="{{translate('PASSWORD.CONFIRM')}}" class="form-control" id="form-passwordc">
+            </div>
+            <input type="hidden" name="token" value="{{token}}">
+            <button type="submit" class="btn btn-block btn-primary">{{translate('PASSWORD.CREATE.SET')}}</button>
+        </form>
+    </div>
+    <!-- /.login-box-body -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+    {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <!-- Include page-specific JS bundle -->
+    {{ assets.js('js/pages/set-or-reset-password') | raw }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/pages/sign-in.html.twig b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
new file mode 100755
index 0000000..2fb6e1c
--- /dev/null
+++ b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
@@ -0,0 +1,84 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{# Overrides blocks in head of base template #}
+{% block page_title %}{{translate('SIGNIN')}}{% endblock %}
+
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div class="login-box">
+    <div class="login-logo">
+        <a href="{{site.uri.public}}">{{site.title}}</a>
+    </div>
+    <!-- /.login-logo -->
+
+    <div class="login-box-body login-form">
+        <p class="login-box-msg"><strong>{{translate('SIGNIN')}}</strong></p>
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        <form action="{{site.uri.public}}/account/login" id="sign-in" method="post">
+          {% include "forms/csrf.html.twig" %}
+          <div class="form-group has-feedback">
+            <input type="text" class="form-control" placeholder="{% if site.login.enable_email %}{{translate('EMAIL_OR_USERNAME')}}{% else %}{{translate('USERNAME')}}{% endif %}" name="user_name">
+            <i class="glyphicon glyphicon-user form-control-icon" aria-hidden="true"></i>
+          </div>
+          <div class="form-group has-feedback">
+            <input type="password" class="form-control" placeholder="{{translate('PASSWORD')}}" name="password">
+            <i class="glyphicon glyphicon-lock form-control-icon" aria-hidden="true"></i>
+          </div>
+          <div class="row">
+            <div class="col-xs-8">
+              <div class="checkbox icheck">
+                <label>
+                  <input type="checkbox" class="js-icheck" name="rememberme"> {{translate('REMEMBER_ME')}}
+                </label>
+              </div>
+            </div>
+            <!-- /.col -->
+            <div class="col-xs-4">
+              <button type="submit" class="btn btn-primary btn-block btn-flat">{{translate('LOGIN')}}</button>
+            </div>
+            <!-- /.col -->
+          </div>
+        </form>
+
+        <a href="{{site.uri.public}}/account/forgot-password">{{translate('PASSWORD.FORGET')}}</a><br>
+        {% if site.registration.require_email_verification %}
+            <a href="{{site.uri.public}}/account/resend-verification">{{translate('ACCOUNT.VERIFICATION.RESEND')}}</a><br>
+        {% endif %}
+        {% if site.registration.enabled %}
+            <a href="{{site.uri.public}}/account/register">{{translate('REGISTER')}}</a>
+        {% endif %}
+
+    </div>
+    <!-- /.login-box-body -->
+</div>
+<!-- /.login-box -->
+{% endblock %}
+
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+        {% include "pages/partials/page.js.twig" %}
+    </script>
+
+    <script>
+    site = $.extend(
+        true,               // deep extend
+        {
+            "registration" : {
+                "enabled" : "{{site.registration.enabled}}"
+            }
+        },
+        site
+    );
+    </script>
+
+    <!-- Include page-specific JS -->
+    {{ assets.js('js/pages/sign-in') | raw }}
+{% endblock %}