Skip to content

Commit 02d3bc7

Browse files
jayrmjayrm
committed
Merge branch 'upstream' into master
- merge in updated elegance style sheets [RC] 3.3.10 Conflicts: - styles/elegance/theme/stylesheet.css - NB: style sheets will need to be recompiled
2 parents 94ae39b + defd126 commit 02d3bc7

22 files changed

+182
-166
lines changed

‎styles/elegance/style.cfg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
# General Information about this style
2222
name = Elegance
23-
copyright = Created by Arty (Vjacheslav Trushkin), http://www.artodia.com/, Modified by Gabriel Fischer
24-
style_version = 3.3.2
25-
phpbb_version = 3.3.2
23+
copyright = Created by Arty (Vjacheslav Trushkin), Updated by Halil ESEN, https://halilsn.com/
24+
style_version = 3.3.10
25+
phpbb_version = 3.3.10
2626

2727
# Defining a different template bitfield
2828
# template_bitfield = lNg=

‎styles/elegance/template/ajax.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
101101
phpbb.addAjaxCallback('notification.mark_all_read', function(res) {
102102
if (typeof res.success !== 'undefined') {
103103
phpbb.markNotifications($('#notification_list li.bg3'), 0);
104+
phpbb.toggleDropdown.call($('#notification_list_button'));
104105
phpbb.closeDarkenWrapper(3000);
105106
}
106107
});
@@ -361,6 +362,17 @@ $('.display_post').click(function(e) {
361362
$('#post_hidden' + postId).hide();
362363
});
363364

