Accessibility updates

templates/pages/abstract/dashboard.html.twig

@@ -0,0 +1,69 @@
+{% extends "@admin/pages/abstract/dashboard.html.twig" %}
+
+{% block content %}
+    {# This needs to be here (early in the body) to make sure the animation doesn't fire #}
+    <script>
+        (function () {
+          if (Boolean(sessionStorage.getItem('sidebar-toggle-collapsed'))) {
+            var body = document.getElementsByTagName('body')[0];
+            body.className = body.className + ' sidebar-collapse';
+          }
+        })();
+    </script>
+
+    <div class="wrapper">
+      {% block main_header %}
+      <header id="main-header" class="main-header">
+        <!-- Logo -->
+        {{ block('navbar_logo') }}
+
+        <!-- Header Navbar: style can be found in header.less -->
+        <nav class="navbar navbar-static-top">
+            <!-- Sidebar toggle button-->
+            <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
+                <span class="sr-only">Toggle navigation</span>
+            </a>
+            <!-- Main nav buttons -->
+            {% include "navigation/navbar.html.twig" %}
+        </nav>
+      </header>
+      {% endblock %}
+
+      <!-- Left side column. contains the logo and sidebar -->
+      {% block main_sidebar %}
+      <aside id="main-sidebar" class="main-sidebar">
+        <!-- sidebar: style can be found in sidebar.less -->
+        <section class="sidebar">
+            {% include 'navigation/sidebar.html.twig' %}
+        </section>
+        <!-- /.sidebar -->
+      </aside>
+      {% endblock %}
+
+      <!-- Content Wrapper. Contains page content -->
+      {% block main_content %}
+      <main id="main-content" class="content-wrapper">
+        <!-- Content Header (Page header) -->
+        {% block content_header %}
+        <section class="content-header">
+          <h1>{% block header_title %}{{ block('page_title') }}{% endblock %}</h1>
+          {% if block('page_description') is not empty %}<p class="page-description">{% block header_description %}{{ block('page_description') }}{% endblock %}</p>{% endif %}
+          {% block breadcrumb %}{% include 'navigation/breadcrumb.html.twig' with {page_title: block('page_title')} %}{% endblock %}
+          <div id="alerts-page"></div>
+        </section>
+        {% endblock %}
+        <section class="content">
+            {% block body_matter %}{% endblock %}
+        </section>
+      </main>
+      {% endblock %}
+      <!-- /.content-wrapper -->
+
+    <!-- Footer -->
+    {% block main_footer %}
+    {{ block('footer') }}
+    {% endblock %}
+
+    </div>
+    <!-- ./wrapper -->
+{% endblock %}

templates/pages/abstract/loginBox-page.html.twig

@@ -0,0 +1,31 @@
+{% extends "pages/abstract/base.html.twig" %}
+
+{% block body_attributes %}
+    class="hold-transition login-page"
+{% endblock %}
+
+{% block content %}
+<div id="main-content" class="login-box">
+    <header class="login-logo">
+        <h1><a href="{{site.uri.public}}">{{site.title}}</a></h1>
+    </header>
+    <!-- /.login-logo -->
+
+    {% block loginBox %}
+    <main class="login-box-body login-form">
+        <h2 class="login-box-msg">{% block loginBox_title %}{% endblock %}</h2>
+        {% if block('loginBox_subtitle') is not empty %}<p class="login-box-msg">{% block loginBox_subtitle %}{% endblock %}</p>{% endif %}
+
+        <div class="form-alerts" id="alerts-page"></div>
+
+        {% block loginBox_content %}{% endblock %}
+
+        <div class="login-box-footer">
+          {% block loginBox_footer %}{% endblock %}
+        </div>
+    </main>
+    {% endblock %}
+    <!-- /.login-box-body -->
+</div>
+<!-- /.login-box -->
+{% endblock %}

templates/pages/dashboard.html.twig

@@ -1,6 +1,5 @@
-{% extends "@admin/pages/abstract/dashboard.html.twig" %}
+{% extends "pages/abstract/dashboard.html.twig" %}
 
-{# Overrides blocks in head of base template #}
 {% block page_title %}{{ translate("DASHBOARD") }}{% endblock %}
 {% block page_description %}{% endblock %}
 
@@ -301,5 +300,5 @@
 
     <!-- Include page-specific JS -->
     {{ assets.js('js/pages/dashboard') | raw }}
-
 {% endblock %}
+

templates/pages/forgot-password.html.twig

@@ -0,0 +1,21 @@
+{% extends "pages/abstract/loginBox-page.html.twig" %}
+
+{% block page_title %}{{translate("PASSWORD.FORGOTTEN")}}{% endblock %}
+{% block page_description %}{{translate("PASSWORD.FORGET.PAGE")}}{% endblock %}
+
+{% block loginBox_title %}{{translate("PASSWORD.FORGOTTEN")}}{% endblock %}
+{% block loginBox_subtitle %}{{translate("PASSWORD.FORGET.EMAIL")}}{% endblock %}
+{% block loginBox_content %}{% include "forms/forgot-password.html.twig" %}{% endblock %}
+{% block loginBox_footer %}
+    <a href="{{site.uri.public}}/account/sign-in">{{translate('BACK_TO_LOGIN')}}</a>
+{% 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 %}

templates/pages/register.html.twig

@@ -1,19 +1,23 @@
-{% extends "@account/pages/register.html.twig" %}
+{% extends "pages/abstract/loginBox-page.html.twig" %}
 
-{% block content %}
-<div class="login-box">
-    <div class="login-logo">
-        <a href="{{site.uri.public}}">{{site.title}}</a>
+{% block page_title %}{{translate("REGISTER")}}{% endblock %}
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block loginBox_title %}{{translate("REGISTER")}}{% endblock %}
+{% block loginBox_content %}{% include "forms/register.html.twig" %}{% endblock %}
+{% block loginBox_footer %}
+    <div style="padding-top: 10px;">
+        {{translate('SIGN_IN_HERE', {'url' : site.uri.public ~'/account/sign-in'}) | raw}}
+        <a href="{{site.uri.public}}">{{translate('BACK_TO_HOMEPAGE')}}</a>
     </div>
-    <!-- /.login-logo -->
+{% endblock %}
 
-    <div class="login-box-body register-form">
-        <p class="login-box-msg"><strong>{{translate('REGISTER')}}</strong></p>
+{% block scripts_page %}
+    <!-- Include validation rules -->
+    <script>
+        {% include "pages/partials/page.js.twig" %}
+    </script>
 
-        {% include "forms/register.html.twig" %}
-    </div>
-    <!-- /.login-box-body -->
-
-</div>
-<!-- /.login-box -->
-{% endblock %}
+    <!-- Include page-specific JS -->
+    {{ assets.js('js/pages/register') | raw }}
+{% endblock %}

templates/pages/resend-verification.html.twig

@@ -0,0 +1,22 @@
+{% extends "pages/abstract/loginBox-page.html.twig" %}
+
+{% block page_title %}{{translate("ACCOUNT.VERIFICATION.RESEND")}}{% endblock %}
+{% block page_description %}{{translate("ACCOUNT.VERIFICATION.PAGE")}}{% endblock %}
+
+{% block loginBox_title %}{{translate("ACCOUNT.VERIFICATION.RESEND")}}{% endblock %}
+{% block loginBox_subtitle %}{{translate("ACCOUNT.VERIFICATION.EMAIL")}}{% endblock %}
+{% block loginBox_content %}{% include "forms/resend-verification.html.twig" %}{% endblock %}
+{% block loginBox_footer %}
+    <a href="{{site.uri.public}}/account/sign-in">{{translate('BACK_TO_LOGIN')}}</a>
+{% 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 %}

templates/pages/reset-password.html.twig

@@ -0,0 +1,20 @@
+{% extends "pages/abstract/loginBox-page.html.twig" %}
+
+{% block page_title %}{{translate("PASSWORD.RESET")}}{% endblock %}
+{% block page_description %}{{translate("PASSWORD.RESET.PAGE")}}{% endblock %}
+
+{% block loginBox_title %}{{translate("PASSWORD.RESET")}}{% endblock %}
+{% block loginBox_subtitle %}{{translate("PASSWORD.RESET.CHOOSE")}}{% endblock %}
+{% block loginBox_content %}{% include "forms/reset-password.html.twig" %}{% endblock %}
+{% block loginBox_footer %}{% 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 %}

templates/pages/set-password.html.twig

@@ -0,0 +1,20 @@
+{% extends "pages/abstract/loginBox-page.html.twig" %}
+
+{% block page_title %}{{translate("PASSWORD.CREATE")}}{% endblock %}
+{% block page_description %}{{translate("PASSWORD.CREATE.PAGE")}}{% endblock %}
+
+{% block loginBox_title %}{{translate("PASSWORD.CREATE")}}{% endblock %}
+{% block loginBox_subtitle %}{{translate("WELCOME_TO", {'title': site.title})}} {{translate("PASSWORD.CREATE.PAGE")}}{% endblock %}
+{% block loginBox_content %}{% include "forms/set-password.html.twig" %}{% endblock %}
+{% block loginBox_footer %}{% 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 %}

templates/pages/sign-in.html.twig

@@ -0,0 +1,39 @@
+{% extends "pages/abstract/loginBox-page.html.twig" %}
+
+{% block page_title %}{{translate('SIGNIN')}}{% endblock %}
+{% block page_description %}{{translate('PAGE.LOGIN.DESCRIPTION', {'site_name': site.title })}}{% endblock %}
+
+{% block loginBox_title %}{{translate('SIGNIN')}}{% endblock %}
+{% block loginBox_content %}{% include "forms/sign-in.html.twig" %}{% endblock %}
+{% block loginBox_footer %}
+    <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><br>
+    {% endif %}
+    <a href="{{site.uri.public}}">{{translate('BACK_TO_HOMEPAGE')}}</a>
+{% 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 %}