From 92b7dd3335a6572debeacfb5faa82c63a5e67888 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 8 Jun 2018 20:03:25 +0200
Subject: Some minor fixes

---
 .../templates/pages/account-settings.html.twig     |  88 ++++----
 .../templates/pages/error/compromised.html.twig    |  22 +-
 .../templates/pages/forgot-password.html.twig      |  98 ++++-----
 .../account/templates/pages/register.html.twig     | 234 ++++++++++-----------
 .../templates/pages/resend-verification.html.twig  |  98 ++++-----
 .../templates/pages/reset-password.html.twig       | 120 +++++------
 .../account/templates/pages/sign-in.html.twig      | 180 ++++++++--------
 7 files changed, 420 insertions(+), 420 deletions(-)

(limited to 'main/app/sprinkles/account/templates/pages')

diff --git a/main/app/sprinkles/account/templates/pages/account-settings.html.twig b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
index cfe82c1..4d8bf7a 100644
--- a/main/app/sprinkles/account/templates/pages/account-settings.html.twig
+++ b/main/app/sprinkles/account/templates/pages/account-settings.html.twig
@@ -1,45 +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 }}
+{% 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 %}
\ No newline at end of file
diff --git a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
index c12aa7d..caea258 100644
--- a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
+++ b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig
@@ -1,11 +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 %}
+{% 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
index 2c890a1..a709f7c 100644
--- a/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
+++ b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig
@@ -1,49 +1,49 @@
-{% 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 %}
+{% 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
index bcfc253..7f0b878 100644
--- a/main/app/sprinkles/account/templates/pages/register.html.twig
+++ b/main/app/sprinkles/account/templates/pages/register.html.twig
@@ -1,117 +1,117 @@
-{% 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 %}
+{% 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
index 4bf611c..9b5c55a 100644
--- a/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
+++ b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig
@@ -1,49 +1,49 @@
-{% 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 %}
+{% 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
index 71f6f02..c1cda61 100644
--- a/main/app/sprinkles/account/templates/pages/reset-password.html.twig
+++ b/main/app/sprinkles/account/templates/pages/reset-password.html.twig
@@ -1,60 +1,60 @@
-{% 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 %}
+{% 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/sign-in.html.twig b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
index 4e2e21c..60743cb 100644
--- a/main/app/sprinkles/account/templates/pages/sign-in.html.twig
+++ b/main/app/sprinkles/account/templates/pages/sign-in.html.twig
@@ -1,90 +1,90 @@
-{% 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 %}
+{% 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 %}
-- 
cgit v1.2.3