diff --git a/style.cfg b/style.cfg index 7252820..2deceef 100644 --- a/style.cfg +++ b/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.2.0 -phpbb_version = 3.2.0 +style_version = 3.2.1 +phpbb_version = 3.2.1 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/template/ajax.js b/template/ajax.js index 1bb3aab..6903ad2 100644 --- a/template/ajax.js +++ b/template/ajax.js @@ -26,7 +26,7 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) { }); // Mark subforums read - $('a.subforum[class*="unread"]').removeClass('unread').addClass('read'); + $('a.subforum[class*="unread"]').removeClass('unread').addClass('read').children('.icon.icon-red').removeClass('icon-red').addClass('icon-blue'); // Mark topics read if we are watching a category and showing active topics if ($('#active_topics').length) { diff --git a/template/bbcode.html b/template/bbcode.html index 8c4e941..940c0ac 100644 --- a/template/bbcode.html +++ b/template/bbcode.html @@ -53,13 +53,13 @@
- + - + {TEXT} diff --git a/template/display_options.html b/template/display_options.html index d1ec3dc..a426d08 100644 --- a/template/display_options.html +++ b/template/display_options.html @@ -1,4 +1,4 @@ -
+
diff --git a/template/forum_fn.js b/template/forum_fn.js index b803a6f..3f59709 100644 --- a/template/forum_fn.js +++ b/template/forum_fn.js @@ -57,7 +57,7 @@ function marklist(id, name, state) { jQuery('#' + id + ' input[type=checkbox][name]').each(function() { var $this = jQuery(this); - if ($this.attr('name').substr(0, name.length) === name) { + if ($this.attr('name').substr(0, name.length) === name && !$this.prop('disabled')) { $this.prop('checked', state); } }); @@ -194,37 +194,6 @@ function selectCode(a) { } } -/** -* Play quicktime file by determining it's width/height -* from the displayed rectangle area -*/ -function play_qt_file(obj) { - 'use strict'; - - var rectangle = obj.GetRectangle(); - var width, height; - - if (rectangle) { - rectangle = rectangle.split(','); - var x1 = parseInt(rectangle[0], 10); - var x2 = parseInt(rectangle[2], 10); - var y1 = parseInt(rectangle[1], 10); - var y2 = parseInt(rectangle[3], 10); - - width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1; - height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1; - } else { - width = 200; - height = 0; - } - - obj.width = width; - obj.height = height + 16; - - obj.SetControllerVisible(true); - obj.Play(); -} - var inAutocomplete = false; var lastKeyEntered = ''; diff --git a/template/forumlist_body.html b/template/forumlist_body.html index 0d6e930..621e226 100644 --- a/template/forumlist_body.html +++ b/template/forumlist_body.html @@ -52,10 +52,8 @@
{forumrow.L_SUBFORUM_STR}{L_COLON} - - {forumrow.subforum.SUBFORUM_NAME} - - {L_COMMA_SEPARATOR} + + {forumrow.subforum.SUBFORUM_NAME}{L_COMMA_SEPARATOR} diff --git a/template/index_body.html b/template/index_body.html index ec5bf35..b292c40 100644 --- a/template/index_body.html +++ b/template/index_body.html @@ -40,13 +40,18 @@

{L_WHO_IS_ONLINE}

{L_WHO_IS_ONLINE}

- {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} -
{L_LEGEND}{L_COLON} {LEGEND} + {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}
+ +
{LOGGED_IN_USER_LIST} +
{L_LEGEND}{L_COLON} {LEGEND} +

+ +

{L_BIRTHDAYS}

diff --git a/template/jumpbox.html b/template/jumpbox.html index 724a963..070efc0 100644 --- a/template/jumpbox.html +++ b/template/jumpbox.html @@ -37,7 +37,7 @@ @@ -45,6 +45,6 @@
-

+

diff --git a/template/mcp_front.html b/template/mcp_front.html index 9777581..90793d0 100644 --- a/template/mcp_front.html +++ b/template/mcp_front.html @@ -30,7 +30,7 @@
- {unapproved.SUBJECT}
+ {unapproved.SUBJECT}
{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME}
@@ -86,12 +86,12 @@
- {report.SUBJECT}
+ {report.SUBJECT}
{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} » {report.POST_TIME}
- {L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE}
+ {L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE}
{L_FORUM}{L_COLON} {report.FORUM_NAME}
@@ -129,7 +129,7 @@
- {pm_report.PM_SUBJECT}
+ {pm_report.PM_SUBJECT}
{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} » {pm_report.PM_TIME}
{L_MESSAGE_TO} {pm_report.RECIPIENTS}
diff --git a/template/mcp_post.html b/template/mcp_post.html index a0de554..af16c8a 100644 --- a/template/mcp_post.html +++ b/template/mcp_post.html @@ -294,6 +294,14 @@ + + + + +
+
@@ -315,7 +323,27 @@
-

{L_LOOKUP_ALL}

+
+

{L_LOOKUP_ALL}

+
+ +
diff --git a/template/mcp_topic.html b/template/mcp_topic.html index d64c9c9..35b1ecc 100644 --- a/template/mcp_topic.html +++ b/template/mcp_topic.html @@ -111,7 +111,9 @@ +

{postrow.POST_SUBJECT}

+

diff --git a/template/overall_footer.html b/template/overall_footer.html index 413c93f..97a21f9 100644 --- a/template/overall_footer.html +++ b/template/overall_footer.html @@ -76,7 +76,8 @@ "content": { "message": "{LA_COOKIE_CONSENT_MSG}", "dismiss": "{LA_COOKIE_CONSENT_OK}", - "link": "{LA_COOKIE_CONSENT_INFO}" + "link": "{LA_COOKIE_CONSENT_INFO}", + "href": "{LA_COOKIE_CONSENT_HREF}" } })}); diff --git a/template/overall_header.html b/template/overall_header.html index 4438137..09824d0 100644 --- a/template/overall_header.html +++ b/template/overall_header.html @@ -33,7 +33,7 @@