Skip to content

Commit 6943f1b

Browse files
dkldkl
committed
Update basic & elegance styles to 3.2.7 (latest available)
1 parent 4fc9f52 commit 6943f1b

File tree

521 files changed

+162077
-82639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

521 files changed

+162077
-82639
lines changed

‎styles/basic/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 = Basic
23-
copyright = Created by Arty (Vjacheslav Trushkin), http://www.artodia.com/
24-
style_version = 3.1.9
25-
phpbb_version = 3.1.9
23+
copyright = Created by Arty (Vjacheslav Trushkin), http://www.artodia.com/, Modified by Gabriel Fischer
24+
style_version = 3.2.7
25+
phpbb_version = 3.2.7
2626

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

‎styles/basic/template/ajax.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
2626
});
2727

2828
// Mark subforums read
29-
$('a.subforum[class*="unread"]').removeClass('unread').addClass('read');
30-
29+
$('a.subforum[class*="unread"]').removeClass('unread').addClass('read').children('.icon.icon-red').removeClass('icon-red').addClass('icon-blue');
30+
3131
// Mark topics read if we are watching a category and showing active topics
3232
if ($('#active_topics').length) {
3333
phpbb.ajaxCallbacks.mark_topics_read.call(this, res, false);
@@ -87,7 +87,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
8787
});
8888

8989
// Remove link to first unread post
90-
$('a').has('span.icon_topic_newest').remove();
90+
$('a.unread').has('.icon-red').remove();
9191

