diff --git a/admin/intro.php b/admin/intro.php index 356f4328e..1cbf28507 100644 --- a/admin/intro.php +++ b/admin/intro.php @@ -46,8 +46,8 @@ $tabsheet->assign(); if (isset($page['nb_pending_comments'])) { - $message = l10n('User comments').' '; - $message.= ''; + $message = l10n('User comments'); + $message.= ''; $message.= l10n('%d waiting for validation', $page['nb_pending_comments']); $message.= ' '; @@ -183,7 +183,7 @@ if ($conf['show_piwigo_latest_news']) if (isset($latest_news['id']) and $latest_news['posted_on'] > time()-60*60*24*30) { $page['messages'][] = sprintf( - '%s %s', + '%s %s', l10n('Latest Piwigo news'), $latest_news['url'], time_since($latest_news['posted_on'], 'year').' ('.$latest_news['posted'].')', diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index 714e76e8b..93b71cdb9 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -877,12 +877,6 @@ li.plupload_delete a.remove-format:hover{color: #474747;} background-color: #f98100; } -.eiw .messages a { - background-color: #00529b; - color: #bde5f8; - padding: 2px 7px; -} - #wImg {background-color: #e5e5e5;} .cat-move-order-popin input[name=recursiveAutoOrder] { @@ -974,4 +968,92 @@ label:has(> .filters-icon-check:disabled), span:has(+ .filters-icon-check:disabl .filter-manager-options-container.selected-filter-container:hover{ background-color: #5D5D5D; -} \ No newline at end of file +} + +/*Success message*/ + +.infos { + color: #254520; + background-color:#EEFFEB; + border-left:6px solid #6DCE5E; +} + +.infos i{ + color:#6DCE5E; +} + +.infos a { + color: #3C3C3C; + background-color: #F6FFF4; + border:1px solid #6DCE5E; +} + +.infos a:hover{ + color: #3C3C3C; +} + +/*Error message*/ + +.errors { + color: #502421; + background-color: #FFE7EB; + border-left: 6px solid #EB3D33; +} + +.errors i{ + color: #EB3D33; +} + +.errors a{ + color: #502421; + background-color: #FFF5F7; + border:1px solid #EB3D33; +} + +.errors a:hover{ + color: #502421; +} + +/*Warning message*/ + +.warnings { + color: #563F26; + background-color:#FFF3DB; + border-left:6px solid #E18C32; +} + +.warnings i { + color: #E18C32; +} + +.warnings a{ + color: #563F26; + background-color: #FFFAEF; + border:1px solid #E18C32; +} + +.warnings a:hover{ + color: #563F26; +} + +/*announcement message*/ + +.messages { + color: #274159; + background-color:#E3F5FF; + border-left:6px solid #4182BE; +} + +.messages i{ + color: #4182BE; +} + +.messages a{ + color: #274159; + background-color: #F5FBFF; + border:1px solid #4182BE; +} + +.messages a:hover{ + color: #274159; +} diff --git a/admin/themes/default/js/photos_add_direct.js b/admin/themes/default/js/photos_add_direct.js index fd60577dd..5fae9aaaa 100644 --- a/admin/themes/default/js/photos_add_direct.js +++ b/admin/themes/default/js/photos_add_direct.js @@ -456,22 +456,22 @@ $(function () { if (addedPhotos.length && updatedPhotos.length) { - $(".infos").append( ''); + $(".infos").append( ''); } else { const infoText = addedPhotos.length ? infoTextAdd : infoTextUpdate; - $(".infos").append(''); + $(".infos").append(''); } if (!formatMode) { html = sprintf( albumSummary_label, - '' + uploadCategory.label + '', + ' ' + uploadCategory.label + '', parseInt(uploadCategory.nb_photos) ); - $(".infos ul").append('
  • ' + html + '
    • '); + $(".infos ul").append('
  • ' + html + '
    • '); } $(".infos").show(); diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index b7d1d6918..d6db48497 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -147,10 +147,9 @@ jQuery(document).ready(function() {
    {if isset($errors)}
    -
    @@ -158,10 +157,9 @@ jQuery(document).ready(function() { {if isset($infos)}
    -
    @@ -169,10 +167,9 @@ jQuery(document).ready(function() { {if isset($warnings)}
    -
    @@ -180,10 +177,9 @@ jQuery(document).ready(function() { {if isset($messages)}
    -
    diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl index 28ba8a705..be8b87519 100644 --- a/admin/themes/default/template/intro.tpl +++ b/admin/themes/default/template/intro.tpl @@ -3,8 +3,8 @@ {combine_script id='jquery.cluetip' load='async' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'} {footer_script require='jquery.cluetip'} -var piwigo_need_update_msg = '{'A new version of Piwigo is available.'|@translate|@escape:"javascript"} '; -var ext_need_update_msg = '{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"} '; +var piwigo_need_update_msg = '{'A new version of Piwigo is available.'|@translate|@escape:"javascript"}{'Latest update'|@translate|@escape:"javascript"}'; +var ext_need_update_msg = '{'Some upgrades are available for extensions.'|@translate|@escape:"javascript"}{'See available updates'|@translate|@escape:"javascript"}'; const str_gb_used = "{'%s GB used'|translate}"; const str_mb_used = "{'%s MB used'|translate}"; const str_gb = "{'%sGB'|translate}".replace(' ', ' '); @@ -37,11 +37,11 @@ jQuery().ready(function(){ piwigo_update = data['result']['piwigo_need_update']; ext_update = data['result']['ext_need_update'] if ((piwigo_update || ext_update) && !jQuery(".warnings").is('div')) - jQuery(".eiw").prepend('
    '); + jQuery(".eiw").prepend('
    '); if (piwigo_update) - jQuery(".warnings ul").append('
  • '+piwigo_need_update_msg+'
    • '); + jQuery(".warnings ul").append('
  • '+piwigo_need_update_msg+'
    • '); if (ext_update) - jQuery(".warnings ul").append('
  • '+ext_need_update_msg+'
    • '); + jQuery(".warnings ul").append('
  • '+ext_need_update_msg+'
    • '); } }); {/if} diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index ccb06e741..90146df54 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -47,7 +47,7 @@ const photosUpdated_label = "{'%d photos updated'|translate|escape:javascript}"; const formatsAdded_label = "{'%d formats added for %d photos'|translate|escape:javascript}"; const formatsUpdated_label = "{'%d formats updated for %d photos'|translate|escape:javascript}"; const batch_Label = "{'Manage this set of %d photos'|translate|escape:javascript}"; -const albumSummary_label = "{'Album "%s" now contains %d photos'|translate|escape:javascript}"; +const albumSummary_label = "{'Album %s now contains %d photos'|translate|escape:javascript}"; const str_format_warning = "{'Error when trying to detect formats'|translate|escape:javascript}"; const str_ok = "{'Ok'|translate|escape:javascript}"; const str_format_warning_multiple = "{'There is multiple image in the database with the following names : %s.'|translate|escape:javascript}"; @@ -128,8 +128,8 @@ let related_categories_ids = {$selected_category|json_encode};
    {/if} - - + +