From 5a3f1a306d11f9ad1ddc4225443dea661265c0fd Mon Sep 17 00:00:00 2001 From: HWFord <54360213+HWFord@users.noreply.github.com> Date: Thu, 19 Feb 2026 11:19:23 +0100 Subject: [PATCH] issue #2516 update message icons change all message icons to circled versions --- admin/themes/default/js/group_list.js | 4 ++-- admin/themes/default/js/user_list.js | 10 +++++----- .../default/template/album_notification.tpl | 2 +- admin/themes/default/template/albums.tpl | 2 +- .../default/template/batch_manager_unit.tpl | 6 +++--- admin/themes/default/template/cat_modify.tpl | 4 ++-- admin/themes/default/template/cat_perm.tpl | 2 +- .../default/template/configuration_comments.tpl | 2 +- .../default/template/configuration_display.tpl | 2 +- .../default/template/configuration_main.tpl | 2 +- .../default/template/configuration_search.tpl | 2 +- .../default/template/configuration_sizes.tpl | 2 +- .../default/template/configuration_watermark.tpl | 2 +- .../default/template/element_set_ranks.tpl | 2 +- admin/themes/default/template/group_list.tpl | 6 +++--- admin/themes/default/template/menubar.tpl | 2 +- .../default/template/notification_by_mail.tpl | 4 ++-- admin/themes/default/template/picture_modify.tpl | 2 +- .../default/template/plugins_installed.tpl | 8 ++++---- admin/themes/default/template/site_update.tpl | 4 ++-- .../default/template/themes_standard_pages.tpl | 4 ++-- admin/themes/default/template/updates_ext.tpl | 8 ++++---- admin/themes/default/template/user_list.tpl | 16 ++++++++-------- 23 files changed, 49 insertions(+), 49 deletions(-) diff --git a/admin/themes/default/js/group_list.js b/admin/themes/default/js/group_list.js index 9751956a1..5962aa625 100644 --- a/admin/themes/default/js/group_list.js +++ b/admin/themes/default/js/group_list.js @@ -722,11 +722,11 @@ var usersInGroup = []; var maxOffsetUserCont = 322; var dissociateUserInfo = $("
" - + "

" + + "

" + "
").appendTo(".group-name-block").hide(); var associateUserInfo = $("
" -+ "

" ++ "

