From 3cb5f3d07e378220b10b507b61154fb5a764a8b8 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Thu, 19 Nov 2020 14:48:36 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02847=20-=20Improve=20fatal=20error=20pag?=
 =?UTF-8?q?e=20message?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/setup.scss                                         | 6 +++---
 dictionaries/ui/pages/en.dictionary.itop.errorpage.php | 3 +++
 sources/application/WebPage/ErrorPage.php              | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/css/setup.scss b/css/setup.scss
index 05967d62f..881254ef5 100644
--- a/css/setup.scss
+++ b/css/setup.scss
@@ -244,9 +244,6 @@ h3.clickable.open {
 		font-weight: bold;
 		margin-right: 5px;
 	}
-	~ .message{
-		margin-top: 6px;
-	}
     &.message-valid{
         color: $message-valid-text-color;
         background-color: $message-valid-bg-color;
@@ -263,6 +260,9 @@ h3.clickable.open {
         border-color: $message-error-border-color;
     }
 }
+*:not(.message) + .message{
+    margin-top: 6px;
+}
 .text-valid{
     color:$message-valid-text-color
 }
diff --git a/dictionaries/ui/pages/en.dictionary.itop.errorpage.php b/dictionaries/ui/pages/en.dictionary.itop.errorpage.php
index cbf55eac4..9219aa331 100644
--- a/dictionaries/ui/pages/en.dictionary.itop.errorpage.php
+++ b/dictionaries/ui/pages/en.dictionary.itop.errorpage.php
@@ -20,4 +20,7 @@
 // Navigation menu
 Dict::Add('EN US', 'English', 'English', array(
 	'UI:ErrorPage:UnstableVersion' => 'You are using an alpha version that may be unstable or include bugs and unfinished features. If you think this error occurred because of this please send us your feedback!',
+	'UI:ErrorPage:KittyDisclaimer' => 'No kitty were injured during the making of this GIF and release.
+
+- The R&amp;D Team',
 ));
\ No newline at end of file
diff --git a/sources/application/WebPage/ErrorPage.php b/sources/application/WebPage/ErrorPage.php
index 341fc11f4..e7032f754 100644
--- a/sources/application/WebPage/ErrorPage.php
+++ b/sources/application/WebPage/ErrorPage.php
@@ -39,8 +39,9 @@ class ErrorPage extends NiceWebPage
 		$this->add("<div class=\"message message-error\">$sText</div>");
 		if(utils::IsEasterEggAllowed())
 		{
-			$this->add('<img src="../images/alpha-fatal-error.gif">');
 			$this->add('<div class="message message-valid">'.Dict::S('UI:ErrorPage:UnstableVersion').'</div>');
+			$this->add('<img src="../images/alpha-fatal-error.gif">');
+			$this->add('<div class="message message-valid">'.nl2br(Dict::S('UI:ErrorPage:KittyDisclaimer')).'</div>');
 		}
 		$this->log_error($sText);
 	}