From a4cf86d9dc5965fd545c43a9b0a9a9735bbf0b86 Mon Sep 17 00:00:00 2001 From: Zatalyz Date: Wed, 18 Jan 2023 12:29:07 +0100 Subject: [PATCH 1/5] =?UTF-8?q?refactor(core):=20int=C3=A9gration=20des=20?= =?UTF-8?q?modifications=20pour=20l'update=20vers=20SMF=202.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SMF est passée en version 2.1.3 ; quelques changements mineurs dans le thème (proposés par SMF en automatique) afin d'évoluer. Plus d'informations sur [la note de version de SMF.](https://www.simplemachines.org/community/index.php?topic=584230.0) --- khbb/Errors.template.php | 17 ++++++------- khbb/Help.template.php | 6 ++--- khbb/Likes.template.php | 4 ++-- khbb/ModerationCenter.template.php | 4 ++-- khbb/Packages.template.php | 5 ++-- khbb/PersonalMessage.template.php | 4 ++-- khbb/Profile.template.php | 6 ++--- khbb/Register.template.php | 4 ++-- khbb/Themes.template.php | 4 ++-- khbb/Who.template.php | 4 ++-- khbb/css/index.css | 37 ++++++++++++++++++++--------- khbb/index.template.php | 2 +- khbb/languages/index.english.php | 6 ++--- khbb/languages/index.french.php | 6 ++--- khbb/scripts/jquery.sceditor.smf.js | 14 +++++------ khbb/scripts/theme.js | 2 +- 16 files changed, 69 insertions(+), 56 deletions(-) diff --git a/khbb/Errors.template.php b/khbb/Errors.template.php index 8708136..005e97a 100644 --- a/khbb/Errors.template.php +++ b/khbb/Errors.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.0 + * @version 2.1.3 */ // @todo @@ -83,10 +83,17 @@ function template_error_log() return; } + if ($context['has_filter']) + echo ' +
+ ', $txt['applying_filter'], ': ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], ' +
'; + echo '
+ ', ($context['has_filter'] ? '' . $txt['clear_filter'] . '' : ''), '
', $txt['apply_filter_of_type'], ':'; @@ -109,12 +116,6 @@ function template_error_log() '; - if ($context['has_filter']) - echo ' -
- ', $txt['applying_filter'], ': ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], ' [', $txt['clear_filter'], '] -
'; - // We have some errors, must be some mods installed :P foreach ($context['errors'] as $error) { @@ -207,7 +208,7 @@ function template_show_file() ', $context['file_data']['file'], ' - + ', template_css(), ' '; diff --git a/khbb/Help.template.php b/khbb/Help.template.php index f9ed88d..d9157bb 100644 --- a/khbb/Help.template.php +++ b/khbb/Help.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.0 + * @version 2.1.3 */ /** @@ -24,7 +24,7 @@ function template_popup() ', $context['page_title'], ' - + ', template_css(), ' @@ -50,7 +50,7 @@ function template_find_members() ', $txt['find_members'], ' - + ', template_css(), ' diff --git a/khbb/ModerationCenter.template.php b/khbb/ModerationCenter.template.php index 570b0da..0b3dccc 100644 --- a/khbb/ModerationCenter.template.php +++ b/khbb/ModerationCenter.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.0 + * @version 2.1.3 */ /** @@ -546,7 +546,7 @@ function template_show_notice() ', $context['page_title'], ' - + ', template_css(), '
diff --git a/khbb/Packages.template.php b/khbb/Packages.template.php index 11987ca..3eb129f 100644 --- a/khbb/Packages.template.php +++ b/khbb/Packages.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.0 + * @version 2.1.3 */ /** @@ -1316,8 +1316,7 @@ function template_view_operations() ', $txt['operation_title'], ' - - '; + ', template_css(); template_javascript(); diff --git a/khbb/PersonalMessage.template.php b/khbb/PersonalMessage.template.php index 5503471..976b277 100644 --- a/khbb/PersonalMessage.template.php +++ b/khbb/PersonalMessage.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.2 + * @version 2.1.3 */ /** @@ -422,7 +422,7 @@ function template_single_pm($message) // Show the profile button if ($message['member']['can_view_profile']) echo ' -
  • ', ($settings['use_image_buttons'] ? '' : $txt['view_profile']), '
    • '; +
  • ', ($settings['use_image_buttons'] ? '' : $txt['view_profile']), '
    • '; // Don't show an icon if they haven't specified a website. if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website'])) diff --git a/khbb/Profile.template.php b/khbb/Profile.template.php index d5116dc..bf520d3 100644 --- a/khbb/Profile.template.php +++ b/khbb/Profile.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.2 + * @version 2.1.3 */ /** @@ -1883,7 +1883,7 @@ function template_alert_configuration()
    - +
    '; echo ' @@ -2955,7 +2955,7 @@ function template_profile_avatar_select() var size = avatar.alt.substr(3, 2) + " " + avatar.alt.substr(0, 2) + String.fromCharCode(117, 98, 116); var file = document.getElementById("file"); - if (avatar.src.indexOf("blank.png") > -1) + if (avatar.src.indexOf("blank.png") > -1 || selavatar.indexOf("blank.png") == -1) changeSel(selavatar); else previewExternalAvatar(avatar.src) diff --git a/khbb/Register.template.php b/khbb/Register.template.php index f79be14..f109b56 100644 --- a/khbb/Register.template.php +++ b/khbb/Register.template.php @@ -7,7 +7,7 @@ * @copyright 2022 Simple Machines and individual contributors * @license https://www.simplemachines.org/about/smf/license.php BSD * - * @version 2.1.0 + * @version 2.1.3 */ /** @@ -452,7 +452,7 @@ function template_verification_sound() ', $txt['visual_verification_sound'], ' - + ', template_css(), '