From ee1f9563abb265076c6a4661186b6270f0f4b5d6 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Mon, 8 Jan 2018 16:11:50 +0200
Subject: [PATCH] Issue #2933028: Added the header and footer regions in
[Better Login] template pages. + and Not to enable when we update an old
Varbase site.
---
.../templates/betterlogin/page--user--login.html.twig | 11 ++++++++++-
.../betterlogin/page--user--password.html.twig | 11 ++++++++++-
.../betterlogin/page--user--register.html.twig | 11 ++++++++++-
.../templates/betterlogin/page--user--reset.html.twig | 11 ++++++++++-
.../templates/betterlogin/page--user--login.html.twig | 11 ++++++++++-
.../betterlogin/page--user--password.html.twig | 11 ++++++++++-
.../betterlogin/page--user--register.html.twig | 11 ++++++++++-
.../templates/betterlogin/page--user--reset.html.twig | 11 ++++++++++-
varbase.install | 9 ---------
9 files changed, 80 insertions(+), 17 deletions(-)
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
index d11e7cad..4a8248de 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user login.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
index 0691f3e7..a8bb35e6 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user password.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
index be413799..5f506056 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user register.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
index 0691f3e7..e4456a39 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user reset.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--login.html.twig b/themes/vartheme/templates/betterlogin/page--user--login.html.twig
index 2aa9a020..92dc7d65 100644
--- a/themes/vartheme/templates/betterlogin/page--user--login.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--login.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user login.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--password.html.twig b/themes/vartheme/templates/betterlogin/page--user--password.html.twig
index 9de0b54d..ac7aa8ba 100644
--- a/themes/vartheme/templates/betterlogin/page--user--password.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--password.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user password.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--register.html.twig b/themes/vartheme/templates/betterlogin/page--user--register.html.twig
index 9319faba..1abf8246 100644
--- a/themes/vartheme/templates/betterlogin/page--user--register.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--register.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user register.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--reset.html.twig b/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
index 9de0b54d..0c4a568d 100644
--- a/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user reset.
+ */
+#}
+
+{% extends "page.html.twig" %}
+
{# Main #}
{% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
<div class="row">
<div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
<div id="top-part">
diff --git a/varbase.install b/varbase.install
index 2131fa3c..9d672248 100644
--- a/varbase.install
+++ b/varbase.install
@@ -542,12 +542,3 @@ function varbase_update_8042() {
\Drupal::service('module_installer')->install(['settings_tray'], FALSE);
}
}
-
-/**
- * Enable Better Login module.
- */
-function varbase_update_8043() {
- if (!\Drupal::moduleHandler()->moduleExists('betterlogin')) {
- \Drupal::service('module_installer')->install(['betterlogin'], FALSE);
- }
-}
--
GitLab