From 4a441bee1fe09313a7ac23e65a5390d5581fb076 Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <matthieu.leproux@gmail.com>
Date: Tue, 27 Sep 2022 16:39:54 +0200
Subject: [PATCH] fixed #1737 error and warning alerts are displayed properly

---
 .../default/template/photos_add_direct.tpl    | 43 +++++++++----------
 admin/themes/default/theme.css                |  4 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index ae0812260..abd67e091 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -392,6 +392,27 @@ jQuery(document).ready(function(){
 
 <div id="photosAddContent">
 
+{if count($setup_errors) > 0}
+  <div class="errors">
+    <ul>
+    {foreach from=$setup_errors item=error}
+      <li>{$error}</li>
+    {/foreach}
+    </ul>
+  </div>
+  {else}
+    {if count($setup_warnings) > 0}
+  <div class="warnings">
+    <ul>
+      {foreach from=$setup_warnings item=warning}
+      <li>{$warning}</li>
+      {/foreach}
+    </ul>
+    <div class="hideButton" style="text-align:center"><a href="{$hide_warnings_link}">{'Hide'|@translate}</a></div>
+  </div>
+    {/if}
+  {/if} {* $setup_errors *}
+  
   {if $PROMOTE_MOBILE_APPS}
     <div class="promote-apps">
       <div class="promote-content">
@@ -445,26 +466,6 @@ jQuery(document).ready(function(){
   {/if}
 </p>
 
-{if count($setup_errors) > 0}
-<div class="errors">
-  <ul>
-  {foreach from=$setup_errors item=error}
-    <li>{$error}</li>
-  {/foreach}
-  </ul>
-</div>
-{else}
-  {if count($setup_warnings) > 0}
-<div class="warnings">
-  <ul>
-    {foreach from=$setup_warnings item=warning}
-    <li>{$warning}</li>
-    {/foreach}
-  </ul>
-  <div class="hideButton" style="text-align:center"><a href="{$hide_warnings_link}">{'Hide'|@translate}</a></div>
-</div>
-  {/if}
-
   <form id="uploadForm" class="{if $DISPLAY_FORMATS}format-mode{/if}" enctype="multipart/form-data" method="post" action="{$form_action}"{if $NB_ALBUMS == 0} style="display:none;"{/if}>
     {if not $DISPLAY_FORMATS}
     <fieldset class="selectAlbum">
@@ -549,6 +550,4 @@ jQuery(document).ready(function(){
     <div id="uploadedPhotos"></div>
   </fieldset>
 
-{/if} {* $setup_errors *}
-
 </div> <!-- photosAddContent -->
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 412644130..acfd776d6 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -5831,8 +5831,8 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important;
   padding: 5px;
 }
 
-.addAlbumEmpty {text-align: center; position: absolute; top: 45%; left: 50%; transform: translate(-50%, -50%);}
-.addAlbumEmptyCenter {position: relative; margin: auto; height: calc(100vh - 200px);}
+.addAlbumEmpty {text-align: center; position: absolute; top: 45%; left: 50%;}
+/* .addAlbumEmptyCenter {position: relative; margin: auto; height: calc(100vh - 280px);} */
 .addAlbumEmptyTitle {font-size: 35px; font-weight: bold;}
 .addAlbumEmptyInfos {font-size: 14px; margin-bottom: 25px !important; margin-top: 5px !important;}
 .addAlbumEmpty a{display: inline-block; padding: 10px 15px; font-weight: bold; font-size: 14px;}