From 6d98654e1bdf2843708073ae278d18ff8128d7c3 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 14 Jul 2019 15:33:24 +0200
Subject: [PATCH] Move preprodwarning to login-template; Closes #1035
---
modules/core/templates/loginuserpass.twig | 9 +++++++++
templates/base.twig | 13 ++-----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/core/templates/loginuserpass.twig b/modules/core/templates/loginuserpass.twig
index ffb6e926d..43344580e 100644
--- a/modules/core/templates/loginuserpass.twig
+++ b/modules/core/templates/loginuserpass.twig
@@ -7,6 +7,15 @@
{% endblock %}
{% block content %}
+ {%- if not isProduction %}
+
+ <div class="message-box warning">
+ {% trans %}You are now accessing a pre-production system. This authentication setup
+ {#- #} is for testing and pre-production verification only. If someone sent you
+ {#- #} a link that pointed you here, and you are not <i>a tester</i> you
+ {#- #} probably got the wrong link, and should <b>not be here</b>.{% endtrans %}
+ </div>
+ {% endif -%}
{% if errorcode -%}
<div class="pure-g">
<div class="pure-u-1">
diff --git a/templates/base.twig b/templates/base.twig
index e33257b76..5312a9792 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -22,21 +22,12 @@
<div id="content">
<div class="wrap">
- {%- if not isProduction %}
-
- <div class="message-box warning">
- {% trans %}You are now accessing a pre-production system. This authentication setup
- {#- #} is for testing and pre-production verification only. If someone sent you
- {#- #} a link that pointed you here, and you are not <i>a tester</i> you
- {#- #} probably got the wrong link, and should <b>not be here</b>.{% endtrans %}
- </div>
- {% endif -%}
{%- block contentwrapper %}
{%- block content %}{% endblock %}
{%- endblock contentwrapper %}
- </div>
- </div><!-- content -->
+ </div>
+ </div><!-- content -->
<div id="push"></div>
</div><!-- layout -->
<div id="foot">
--
GitLab