Khaganat-web/Khaganat-theme-smf
3
0
Fork 0
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into 'main'

Browse source 
refactor(core): intégration des modifications pour l'update vers SMF 2.1.3

See merge request khaganat/web/tpl_khforum!3
This commit is contained in:
yannk 2023-03-05 11:17:08 +01:00
commit 0dc9ef0eef
18 changed files with 130 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
khbb/Display.template.php
View file

@ -264,7 +264,7 @@ function template_main()
// Show the page index... "Pages: [1]". But after all posts.
echo '
<div class="pagesection">
<div class="pagesection khbottom">
<div class="pagelinks">
<a href="#main_content_section" class="button" id="bot">', $txt['go_up'], '</a>
', $context['page_index'], '
@ -273,8 +273,8 @@ function template_main()
', $context['menu_separator'], '
';
// Next - Prev
echo '<span class="nextlinks">', $context['previous_next'], '</span>
';
//echo '<span class="nextlinks">', $context['previous_next'], '</span>'
;
// Mobile action - moderation buttons (bottom)
if (!empty($context['normal_buttons']))

17
khbb/Errors.template.php
View file

@ -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 '
<div class="infobox">
<strong>', $txt['applying_filter'], ':</strong> ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], '
</div>';
echo '
<div class="floatright">
<input type="submit" name="removeSelection" value="', $txt['remove_selection'], '" data-confirm="', $txt['remove_selection_confirm'], '" class="button you_sure">
<input type="submit" name="delall" value="', ($context['has_filter'] ? $txt['remove_filtered_results'] : $txt['remove_all']), '" data-confirm="', ($context['has_filter'] ? $txt['remove_filtered_results_confirm'] : $txt['sure_about_errorlog_remove']), '" class="button you_sure">
', ($context['has_filter'] ? '<a href="' . $scripturl . '?action=admin;area=logs;sa=errorlog' . ($context['sort_direction'] == 'down' ? ';desc' : '') . '" class="button">' . $txt['clear_filter'] . '</a>' : ''), '
</div>
', $txt['apply_filter_of_type'], ':';
@ -109,12 +116,6 @@ function template_error_log()
</div>
</div>';
if ($context['has_filter'])
echo '
<div class="information">
<strong>', $txt['applying_filter'], ':</strong> ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], ' [<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', '">', $txt['clear_filter'], '</a>]
</div>';
// We have some errors, must be some mods installed :P
foreach ($context['errors'] as $error)
{
@ -207,7 +208,7 @@ function template_show_file()
<head>
<meta charset="', $context['character_set'], '">
<title>', $context['file_data']['file'], '</title>
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
</head>
<body>
<table class="errorfile_table">';

6
khbb/Help.template.php
View file

@ -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()
<meta charset="', $context['character_set'], '">
<meta name="robots" content="noindex">
<title>', $context['page_title'], '</title>
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
<script src="', $settings['default_theme_url'], '/scripts/script.js', $context['browser_cache'], '"></script>
</head>
<body id="help_popup">
@ -50,7 +50,7 @@ function template_find_members()
<title>', $txt['find_members'], '</title>
<meta charset="', $context['character_set'], '">
<meta name="robots" content="noindex">
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
<script src="', $settings['default_theme_url'], '/scripts/script.js', $context['browser_cache'], '"></script>
<script>
var membersAdded = [];

4
khbb/Likes.template.php
View file

@ -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()
<meta charset="', $context['character_set'], '">
<meta name="robots" content="noindex">
<title>', $context['page_title'], '</title>
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
<script src="', $settings['default_theme_url'], '/scripts/script.js', $context['browser_cache'], '"></script>
</head>
<body id="likes_popup">

4
khbb/ModerationCenter.template.php
View file

@ -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()
<head>
<meta charset="', $context['character_set'], '">
<title>', $context['page_title'], '</title>
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
</head>
<body>
<div class="cat_bar">

5
khbb/Packages.template.php
View file

@ -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()
<head>
<meta charset="', $context['character_set'], '">
<title>', $txt['operation_title'], '</title>
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
<link rel="stylesheet" href="', $settings['theme_url'], '/css/admin.css', $context['browser_cache'], '">';
', template_css();
template_javascript();

4
khbb/PersonalMessage.template.php
View file

@ -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 '
<li><a href="', $message['member']['href'], '" title="' . $txt['view_profile'] . '">', ($settings['use_image_buttons'] ? '<span class="main_icons profile_sm"></span>' : $txt['view_profile']), '</a></li>';
<li><a href="', $message['member']['href'], '" title="' . $txt['view_profile'] . '">', ($settings['use_image_buttons'] ? '<span class="main_icons members"></span>' : $txt['view_profile']), '</a></li>';
// Don't show an icon if they haven't specified a website.
if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))