9292
// Update mark topics read links
9393
if (updateTopicLinks) {
@@ -132,9 +132,10 @@ phpbb.markNotifications = function($popup, unreadCount) {
132132

133133
// Update the unread count.
134134
$('#notification_list_button + strong .counter').html(unreadCount).parents('.notifications.tab').toggleClass('non-zero', unreadCount > 0);
135-
// Remove the Mark all read link if there are no unread notifications.
135+
// Remove the Mark all read link and hide notification count if there are no unread notifications.
136136
if (!unreadCount) {
137137
$('#mark_all_notifications').remove();
138+
$('#notification_list_button > strong').addClass('hidden');
138139
}
139140

140141
// Update page title
@@ -198,7 +199,7 @@ phpbb.addAjaxCallback('zebra', function(res) {
198199
*/
199200
phpbb.addAjaxCallback('vote_poll', function(res) {
200201
if (typeof res.success !== 'undefined') {
201-
var poll = $('.topic_poll');
202+
var poll = $(this).closest('.topic_poll');
202203
var panel = poll.find('.panel');
203204
var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible');
204205
var mostVotes = 0;

‎styles/basic/template/feed.xml.twig‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ FEED_LANG }}">
3+
<link rel="self" type="application/atom+xml" href="{{ SELF_LINK }}" />
4+
5+
{% if not FEED_TITLE is empty %}<title>{{ FEED_TITLE }}</title>{% endif %}
6+
7+
{% if not FEED_SUBTITLE is empty %}<subtitle>{{ FEED_SUBTITLE }}</subtitle>{% endif %}
8+
9+
{% if not FEED_LINK is empty %}<link href="{{ FEED_LINK }}" />{% endif %}
10+
11+
<updated>{{ FEED_UPDATED }}</updated>
12+
13+
<author><name><![CDATA[{{ FEED_AUTHOR }}]]></name></author>
14+
<id>{{ SELF_LINK }}</id>
15+
16+
{% for row in FEED_ROWS %}
17+
<entry>
18+
{% if not row.author is empty %}<author><name><![CDATA[{{ row.author }}]]></name></author>{% endif %}
19+
20+
<updated>{% if not row.updated is empty %}{{ row.updated }} {% else %}{{ row.published }}{% endif %}</updated>
21+
22+
{% if not row.published is empty %}<published>{{ row.published }}</published>{% endif %}
23+
24+
<id>{{ row.link }}</id>
25+
<link href="{{ row.link }}"/>
26+
<title type="html"><![CDATA[{{ row.title }}]]></title>
27+
28+
{% if not row.category is empty and row.category_name is defined and row.category_name != '' %}
29+
<category term="{{ row.category_name }}" scheme="{{ row.category }}" label="{{ row.category_name }}"/>
30+
{% endif %}
31+
32+
<content type="html" xml:base="{{ row.link }}"><![CDATA[
33+
{{ row.description }}{% if not row.statistics is empty %}<p>{{ lang('STATISTICS') }}: {{ row.statistics }}</p>{% endif %}<hr />
34+
]]></content>
35+
</entry>
36+
{% endfor %}
37+
</feed>

‎styles/basic/template/forum_fn.js‎

Lines changed: 20 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function marklist(id, name, state) {
6464

6565
jQuery('#' + id + ' input[type=checkbox][name]').each(function() {
6666
var $this = jQuery(this);
67-
if ($this.attr('name').substr(0, name.length) === name) {
67+
if ($this.attr('name').substr(0, name.length) === name && !$this.prop('disabled')) {
6868
$this.prop('checked', state);
6969
}
7070
});
@@ -201,37 +201,6 @@ function selectCode(a) {
201201
}
202202
}
203203

204-
/**
205-
* Play quicktime file by determining it's width/height
206-
* from the displayed rectangle area
207-
*/
208-
function play_qt_file(obj) {
209-
'use strict';
210-
211-
var rectangle = obj.GetRectangle();
212-
var width, height;
213-
214-
if (rectangle) {
215-
rectangle = rectangle.split(',');
216-
var x1 = parseInt(rectangle[0], 10);
217-
var x2 = parseInt(rectangle[2], 10);
218-
var y1 = parseInt(rectangle[1], 10);
219-
var y2 = parseInt(rectangle[3], 10);
220-
221-
width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
222-
height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
223-
} else {
224-
width = 200;
225-
height = 0;
226-
}
227-
228-
obj.width = width;
229-
obj.height = height + 16;
230-
231-
obj.SetControllerVisible(true);
232-
obj.Play();
233-
}
234-
235204
var inAutocomplete = false;
236205
var lastKeyEntered = '';
237206

@@ -309,15 +278,13 @@ function insertUser(formId, value) {
309278
}
310279

311280
function insert_marked_users(formId, users) {
312-
'use strict';
281+
'use strict';
313282

314-
for (var i = 0; i < users.length; i++) {
315-
if (users[i].checked) {
316-
insertUser(formId, users[i].value);
317-
}
318-
}
283+
$(users).filter(':checked').each(function() {
284+
insertUser(formId, this.value);
285+
});
319286

320-
window.close();
287+
window.close();
321288
}
322289

323290
function insert_single_user(formId, user) {
@@ -668,13 +635,13 @@ function parseDocument($container) {
668635
/**
669636
* Adjust HTML code for IE8 and older versions
670637
*/
671-
if (oldBrowser) {
672-
// Fix .linklist.bulletin lists
673-
$container
674-
.find('ul.linklist.bulletin > li')
675-
.filter(':first-child, .rightside:last-child')
676-
.addClass('no-bulletin');
677-
}
638+
// if (oldBrowser) {
639+
// // Fix .linklist.bulletin lists
640+
// $container
641+
// .find('ul.linklist.bulletin > li')
642+
// .filter(':first-child, .rightside:last-child')
643+
// .addClass('no-bulletin');
644+
// }
678645

679646
/**
680647
* Resize navigation (breadcrumbs) block to keep all links on same line
@@ -831,7 +798,7 @@ function parseDocument($container) {
831798
$linksFirst = $linksNotSkip.not(filterLast), // The items that will be hidden first
832799
$linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last
833800
persistent = $this.attr('id') === 'nav-main', // Does this list already have a menu (such as quick-links)?
834-
html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="responsive-menu-link">&nbsp;</a><div class="dropdown hidden"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
801+
html = '<li class="responsive-menu hidden"><a href="javascript:void(0);" class="js-responsive-menu-link responsive-menu-link"><i class="icon fa-bars fa-fw" aria-hidden="true"></i></a><div class="dropdown"><div class="pointer"><div class="pointer-inner" /></div><ul class="dropdown-contents" /></div></li>',
835802
slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured.
836803

837804
// Add a hidden drop-down menu to each links list (except those that already have one)
@@ -920,8 +887,10 @@ function parseDocument($container) {
920887
$menuContents.prepend($clones1.addClass('clone clone-first').removeClass('leftside rightside'));
921888

922889
if ($this.hasClass('post-buttons')) {
923-
$('.button', $menuContents).removeClass('button icon-button');
924-
$('.responsive-menu-link', $menu).addClass('button icon-button').prepend('<span></span>');
890+
$('.button', $menuContents).removeClass('button');
891+
$('.sr-only', $menuContents).removeClass('sr-only');
892+
$('.js-responsive-menu-link').addClass('button').addClass('button-icon-only');
893+
$('.js-responsive-menu-link .icon').removeClass('fa-bars').addClass('fa-ellipsis-h');
925894
}
926895
copied1 = true;
927896
}
@@ -975,12 +944,12 @@ function parseDocument($container) {
975944
}
976945

977946
if (!persistent) {
978-
phpbb.registerDropdown($menu.find('a.responsive-menu-link'), $menu.find('.dropdown'), false);
947+
phpbb.registerDropdown($menu.find('a.js-responsive-menu-link'), $menu.find('.dropdown'), false);
979948
}
980949

981950
// If there are any images in the links list, run the check again after they have loaded
982951
$linksAll.find('img').each(function() {
983-
$(this).load(function() {
952+
$(this).on('load', function() {
984953
check();
985954
});
986955
});

‎styles/basic/template/forumlist_body.html‎

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
<ul class="topiclist">
1515
<li class="header">
1616
<!-- EVENT forumlist_body_category_header_row_prepend -->
17-
<dl class="icon">
17+
<dl class="row-item">
1818
<dt><div class="list-inner"><!-- IF forumrow.S_IS_CAT --><a href="{forumrow.U_VIEWFORUM}" data-id="{forumrow.FORUM_ID}">{forumrow.FORUM_NAME}</a><!-- ELSE -->{L_FORUM}<!-- ENDIF --></div></dt>
19+
<!-- IF $STANDARD_FORUMS_LAYOUT != 0 -->
1920
<dd class="topics">{L_TOPICS}</dd>
2021
<dd class="posts">{L_POSTS}</dd>
22+
<!-- ENDIF -->
2123
<dd class="lastpost"><span>{L_LAST_POST}</span></dd>
2224
</dl>
2325
<!-- EVENT forumlist_body_category_header_row_append -->
@@ -39,13 +41,22 @@
3941
</div>
4042
<!-- ENDIF -->
4143
<!-- ENDDEFINE -->
42-
<dl class="icon {forumrow.FORUM_IMG_STYLE}{% if definition.EXTRA_DESC|trim %} elegant-row{% endif %}">
44+
<dl class="row-item {forumrow.FORUM_IMG_STYLE}{% if definition.EXTRA_DESC|trim %} elegant-row{% endif %}">
4345
<dt title="{forumrow.FORUM_FOLDER_IMG_ALT}">
44-
<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="icon-link"></a><!-- ENDIF -->
46+
<!-- IF forumrow.S_UNREAD_FORUM --><a href="{forumrow.U_VIEWFORUM}" class="row-item-link"></a><!-- ENDIF -->
4547
<div class="list-inner">
46-
<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED --><!-- <a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}"></a> --><!-- ENDIF -->
47-
48-
<!-- IF forumrow.FORUM_IMAGE --><span class="forum-image">{forumrow.FORUM_IMAGE}</span><!-- ENDIF -->
48+
<!-- IF S_ENABLE_FEEDS and forumrow.S_FEED_ENABLED -->
49+
<!--
50+
<a class="feed-icon-forum" title="{L_FEED} - {forumrow.FORUM_NAME}" href="{U_FEED}?f={forumrow.FORUM_ID}">
51+
<i class="icon fa-rss-square fa-fw icon-orange" aria-hidden="true"></i><span class="sr-only">{L_FEED} - {forumrow.FORUM_NAME}</span>
52+
</a>
53+
-->
54+
<!-- ENDIF -->
55+
<!-- IF forumrow.FORUM_IMAGE -->
56+
<!-- EVENT forumlist_body_forum_image_before -->
57+
<span class="forum-image"><!-- EVENT forumlist_body_forum_image_prepend -->{forumrow.FORUM_IMAGE}<!-- EVENT forumlist_body_forum_image_append --></span>
58+
<!-- EVENT forumlist_body_forum_image_after -->
59+
<!-- ENDIF -->
4960
<a href="{forumrow.U_VIEWFORUM}" class="forumtitle" data-id="{forumrow.FORUM_ID}">{forumrow.FORUM_NAME}</a>
5061
<!-- IF forumrow.FORUM_DESC --><div class="forum-description">{forumrow.FORUM_DESC}</div><!-- ENDIF -->
5162
{$EXTRA_DESC}
@@ -58,7 +69,10 @@
5869
<strong>{forumrow.L_SUBFORUM_STR}{L_COLON}</strong>
5970
<ul>
6071
<!-- BEGIN subforum -->
61-
<li><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW --><span>{L_COMMA_SEPARATOR}</span><!-- ENDIF --></li>
72+
<li>
73+
<!-- EVENT forumlist_body_subforum_link_prepend --><a href="{forumrow.subforum.U_SUBFORUM}" class="subforum<!-- IF forumrow.subforum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF forumrow.subforum.S_UNREAD -->{L_UNREAD_POSTS}<!-- ELSE -->{L_NO_UNREAD_POSTS}<!-- ENDIF -->">
74+
<i class="icon <!-- IF forumrow.subforum.IS_LINK -->fa-external-link<!-- ELSE -->fa-file-o<!-- ENDIF --> fa-fw <!-- IF forumrow.subforum.S_UNREAD --> icon-red<!-- ENDIF --> icon-md" aria-hidden="true"></i>{forumrow.subforum.SUBFORUM_NAME}</a><!-- IF not forumrow.subforum.S_LAST_ROW --><span>{L_COMMA_SEPARATOR}</span><!-- ENDIF --><!-- EVENT forumlist_body_subforum_link_append -->
75+
</li>
6276
<!-- END subforum -->
6377
</ul>
6478
<!-- EVENT forumlist_body_subforums_after -->
@@ -78,16 +92,10 @@
7892
<!-- IF not forumrow.S_IS_LINK and forumrow.LAST_POST_TIME -->
7993
<div class="forum-lastpost" style="display: none;">
8094
<span><strong>{L_LAST_POST}{L_COLON}</strong> <a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a></span>
81-
<span>{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}, {forumrow.LAST_POST_TIME}</span>
95+
<span>{L_POST_BY_AUTHOR} <!-- EVENT forumlist_body_last_poster_username_prepend -->{forumrow.LAST_POSTER_FULL}<!-- EVENT forumlist_body_last_poster_username_append -->, {forumrow.LAST_POST_TIME}</span>
8296
</div>
8397
<!-- ENDIF -->
8498
<!-- ENDIF -->
85-
86-
<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
87-
<a href="{forumrow.U_UNAPPROVED_TOPICS}" class="forum-mcplink">{UNAPPROVED_IMG}</a>
88-
<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
89-
<a href="{forumrow.U_UNAPPROVED_POSTS}" class="forum-mcplink">{UNAPPROVED_POST_IMG}</a>
90-
<!-- ENDIF -->
9199
</div>
92100
</dt>
93101
<!-- IF forumrow.CLICKS -->
@@ -97,14 +105,39 @@
97105
<dd class="topics">{forumrow.TOPICS} <dfn>{L_TOPICS}</dfn></dd>
98106
<dd class="posts">{forumrow.POSTS} <dfn>{L_POSTS}</dfn></dd>
99107
<!-- ENDIF -->
100-
<dd class="lastpost"><span>
101-
<!-- IF forumrow.LAST_POST_TIME --><dfn>{L_LAST_POST}</dfn>
102-
<!-- IF forumrow.S_DISPLAY_SUBJECT -->
103-
<!-- EVENT forumlist_body_last_post_title_prepend -->
104-
<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
105-
<!-- ENDIF -->
106-
{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
107-
<!-- IF not S_IS_BOT --><a href="{forumrow.U_LAST_POST}">{LAST_POST_IMG}</a> <!-- ENDIF --><br />{forumrow.LAST_POST_TIME}<!-- ELSE -->{L_NO_POSTS}<br />&nbsp;<!-- ENDIF --></span>
108+
<dd class="lastpost">
109+
<span>
110+
<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
111+
<a href="{forumrow.U_UNAPPROVED_TOPICS}" title="{L_TOPICS_UNAPPROVED}" class="forum-mcplink">
112+
<i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPICS_UNAPPROVED}</span>
113+
</a>
114+
<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
115+
<a href="{forumrow.U_UNAPPROVED_POSTS}" title="{L_POSTS_UNAPPROVED_FORUM}" class="forum-mcplink">
116+
<i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_POSTS_UNAPPROVED_FORUM}</span>
117+
</a>
118+
<!-- ENDIF -->
119+
120+
<!-- IF forumrow.LAST_POST_TIME -->
121+
<dfn>{L_LAST_POST}</dfn>
122+
<!-- IF forumrow.S_DISPLAY_SUBJECT -->
123+
<!-- EVENT forumlist_body_last_post_title_prepend -->
124+
<a href="{forumrow.U_LAST_POST}" title="{forumrow.LAST_POST_SUBJECT}" class="lastsubject">{forumrow.LAST_POST_SUBJECT_TRUNCATED}</a> <br />
125+
<!-- ENDIF -->
126+
{L_POST_BY_AUTHOR} <!-- EVENT forumlist_body_last_poster_username_prepend -->{forumrow.LAST_POSTER_FULL}<!-- EVENT forumlist_body_last_poster_username_append -->
127+
<!-- IF not S_IS_BOT -->
128+
<a href="{forumrow.U_LAST_POST}" title="{L_VIEW_LATEST_POST}">
129+
<i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{L_VIEW_LATEST_POST}</span>
130+
</a>
131+
<!-- ENDIF -->
132+
<br />{forumrow.LAST_POST_TIME}
133+
<!-- ELSE -->
134+
{% if forumrow.U_UNAPPROVED_TOPICS %}
135+
{{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }}
136+
{% else %}
137+
{{ lang('NO_POSTS') }}
138+
{% endif %}
139+
<!-- ENDIF -->
140+
</span>
108141
</dd>
109142
<!-- ELSE -->
110143
<dd>&nbsp;</dd>

‎styles/basic/template/index_body.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
2727
<!-- ENDIF -->
2828
<input type="submit" tabindex="5" name="login" value="{L_LOGIN}" class="button2" />
2929
{S_LOGIN_REDIRECT}
30+
31+
{S_FORM_TOKEN_LOGIN}
32+
3033
</fieldset>
3134
</form>
3235
<!-- ENDIF -->
@@ -38,13 +41,18 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
3841
<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
3942
<p>
4043
<!-- EVENT index_body_block_online_prepend -->
41-
{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
42-
<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
44+
{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br />
45+
<!-- IF U_VIEWONLINE -->
46+
<br />{LOGGED_IN_USER_LIST}
47+
<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF -->
48+
<!-- ENDIF -->
4349
<!-- EVENT index_body_block_online_append -->
4450
</p>
4551
</div>
4652
<!-- ENDIF -->
4753

54+
<!-- EVENT index_body_birthday_block_before -->
55+
4856
<!-- IF S_DISPLAY_BIRTHDAY_LIST -->
4957
<div class="stat-block birthday-list">
5058
<h3>{L_BIRTHDAYS}</h3>

0 commit comments

Comments
 (0)