From 6c292f7e5659fc49fbe876c0655d0b6890aaf6bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 27 Jan 2015 13:31:14 +0100
Subject: [PATCH] Move the configuration warning on the login screen further up

..and add translation support to the login screen.

refs #8274
refs #8134
---
 .../views/scripts/authentication/login.phtml  | 30 +++++++++----------
 public/css/icinga/login.less                  |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml
index 7d8d15df8..f05e51e43 100644
--- a/application/views/scripts/authentication/login.phtml
+++ b/application/views/scripts/authentication/login.phtml
@@ -1,11 +1,23 @@
  <div id="login">
   <div class="logo">
    <div class="image">
-    <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" alt="<?= t('The Icinga logo') ?>" >
+    <img class="fade-in one" src="<?= $this->baseUrl('img/logo_icinga_big.png'); ?>" alt="<?= $this->translate('The Icinga logo'); ?>" >
    </div>
   </div>
   <div class="form" data-base-target="layout">
-    <h1>Welcome to Icinga Web 2</h1>
+    <?php if ($requiresSetup): ?>
+    <div class="config-note"><?= sprintf(
+      $this->translate(
+        'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
+        . 'authentication method. Please define a authentication method by following the instructions in the'
+        . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
+      ),
+      '<a href="http://docs.icinga.org/" title="' . $this->translate('Icinga Web 2 Documentation') . '">', // TODO: More exact documentation link..
+      '<a href="' . $this->href('setup') . '" title="' . $this->translate('Icinga Web 2 Setup-Wizard') . '">',
+      '</a>'
+    ); ?></div>
+    <?php endif ?>
+    <h1><?= $this->translate('Welcome to Icinga Web 2'); ?></h1>
    <?php
    /* TODO: remove this as soon as notifications and forms are ready */
    if (isset($this->errorInfo)): ?>
@@ -14,18 +26,6 @@
     </div>
    <?php endif ?>
    <?= $this->form ?>
-   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org">The Icinga Project</a></div>
-   <?php if ($requiresSetup): ?>
-   <div class="config-note"><?= sprintf(
-     t(
-       'It appears that you did not configure Icinga Web 2 yet so it\'s not possible to log in without any defined '
-       . 'authentication method. Please define a authentication method by following the instructions in the'
-       . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.'
-     ),
-     '<a href="http://docs.icinga.org/" title="Icinga Web 2 Documentation">', // TODO: Documentation link
-     '<a href="' . $this->href('setup') . '" title="Icinga Web 2 Setup-Wizard">',
-     '</a>'
-   ); ?></div>
-   <?php endif ?>
+   <div class="footer">Icinga Web 2 &copy; 2013-2015<br><a href="https://www.icinga.org"><?= $this->translate('The Icinga Project'); ?></a></div>
   </div>
  </div>
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index cfae3c478..05649881f 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -116,7 +116,7 @@
   div.config-note {
     width: 50%;
     padding: 1em;
-    margin: 5em auto 0;
+    margin: 0 auto 2.5em;
     text-align: center;
     color: white;
     background-color: @colorCritical;