6
khbb/Profile.template.php
View file

@ -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()
<label for="notify_send_body">', $txt['notify_alert_timeout'], '</label>
</dt>
<dd>
<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '">
<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" max="127" value="', $context['member']['alert_timeout'], '">
</dd>';
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)

4
khbb/Register.template.php
View file

@ -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()
<meta charset="', $context['character_set'], '">
<title>', $txt['visual_verification_sound'], '</title>
<meta name="robots" content="noindex">
<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $context['browser_cache'], '">
', template_css(), '
<style>';
// Just show the help text and a "close window" link.

4
khbb/Themes.template.php
View file

@ -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
*/
/**
@ -655,7 +655,7 @@ function template_set_settings()
echo '
<input type="text"';
echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : (empty($setting['size']) ? ' size="40"' : ' size="' . $setting['size'] . '"'), '>
echo ' name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="options_', $setting['id'], '" value="', $setting['value'], '"', $setting['type'] == 'number' ? '' : (empty($setting['size']) ? ' size="40"' : ' size="' . $setting['size'] . '"'), '>
</dd>';
}
}

4
khbb/Who.template.php
View file

@ -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
*/
/**
@ -66,7 +66,7 @@ function template_main()
echo '
<span class="member', $member['is_hidden'] ? ' hidden' : '', '">
', $member['is_guest'] ? $member['name'] : '<a href="' . $member['href'] . '" title="' . sprintf($txt['view_profile_of_username'], $member['name']) . '"' . (empty($member['color']) ? '' : ' style="color: ' . $member['color'] . '"') . '>' . $member['name'] . '</a>', '
', $member['is_guest'] ? $member['name'] : '<a href="' . $member['href'] . '" title="' . sprintf($txt['view_profile_of_username'], $member['name']) . '"' . (empty($member['color']) ? '' : ' style="color: ' . $member['color'] . ';"') . '>' . $member['name'] . '</a>', '
</span>';
if (!empty($member['ip']))

61
khbb/css/index.css
View file

@ -270,15 +270,16 @@ body#help_popup {
#likes li {
clear: both;
padding: 1px 0;
display: flex;
align-items: center;
}
#likes .avatar {
max-height: 45px;
max-width: 45px;
height: 5em;
width: 5em;
margin: 0 10px 0 0;
}
#likes .avatar, #likes li .like_profile {
vertical-align: middle;
display: inline-block;
#likes li .like_profile {
flex: 1 0 auto;
}
#likes li .like_time {
padding: 4px 0;
@ -1139,6 +1140,11 @@ a.button, a.button:hover, .button:focus {
border-bottom: none;
}
html[lang="el-GR"] .button,
html[lang="el-GR"] .quickbuttons > li > a,
html[lang="el-GR"] .inline_mod_check {
text-transform: capitalize;
}
.pagesection .button {
color: var(--color4);
}
@ -1188,7 +1194,7 @@ a.button, a.button:hover, .button:focus {
}
/* Set maximum width limit for content */
#top_section .inner_wrap, #wrapper, #footer .inner_wrap {
#top_section .inner_wrap, #wrapper, #footer .inner_wrap, #footer {
max-width: 1200px;
margin: 0 auto;
width: 90%;
@ -1509,8 +1515,7 @@ font-size: large;
clear: both;
}
/* The footer with copyright links etc. */
#footer {
margin: 0;
.footer2 {
padding: 10px 0;
background: var(--color2);
}
@ -1725,13 +1730,12 @@ font-size: large;
}
.event_options_left {
box-sizing: border-box;
width: 49%;
padding-right: 1em;
width: 55%;
min-width: 238px;
}
.event_options_right {
box-sizing: border-box;
width: 50%;
width: 45%;
min-width: 270px;
}
.event_options_left div,
@ -1745,9 +1749,18 @@ font-size: large;
#event_time_input {
clear: left;
}
#event_time_input input[type="text"] {
width: 100px;
display: inline-block;
#event_time_input > div {
display: flex;
}
#event_time_input input.date_input {
width: 40%;
margin: 2px 0.5ch 0;
flex: 1 1 auto;
}
#event_time_input input.time_input {
width: 13ch;
margin: 2px 0.5ch 0;
flex: 0 1 auto;
}
#post_event input[type="checkbox"] {
height: auto;
@ -3650,6 +3663,7 @@ div#pollmoderation {
#forumposts {
clear: both;
margin: 8px 0 0 0;
margin-bottom: 0.3em;
}
#forumposts .cat_bar {
@ -4273,6 +4287,7 @@ p.information img {
margin-top: -1px !important;
}
span.member.hidden {
display: inline-block;
font-style: italic;
}
@ -4869,6 +4884,22 @@ img.theme_thumbnail {
white-space: nowrap;
width: 1px;
}
/*fuck ?*/
.khbottom .buttonlist {
display:flex;
flex-direction: row-reverse;
}
.khbottom .button_strip_reply {
margin-left: 1em;
font-weight: bold;
}
/*Plugin Theme Changer Remix*/
/* Mode "rien à battre", faut mettre en "bottom" sinon ça passe pas...*/
.changetheme {
position: absolute;
right: 0;
z-index: 2000;
top:0;
}

