From 5a5e04a43b3beba53e2c773f3dc55f9acc0a7460 Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
Date: Sat, 12 Jun 2021 22:29:17 +0200
Subject: Place message boxes outside the <form> elements

---
 theme/admin/html/auth.php      | 20 ++++++++++----------
 theme/admin/html/database.php  | 20 ++++++++++----------
 theme/admin/html/page/form.php | 22 +++++++++++-----------
 theme/admin/html/post/form.php | 22 +++++++++++-----------
 theme/admin/html/user/form.php | 22 +++++++++++-----------
 theme/admin/rsrc/css/main.css  |  4 ++++
 theme/admin/rsrc/css/main.scss |  5 +++++
 7 files changed, 62 insertions(+), 53 deletions(-)

(limited to 'theme/admin')

diff --git a/theme/admin/html/auth.php b/theme/admin/html/auth.php
index ebb7a2a..c1dedda 100644
--- a/theme/admin/html/auth.php
+++ b/theme/admin/html/auth.php
@@ -1,19 +1,19 @@
 <h1><i class="fa fa-sign-in"></i><?=$Language->text('authentication_text')?></h1>
 <p><?=$Language->text('authentication_desc')?></p>
 
+<?php if($FORM['INFO']): ?>
+	<div id="message-list-wrapper">
+		<ul id="message-list">
+			<?php foreach($FORM['INFO'] as $message): ?>
+				<li><?=$message?></li>
+			<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
+
 <form action="" method="POST">
 	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
 
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
 	<div class="flex">
 		<div class="flex-item">
 			<div class="form-icon-flex"><i class="fa fa-user-secret"></i></div>
diff --git a/theme/admin/html/database.php b/theme/admin/html/database.php
index 21701bd..5062ae1 100644
--- a/theme/admin/html/database.php
+++ b/theme/admin/html/database.php
@@ -1,19 +1,19 @@
 <h1><i class="fa fa-database"></i><?=$Language->text('overview_database_text')?></h1>
 <p><?=$Language->text('overview_database_desc')?></p>
 
+<?php if($FORM['INFO']): ?>
+	<div id="message-list-wrapper">
+		<ul id="message-list">
+			<?php foreach($FORM['INFO'] as $message): ?>
+				<li><?=$message?></li>
+			<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
+
 <form action="" method="POST">
 	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
 
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
 	<div class="flex">
 		<textarea id="content-editor" placeholder="<?=$Language->text('database_warning')?>" name="command"><?=escapeHTML($FORM['COMMAND'])?></textarea>
 	</div>
diff --git a/theme/admin/html/page/form.php b/theme/admin/html/page/form.php
index 6a4be33..d26b207 100644
--- a/theme/admin/html/page/form.php
+++ b/theme/admin/html/page/form.php
@@ -1,16 +1,16 @@
+<?php if($FORM['INFO']): ?>
+	<div id="message-list-wrapper">
+		<ul id="message-list">
+			<?php foreach($FORM['INFO'] as $message): ?>
+				<li><?=$message?></li>
+			<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
+
 <form action="" method="POST">
 	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
 
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
 <?php if($FORM['TYPE'] !== 'DELETE'): ?>
 	<div class="flex flex-responsive">
 		<div class="flex-item">
@@ -95,4 +95,4 @@
 			<input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" />
 		<?php endif; ?>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/theme/admin/html/post/form.php b/theme/admin/html/post/form.php
index 50f8fa6..e6966ea 100644
--- a/theme/admin/html/post/form.php
+++ b/theme/admin/html/post/form.php
@@ -1,16 +1,16 @@
+<?php if($FORM['INFO']): ?>
+	<div id="message-list-wrapper">
+		<ul id="message-list">
+			<?php foreach($FORM['INFO'] as $message): ?>
+				<li><?=$message?></li>
+			<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
+
 <form action="" method="POST">
 	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
 
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
 <?php if($FORM['TYPE'] !== 'DELETE'): ?>
 	<div class="flex flex-responsive">
 		<div class="flex-item">
@@ -95,4 +95,4 @@
 			<input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" />
 		<?php endif; ?>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/theme/admin/html/user/form.php b/theme/admin/html/user/form.php
index 9f17cac..970a6d9 100644
--- a/theme/admin/html/user/form.php
+++ b/theme/admin/html/user/form.php
@@ -1,16 +1,16 @@
+<?php if($FORM['INFO']): ?>
+	<div id="message-list-wrapper">
+		<ul id="message-list">
+			<?php foreach($FORM['INFO'] as $message): ?>
+				<li><?=$message?></li>
+			<?php endforeach ?>
+		</ul>
+	</div>
+<?php endif ?>
+
 <form action="" method="POST">
 	<input type="hidden" name="token" value="<?=$FORM['TOKEN']?>" />
 
-	<?php if($FORM['INFO']): ?>
-		<div class="flex flex-direction-column">
-			<ul id="message-list">
-				<?php foreach($FORM['INFO'] as $message): ?>
-					<li><?=$message?></li>
-				<?php endforeach; ?>
-			</ul>
-		</div>
-	<?php endif; ?>
-
 <?php if($FORM['TYPE'] !== 'DELETE'): ?>
 	<div class="flex flex-responsive">
 		<div class="flex-item">
@@ -101,4 +101,4 @@
 			<input id="delete-button" type="submit" name="delete" value="<?=$Language->text('delete')?>" data-text="<?=$Language->text('sure')?>" />
 		<?php endif; ?>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/theme/admin/rsrc/css/main.css b/theme/admin/rsrc/css/main.css
index fb88a04..ba299a2 100644
--- a/theme/admin/rsrc/css/main.css
+++ b/theme/admin/rsrc/css/main.css
@@ -663,6 +663,10 @@ label:after {
   color: #EEE;
   font-size: 0.6rem;
 }
+#message-list-wrapper {
+  margin-bottom: 0.5rem;
+  border: 0.1rem solid #ae3f4a;
+}
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # Search form
diff --git a/theme/admin/rsrc/css/main.scss b/theme/admin/rsrc/css/main.scss
index 275013b..90a938a 100644
--- a/theme/admin/rsrc/css/main.scss
+++ b/theme/admin/rsrc/css/main.scss
@@ -724,6 +724,11 @@ label {
 	background: #C45C66;
 	color: #EEE;
 	font-size: 0.6rem;
+
+	&-wrapper {
+		margin-bottom: 0.5rem;
+		border: 0.1rem solid darken(#C45C66, 10%);
+	}
 }
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-- 
cgit v1.2.3