365+
/**
366+
* Display hidden post on post review page
367+
*/
368+
$('.display_post_review').on('click', function(e) {
369+
e.preventDefault();
370+
371+
let $displayPostLink = $(this);
372+
$displayPostLink.closest('.post-ignore').removeClass('post-ignore');
373+
$displayPostLink.hide();
374+
});
375+
364376
/**
365377
* Toggle the member search panel in memberlist.php.
366378
*

‎styles/elegance/template/forum_fn.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ function parseDocument($container) {
883883
}
884884
// Copy the list items to the dropdown
885885
if (!copied1) {
886-
var $clones1 = $linksFirst.clone();
886+
var $clones1 = $linksFirst.clone(true);
887887
$menuContents.prepend($clones1.addClass('clone clone-first').removeClass('leftside rightside'));
888888

889889
if ($this.hasClass('post-buttons')) {
@@ -1377,7 +1377,7 @@ function parseDocument($container) {
13771377
if (queued) {
13781378
check(false);
13791379
}
1380-
}, 250);
1380+
}, 0);
13811381
}
13821382
else {
13831383
queued = true;

‎styles/elegance/template/forumlist_body.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</a>
118118
<!-- ENDIF -->
119119

120-
<!-- IF forumrow.LAST_POST_TIME -->
120+
<!-- IF forumrow.LAST_POST_TIME_RFC3339 -->
121121
<dfn>{L_LAST_POST}</dfn>
122122
<!-- IF forumrow.S_DISPLAY_SUBJECT -->
123123
<!-- EVENT forumlist_body_last_post_title_prepend -->

‎styles/elegance/template/login_body.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ <h2 class="login-title"><!-- IF LOGIN_EXPLAIN -->{LOGIN_EXPLAIN}<!-- ELSE -->{L_
2727
<!-- ENDIF -->
2828
<!-- IF S_DISPLAY_FULL_LOGIN -->
2929
<dl>
30+
<dt>&nbsp;</dt>
3031
<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
3132
<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
3233
</dl>

‎styles/elegance/template/overall_footer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<span class="footer-copyright">{{ CREDIT_LINE }}</span>
2020
</p>
2121
<p class="footer-row">
22-
<span class="footer-copyright">Style {{ lang('POST_BY_AUTHOR') }} <a href="https://www.artodia.com/">Arty</a> - phpBB 3.3 {{ lang('POST_BY_AUTHOR') }} MrGaby</span>
22+
<span class="footer-copyright">Style {{ lang('POST_BY_AUTHOR') }} <a href="https://www.artodia.com/">Arty</a></span>
2323
</p>
2424
<!-- IF TRANSLATION_INFO -->
2525
<p class="footer-row">
@@ -70,11 +70,11 @@ <h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
7070

7171
<div>
7272
<a id="bottom" class="top-anchor" accesskey="z"></a>
73-
<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
73+
{% if not S_IS_BOT %}{{ RUN_CRON_TASK }}{% endif %}
7474
</div>
7575

7676
<script src="{T_JQUERY_LINK}"></script>
77-
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
77+
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
7878
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
7979
<!-- INCLUDEJS forum_fn.js -->
8080
<!-- INCLUDEJS ajax.js -->

‎styles/elegance/template/overall_header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
phpBB style name: elegance
2929
Based on style: prosilver
3030
Original author: Arty ( https://www.artodia.com )
31-
Modified by: MrGaby
31+
Modified by: Halil ESEN ( https://halilsn.com/ )
3232
-->
3333

3434
<!-- IF S_ALLOW_CDN -->
@@ -41,7 +41,7 @@
4141

4242
(function(d) {
4343
var wf = d.createElement('script'), s = d.scripts[0];
44-
wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
44+
wf.src = 'https://cdn.jsdelivr.net/npm/[email protected]/webfontloader.min.js';
4545
wf.async = true;
4646
s.parentNode.insertBefore(wf, s);
4747
})(document);

‎styles/elegance/template/search_body.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h3>{L_SEARCH_OPTIONS}</h3>
9696
<div class="inner">
9797

9898
<fieldset class="submit-buttons">
99-
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
99+
{S_HIDDEN_FIELDS}
100100
<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
101101
</fieldset>
102102

‎styles/elegance/template/search_results.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
6969
<dd class="posts">{L_REPLIES}</dd>
7070
<dd class="views">{L_VIEWS}</dd>
7171
<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
72+
{% EVENT search_results_topic_header_lastpost_after %}
7273
</dl>
7374
</li>
7475
</ul>
@@ -153,6 +154,7 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
153154
<br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time>
154155
</span>
155156
</dd>
157+
{% EVENT search_results_topic_row_lastpost_after %}
156158
</dl>
157159
</li>
158160
<!-- EVENT search_results_topic_after -->
@@ -194,6 +196,7 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
194196
</dl>
195197

196198
<div class="postbody"><div class="postbody-inner">
199+
{% EVENT search_results_post_subject_before %}
197200
<h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
198201
<div class="content">{searchresults.MESSAGE}</div>
199202
<!-- EVENT search_results_content_after -->
@@ -238,7 +241,7 @@ <h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
238241
<!-- ENDIF -->
239242
</div>
240243
</div>
241-
244+
{% EVENT search_results_jumpbox_before %}
242245
<!-- INCLUDE jumpbox.html -->
243246

244247
<!-- INCLUDE overall_footer.html -->

‎styles/elegance/template/simple_footer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<p class="footer-row">
55
<span class="footer-copyright">{{ CREDIT_LINE }}</span>
66
</p>
7-
<br />Style {{ lang('POST_BY_AUTHOR') }} <a href="https://www.artodia.com/">Arty</a> - phpBB 3.3 {{ lang('POST_BY_AUTHOR') }} MrGaby
7+
<br />Style {{ lang('POST_BY_AUTHOR') }} <a href="https://www.artodia.com/">Arty</a>
88
{% if TRANSLATION_INFO %}
99
<p class="footer-row">
1010
<span class="footer-copyright">{{ TRANSLATION_INFO }}</span>
@@ -25,7 +25,7 @@
2525
<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
2626
<a href="#" class="alert_close">
2727
</a>
28-
<h3 class="alert_title"></h3><p class="alert_text"></p>
28+
<h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
2929
</div>
3030
<div id="phpbb_confirm" class="phpbb_confirm phpbb_alert">
3131
<a href="#" class="alert_close">
@@ -35,7 +35,7 @@ <h3 class="alert_title"></h3><p class="alert_text"></p>
3535
</div>
3636

3737
<script src="{T_JQUERY_LINK}"></script>
38-
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.5.1.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
38+
<!-- IF S_ALLOW_CDN --><script>window.jQuery || document.write('\x3Cscript src="{T_ASSETS_PATH}/javascript/jquery-3.6.0.min.js?assets_version={T_ASSETS_VERSION}">\x3C/script>');</script><!-- ENDIF -->
3939
<script src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
4040
<!-- INCLUDEJS forum_fn.js -->
4141
<!-- INCLUDEJS ajax.js -->

0 commit comments

Comments
 (0)