" + "
"); // Setup the user research bar diff --git a/admin/themes/default/js/user_list.js b/admin/themes/default/js/user_list.js index 6dac4b9ac..d51c852ca 100644 --- a/admin/themes/default/js/user_list.js +++ b/admin/themes/default/js/user_list.js @@ -2244,7 +2244,7 @@ function add_infos_to_new_user(user_id, ajax_data) { let new_user_id = data.result.users[0].id; update_user_list(); // add_user_close(); - $('#AddUserUpdated').removeClass('icon-red icon-cancel').addClass('icon-green border-green icon-ok'); + $('#AddUserUpdated').removeClass('icon-red icon-cancel-circled').addClass('icon-green icon-ok-circled'); $('#AddUserUpdatedText').html(user_added_str.replace("%s", ajax_data.username)); const status = ['webmaster', 'admin', 'normal']; if (status.includes(ajax_data.status)) { @@ -2299,7 +2299,7 @@ function send_new_user_password(user_id, mail) { : sprintf(validLinkWithoutMail, response.result.time_validation)); if(send_by_mail && !response.result.send_by_mail) { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(errorMailSent); $('#AddUserTextField').html(sprintf(errorMailSentMsg, response.result.time_validation)); } else if (send_by_mail && response.result.send_by_mail) { @@ -2311,7 +2311,7 @@ function send_new_user_password(user_id, mail) { const successMsg = $('#AddUserUpdatedText'); successMsg.fadeOut(); copyToClipboard(response.result.generated_link); - $('#AddUserUpdated').removeClass('icon-red icon-cancel').addClass('icon-green border-green icon-ok'); + $('#AddUserUpdated').removeClass('icon-red icon-cancel-circled').addClass('icon-green icon-ok-circled'); successMsg.html(copyLinkStr); successMsg.fadeIn(); }); @@ -2320,12 +2320,12 @@ function send_new_user_password(user_id, mail) { add_user_close(); }); } else { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(response.message); } }, error: function(response) { - $('#AddUserUpdated').removeClass('icon-green border-green icon-ok').addClass('icon-red-error icon-cancel'); + $('#AddUserUpdated').removeClass('icon-green icon-ok-circled').addClass('icon-red-error icon-cancel-circled'); $('#AddUserUpdatedText').html(response.message); } }); diff --git a/admin/themes/default/template/album_notification.tpl b/admin/themes/default/template/album_notification.tpl index a984e4b70..cfb976caa 100644 --- a/admin/themes/default/template/album_notification.tpl +++ b/admin/themes/default/template/album_notification.tpl @@ -126,7 +126,7 @@ span.errors { {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/albums.tpl b/admin/themes/default/template/albums.tpl index 5b8f4780e..b4a736c7a 100644 --- a/admin/themes/default/template/albums.tpl +++ b/admin/themes/default/template/albums.tpl @@ -187,7 +187,7 @@ const tiptip_locked_album = "{'Locked album'|translate|escape:javascript}"; -
+
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl index 808c76481..41f7dacfc 100644 --- a/admin/themes/default/template/batch_manager_unit.tpl +++ b/admin/themes/default/template/batch_manager_unit.tpl @@ -132,7 +132,7 @@ pluginValues = [];
@@ -270,7 +270,7 @@ pluginValues = [];
@@ -312,7 +312,7 @@ pluginValues = [];
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl index 09122d2b1..20ef16365 100644 --- a/admin/themes/default/template/cat_modify.tpl +++ b/admin/themes/default/template/cat_modify.tpl @@ -183,8 +183,8 @@ const str_modal_ab = '{'New parent album'|@translate}'; {/if}
-
{'Album updated'|@translate}
-
{'An error has occured while saving album settings'|@translate}
+
{'Album updated'|@translate}
+
{'An error has occured while saving album settings'|@translate}
{'Save Settings'|@translate}
diff --git a/admin/themes/default/template/cat_perm.tpl b/admin/themes/default/template/cat_perm.tpl index 816ffcf6b..35723a1c9 100644 --- a/admin/themes/default/template/cat_perm.tpl +++ b/admin/themes/default/template/cat_perm.tpl @@ -185,7 +185,7 @@ jQuery("#selectStatus").change(function() { {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_comments.tpl b/admin/themes/default/template/configuration_comments.tpl index bddfd7fef..ec14b8254 100644 --- a/admin/themes/default/template/configuration_comments.tpl +++ b/admin/themes/default/template/configuration_comments.tpl @@ -157,7 +157,7 @@ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_display.tpl b/admin/themes/default/template/configuration_display.tpl index fe31f857d..5fa5e04a8 100644 --- a/admin/themes/default/template/configuration_display.tpl +++ b/admin/themes/default/template/configuration_display.tpl @@ -325,7 +325,7 @@ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_main.tpl b/admin/themes/default/template/configuration_main.tpl index c623f0e52..6322af6b5 100644 --- a/admin/themes/default/template/configuration_main.tpl +++ b/admin/themes/default/template/configuration_main.tpl @@ -286,7 +286,7 @@ jQuery("input[name='email_admin_on_new_user_filter']").change(function() { {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_search.tpl b/admin/themes/default/template/configuration_search.tpl index 42b36a0d2..2677c4610 100644 --- a/admin/themes/default/template/configuration_search.tpl +++ b/admin/themes/default/template/configuration_search.tpl @@ -231,7 +231,7 @@ for(const filter_name of filters_names){ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_sizes.tpl b/admin/themes/default/template/configuration_sizes.tpl index 9df0cff92..b723bfa2a 100644 --- a/admin/themes/default/template/configuration_sizes.tpl +++ b/admin/themes/default/template/configuration_sizes.tpl @@ -228,7 +228,7 @@ $(".restore-settings-button").each(function() { {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/configuration_watermark.tpl b/admin/themes/default/template/configuration_watermark.tpl index 8ea6f187e..da55d072c 100644 --- a/admin/themes/default/template/configuration_watermark.tpl +++ b/admin/themes/default/template/configuration_watermark.tpl @@ -136,7 +136,7 @@ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/element_set_ranks.tpl b/admin/themes/default/template/element_set_ranks.tpl index 3fe8eeb11..33d439981 100644 --- a/admin/themes/default/template/element_set_ranks.tpl +++ b/admin/themes/default/template/element_set_ranks.tpl @@ -109,7 +109,7 @@ jQuery('.thumbnail').tipTip({ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl index 707a290da..b051aa5eb 100644 --- a/admin/themes/default/template/group_list.tpl +++ b/admin/themes/default/template/group_list.tpl @@ -76,8 +76,8 @@ usersCache.selectize(jQuery('select.UserSearch')); {$grp_color} {/if}"> -
-
+
+
@@ -173,7 +173,7 @@ usersCache.selectize(jQuery('select.UserSearch'));
-
+

{'Add group'|translate}

diff --git a/admin/themes/default/template/menubar.tpl b/admin/themes/default/template/menubar.tpl index fc5ce8132..62927af2c 100644 --- a/admin/themes/default/template/menubar.tpl +++ b/admin/themes/default/template/menubar.tpl @@ -68,7 +68,7 @@ jQuery(document).ready(function(){ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/notification_by_mail.tpl b/admin/themes/default/template/notification_by_mail.tpl index 5158de45f..8abc7b855 100644 --- a/admin/themes/default/template/notification_by_mail.tpl +++ b/admin/themes/default/template/notification_by_mail.tpl @@ -150,14 +150,14 @@ jQuery(document).ready(function(){ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} {if isset($save_error)}
- {$save_error} + {$save_error}
{/if} diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl index edadecdc4..9569c0f2b 100644 --- a/admin/themes/default/template/picture_modify.tpl +++ b/admin/themes/default/template/picture_modify.tpl @@ -232,7 +232,7 @@ const str_assoc_album_ab = '{'Associate to album'|translate|escape:javascript}'; {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl index 74d52faea..a342f8d43 100644 --- a/admin/themes/default/template/plugins_installed.tpl +++ b/admin/themes/default/template/plugins_installed.tpl @@ -90,25 +90,25 @@ let plugin_filter = searchParams.get('filter');
-
-
-
-
diff --git a/admin/themes/default/template/site_update.tpl b/admin/themes/default/template/site_update.tpl index f58863b43..7af12a29d 100644 --- a/admin/themes/default/template/site_update.tpl +++ b/admin/themes/default/template/site_update.tpl @@ -122,14 +122,14 @@ $('#syncFiles label').click(function () { {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} {if isset($save_error)}
- {$save_error} + {$save_error}
{/if} diff --git a/admin/themes/default/template/themes_standard_pages.tpl b/admin/themes/default/template/themes_standard_pages.tpl index e3330c16a..d475be79e 100644 --- a/admin/themes/default/template/themes_standard_pages.tpl +++ b/admin/themes/default/template/themes_standard_pages.tpl @@ -112,14 +112,14 @@ {if isset($save_success)}
- {$save_success} + {$save_success}
{/if} {if isset($save_error)}
- {$save_error} + {$save_error}
{/if} diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl index a89aa0241..a0521fe46 100644 --- a/admin/themes/default/template/updates_ext.tpl +++ b/admin/themes/default/template/updates_ext.tpl @@ -113,14 +113,14 @@ const callback = (mutationList, observer) => { let popup = jQuery("#jGrowl").children(); for (let i = 0; i < popup.length; i++){ if ((jQuery(popup[i])).hasClass("success")){ - if (! ((jQuery(popup[i]).children(":first")).hasClass("jGrowl-popup-icon icon-ok"))){ - jQuery(popup[i]).prepend('
') + if (! ((jQuery(popup[i]).children(":first")).hasClass("jGrowl-popup-icon icon-ok-circled"))){ + jQuery(popup[i]).prepend('
') } }; if ((jQuery(popup[i])).hasClass("error")){ - if (! ((jQuery(popup[i]).children(":first")).hasClass("jGrowl-popup-icon icon-cancel"))){ - jQuery(popup[i]).prepend('
') + if (! ((jQuery(popup[i]).children(":first")).hasClass("jGrowl-popup-icon icon-cancel-circled"))){ + jQuery(popup[i]).prepend('
') } } }; diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 8f0239e19..ae748f9c9 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -832,11 +832,11 @@ $(document).ready(function() {
{'Close'|@translate} -

- {'User updated'|@translate} - +

+ {'User updated'|@translate} + {'Update'|@translate} -

+
@@ -1133,8 +1133,8 @@ $(document).ready(function() {
{'Close'|@translate}

- {'User updated'|@translate} - + {'User updated'|@translate} + {'Update'|@translate}

@@ -1245,7 +1245,7 @@ $(document).ready(function() {
-
+
@@ -1260,7 +1260,7 @@ $(document).ready(function() {