4
khbb/css/jquery.sceditor.theme.css
View file

@ -614,7 +614,9 @@ div.sceditor-group {
}
.sceditor-insertemoticon img,
.sceditor-smileyPopup img {
margin: 6px 7px 0 0;
margin: 0;
border-left: var(--neutral-mid-color) 1px dotted;
padding: 0 0.3em;
}
.sceditor-insertemoticon img,
div.sceditor-dropdown img,

66
khbb/index.template.php
View file

@ -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
*/
/* This template is, perhaps, the most important template in the theme. It
@ -216,21 +216,22 @@ echo '<div class="khbb_body">';
<a id="top" href="', $scripturl, '">', empty($context['header_logo_url_html_safe']) ? $context['forum_name_html_safe'] : '<img src="' . $context['header_logo_url_html_safe'] . '" alt="' . $context['forum_name_html_safe'] . '">', '</a>
</h1>';
// Sur quel compte on est co ? Ou invité.
echo '<div class="khbb_subtitle">
<div class="khbb_identity" title="">
<span class="textmenu">', $txt['hello_guest'], $context['user']['name'], '</span></a>
</div> ';
echo '
<div class="khbb_subtitle">
<div class="khbb_identity" title="">
<span class="textmenu">', $txt['hello_guest'], $context['user']['name'], '</span></a>
</div> ';
// les slogans ! utilisation des "news" pour cela.
// Show a random news item? (or you could pick one from news_lines...)
if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
echo '
<div class="news">
<p>', $context['random_news_line'], '</p>
</div>
</div>';
// les slogans ! utilisation des "news" pour cela.
// Show a random news item? (or you could pick one from news_lines...)
if (!empty($settings['enable_news']) && !empty($context['random_news_line']))
echo '
<div class="news">
<p>', $context['random_news_line'], '</p>
</div>';
echo '
</div>
</div>';
echo '
<div id="wrapper">';
@ -464,30 +465,33 @@ function template_body_below()
';
// Show the footer with copyright, terms and help links.
echo '
echo '<div>
<div id="footer">
<div class="inner_wrap">';
<div class="footer2">
<div class="inner_wrap">';
echo '
<ul>
<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="' . $scripturl . '?action=agreement">' . $txt['terms_and_rules'] . '</a>' : '', ' </li>
<li>';
// Insérer barre de recherche rapide quick search
echo template_quicksearch() ;
echo '
</li>
<li class="copyright">', theme_copyright(), '</li>
<li><a href="?action=.xml;type=rss">Flux RSS</a></li>
</ul>';
// Show the load time?
if ($context['show_load_time'])
echo '
<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
<ul>
<li class="floatright"><a href="', $scripturl, '?action=help">', $txt['help'], '</a> ', (!empty($modSettings['requireAgreement'])) ? '| <a href="' . $scripturl . '?action=agreement">' . $txt['terms_and_rules'] . '</a>' : '', ' </li>
<li>';
// Insérer barre de recherche rapide quick search
echo template_quicksearch() ;
echo '
</li>
<li class="copyright">', theme_copyright(), '</li>
<li><a href="?action=.xml;type=rss">Flux RSS</a></li>
</ul>';
// Show the load time?
if ($context['show_load_time'])
echo '
<p>', sprintf($txt['page_created_full'], $context['load_time'], $context['load_queries']), '</p>';
echo '
echo '
</div>
</div>
<div class="khbiseau_bottom_color"></div>
</div><!-- #footer -->
<div class="khbiseau_bottom_color"></div>
</div><!-- #wrapper -->
';

6
khbb/languages/index.english.php
View file

@ -1,5 +1,5 @@
<?php
// Version: 2.1.2; index
// Version: 2.1.3; index
global $forum_copyright, $webmaster_email, $scripturl, $context, $boardurl;
// Add for Khbb theme
@ -27,8 +27,8 @@ $txt['lang_recaptcha'] = 'en';
// Ensure you remember to use uppercase for character set strings.
$txt['lang_character_set'] = 'UTF-8';
// Character set and right to left?
$txt['lang_rtl'] = false;
// Character set right to left? 0 = ltr; 1 = rtl
$txt['lang_rtl'] = '0';
// Number format.
$txt['number_format'] = '1,234.00';

6
khbb/languages/index.french.php
View file

@ -1,5 +1,5 @@
<?php
// Version: 2.1.2; index
// Version: 2.1.3; index
global $forum_copyright, $webmaster_email, $scripturl, $context, $boardurl;
// Add for Khbb theme
@ -28,8 +28,8 @@ $txt['lang_recaptcha'] = 'fr';
// Ensure you remember to use uppercase for character set strings.
$txt['lang_character_set'] = 'UTF-8';
// Character set and right to left?
$txt['lang_rtl'] = false;
// Character set right to left? 0 = ltr; 1 = rtl
$txt['lang_rtl'] = '0';
// Number format.
$txt['number_format'] = '1,234.00 ';

14
khbb/scripts/jquery.sceditor.smf.js
View file

@ -6,7 +6,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
*/
(function ($) {
@ -775,13 +775,11 @@ sceditor.formats.bbcode.set(
'url', {
allowsEmpty: true,
quoteType: sceditor.BBCodeParser.QuoteType.always,
tags: {
a: {
'data-type': ['url']
}
},
format: function (element, content)
format(element, content)
{
if (element.hasAttribute('data-type') && element.getAttribute('data-type') != 'url')
return content;
return '[url=' + decodeURI(element.href) + ']' + content + '[/url]';
},
html: function (token, attrs, content)
@ -953,7 +951,7 @@ sceditor.formats.bbcode.set(
if (typeof attrs.defaultattr === "undefined" || attrs.defaultattr.length === 0)
attrs.defaultattr = content;
return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@','') +'</a>';
return '<a href="' + smf_scripturl +'?action=profile;u='+ attrs.defaultattr + '" class="mention" data-type="mention" data-mention="'+ attrs.defaultattr + '">@'+ content.replace('@', '') +'</a>';
}
}
);

2
khbb/scripts/theme.js
View file

@ -5,7 +5,7 @@ $(function() {
$('.preview').SMFtooltip();
// find all nested linked images and turn off the border
$('a.bbc_link img.bbc_img').parent().css('border', '0');
$('a.bbc_link img').parent().css('border', '0');
});
// The purpose of this code is to fix the height of overflow: auto blocks, because some browsers can't figure it out for themselves.