From 9822df60c85183221bd27935524a35bd00fa7f50 Mon Sep 17 00:00:00 2001
From: HWFord <54360213+HWFord@users.noreply.github.com>
Date: Thu, 2 Jul 2026 13:16:38 +0200
Subject: [PATCH] issue #2516 update admin messages

adjust margin for messages with links
change display for edit album, change ".show" to change css display for flex instead of block
remove bullets for multiple messages displayed
---
 admin/intro.php                                 |  4 ++--
 admin/themes/default/css/components/general.css | 10 ++++++++--
 admin/themes/default/js/cat_modify.js           |  6 +++---
 admin/themes/default/template/admin.tpl         | 16 ----------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/admin/intro.php b/admin/intro.php
index 30e7d92da..baaa9d78a 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -66,7 +66,7 @@ if ($nb_orphans > 0)
 {
   $orphans_url = PHPWG_ROOT_PATH.'admin.php?page=batch_manager&amp;filter=prefilter-no_album';
 
-  $message = '<a href="'.$orphans_url.'"><i class="icon-heart-broken"></i>';
+  $message = '<a href="'.$orphans_url.'" class="no-margin"><i class="icon-heart-broken"></i>';
   $message.= l10n('Orphans').'</a>';
   $message.= '<span class="adminMenubarCounter">'.$nb_orphans.'</span>';
 
@@ -84,7 +84,7 @@ if ($locked_album > 0)
 {
   $locked_album_url = PHPWG_ROOT_PATH.'admin.php?page=cat_options&section=visible';
 
-  $message = '<a href="'.$locked_album_url.'"><i class="icon-cone"></i>';
+  $message = '<a href="'.$locked_album_url.'" class="no-margin"><i class="icon-cone"></i>';
   $message.= l10n('Locked album').'</a>';
   $message.= '<span class="adminMenubarCounter">'.$locked_album.'</span>';
 
diff --git a/admin/themes/default/css/components/general.css b/admin/themes/default/css/components/general.css
index 2df870e68..f86b0e027 100644
--- a/admin/themes/default/css/components/general.css
+++ b/admin/themes/default/css/components/general.css
@@ -335,7 +335,6 @@ Info
   margin:0 5px;
   padding: 2px 7px;
   cursor:pointer;
-  margin-right:-2px;
 }
 
 .info.hide {
@@ -416,7 +415,6 @@ Info
 
 .eiw-icon,
 #photosAddContent .infos ul li a i,
-.eiw ul li a i,
 .AddAlbumErrors::before,
 .groupError::before,
 .ValidationUserDissociated i,
@@ -425,6 +423,14 @@ Info
   font-size: 16px;
 }
 
+.eiw ul li a i{
+  margin-right:0;
+}
+
+.eiw ul li a.no-margin{
+  margin:0;
+}
+
 .AddAlbumErrors::before,
 .groupError::before{
   margin-top: 3px;
diff --git a/admin/themes/default/js/cat_modify.js b/admin/themes/default/js/cat_modify.js
index 4c6a37ea8..4136b5082 100644
--- a/admin/themes/default/js/cat_modify.js
+++ b/admin/themes/default/js/cat_modify.js
@@ -87,7 +87,7 @@ jQuery(document).ready(function() {
         if (data.stat == "ok") {
           save_button_set_loading(false)
 
-          $('.info-message').show()
+          $('.info-message').css('display', 'flex');
           $('.cat-modification .cat-modify-info-subcontent').html(str_just_now)
           $('.cat-modification .cat-modify-info-content').html(str_just_now)
 
@@ -364,7 +364,7 @@ jQuery(document).ready(function() {
 
           temp_txt = $(".info-message").text();
           $(".info-message").text(str_album_comment_allow);
-          $(".info-message").show();
+          $(".info-message").css('display', 'flex');
 
           setTimeout(
             function() {
@@ -412,7 +412,7 @@ jQuery(document).ready(function() {
 
           temp_txt = $(".info-message").text();
           $(".info-message").text(str_album_comment_disallow);
-          $(".info-message").show();
+          $(".info-message").css('display', 'flex');
 
           setTimeout(
             function() {
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index d6db48497..0b1a87a47 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -26,23 +26,7 @@ $('#menubar').lightAccordion({
   active: {$ACTIVE_MENU}
 });
 
-/* in case we have several infos/errors/warnings display bullets */
-jQuery(document).ready(function() {
-  var eiw = ["infos","erros","warnings", "messages"];
 
-  for (var i = 0; i < eiw.length; i++) {
-    var boxType = eiw[i];
-
-    if (jQuery("."+boxType+" ul li").length > 1) {
-      jQuery("."+boxType+" ul li").css("list-style-type", "square");
-      jQuery("."+boxType+" .eiw-icon").css("margin-right", "20px");
-    }
-  }
-
-  if (jQuery('h2').length > 0) {
-    jQuery('h1').html(jQuery('h2').html());
-  }
-});
 {/footer_script}
 
 <div id="menubar">