Move preprodwarning to login-template; Closes #1035

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">

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">