From 73bec9e223cd994a647f3d41407431ae9780cd59 Mon Sep 17 00:00:00 2001 From: Julian Arndt Date: Mon, 3 Aug 2020 20:54:02 +0200 Subject: [PATCH] Changes for phpbb 3.3.0 --- style.cfg | 4 +- template/ajax.js | 2 +- template/attachment.html | 17 +----- template/bbcode.html | 4 ++ template/captcha_recaptcha.html | 31 ++-------- template/confirm_delete_body.html | 2 + template/forum_fn.js | 12 ++-- template/forumlist_body.html | 10 +++- template/index_body.html | 1 + template/login_body.html | 1 + template/login_body_oauth.html | 10 ++-- template/login_forum.html | 1 + template/mcp_ban.html | 12 ++-- template/mcp_forum.html | 2 + template/mcp_move.html | 2 + template/mcp_post.html | 10 +++- template/mcp_topic.html | 4 +- template/memberlist_body.html | 34 +++++++++-- template/memberlist_email.html | 2 +- template/memberlist_search.html | 2 +- template/memberlist_view.html | 2 +- template/navbar_header.html | 27 +++++---- template/overall_footer.html | 74 ++++++++++++++++-------- template/overall_header.html | 4 +- template/plupload.html | 14 +++-- template/posting_attach_body.html | 16 +++-- template/posting_buttons.html | 30 +--------- template/posting_layout.html | 21 ------- template/posting_pm_header.html | 4 +- template/posting_poll_body.html | 4 +- template/posting_preview.html | 2 + template/posting_review.html | 4 +- template/posting_smilies.html | 4 +- template/posting_topic_review.html | 10 ++-- template/search_results.html | 13 +++-- template/simple_footer.html | 8 ++- template/ucp_agreement.html | 10 +--- template/ucp_attachments.html | 2 +- template/ucp_auth_link_oauth.html | 2 +- template/ucp_avatar_options_upload.html | 2 +- template/ucp_groups_manage.html | 2 +- template/ucp_pm_history.html | 7 +-- template/ucp_pm_viewmessage.html | 12 ++-- template/ucp_pm_viewmessage_print.html | 9 ++- template/ucp_prefs_personal.html | 4 +- template/ucp_profile_profile_info.html | 2 +- template/ucp_profile_signature.html | 1 + template/ucp_register.html | 15 ++++- template/ucp_remind.html | 32 ---------- template/ucp_reset_password.html | 49 ++++++++++++++++ template/viewforum_body.html | 13 +++-- template/viewonline_body.html | 2 +- template/viewtopic_body.html | 23 +++++--- template/viewtopic_print.html | 9 ++- template/viewtopic_topic_tools.html | 2 +- theme/colours.css | 5 ++ theme/common.css | 18 +++++- theme/cp.css | 3 + theme/de/icon_user_online.gif | Bin 0 -> 423 bytes theme/de/index.htm | 0 theme/de/stylesheet.css | 2 + theme/de_x_sie/icon_user_online.gif | Bin 0 -> 423 bytes theme/de_x_sie/index.htm | 0 theme/de_x_sie/stylesheet.css | 2 + theme/forms.css | 2 +- theme/icons.css | 2 +- theme/images/bg_header.gif | Bin 690 -> 0 bytes theme/images/bg_list.gif | Bin 664 -> 0 bytes theme/images/icon_download.gif | Bin 198 -> 0 bytes theme/images/icon_offline.gif | Bin 322 -> 0 bytes theme/images/icon_online.gif | Bin 331 -> 0 bytes theme/images/icon_rate_bad.gif | Bin 465 -> 0 bytes theme/images/icon_rate_good.gif | Bin 462 -> 0 bytes theme/images/quote.gif | Bin 153 -> 0 bytes theme/images/quote_rtl.gif | Bin 154 -> 0 bytes theme/images/site_logo.gif | Bin 5070 -> 0 bytes theme/images/site_logo.svg | 6 ++ theme/plupload.css | 4 ++ theme/print.css | 2 +- theme/responsive.css | 1 + theme/stylesheet.css | 26 ++++----- 81 files changed, 381 insertions(+), 290 deletions(-) delete mode 100644 template/ucp_remind.html create mode 100644 template/ucp_reset_password.html create mode 100644 theme/de/icon_user_online.gif create mode 100644 theme/de/index.htm create mode 100644 theme/de/stylesheet.css create mode 100644 theme/de_x_sie/icon_user_online.gif create mode 100644 theme/de_x_sie/index.htm create mode 100644 theme/de_x_sie/stylesheet.css delete mode 100644 theme/images/bg_header.gif delete mode 100644 theme/images/bg_list.gif delete mode 100644 theme/images/icon_download.gif delete mode 100644 theme/images/icon_offline.gif delete mode 100644 theme/images/icon_online.gif delete mode 100644 theme/images/icon_rate_bad.gif delete mode 100644 theme/images/icon_rate_good.gif delete mode 100644 theme/images/quote.gif delete mode 100644 theme/images/quote_rtl.gif delete mode 100644 theme/images/site_logo.gif create mode 100644 theme/images/site_logo.svg diff --git a/style.cfg b/style.cfg index 00d07fe..0c7eba6 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.2 -phpbb_version = 3.2.2 +style_version = 3.3.0 +phpbb_version = 3.3.0 # Defining a different template bitfield # template_bitfield = //g= diff --git a/template/ajax.js b/template/ajax.js index 6903ad2..5e66e5c 100644 --- a/template/ajax.js +++ b/template/ajax.js @@ -199,7 +199,7 @@ phpbb.addAjaxCallback('zebra', function(res) { */ phpbb.addAjaxCallback('vote_poll', function(res) { if (typeof res.success !== 'undefined') { - var poll = $('.topic_poll'); + var poll = $(this).closest('.topic_poll'); var panel = poll.find('.panel'); var resultsVisible = poll.find('dl:first-child .resultbar').is(':visible'); var mostVotes = 0; diff --git a/template/attachment.html b/template/attachment.html index 0978d91..45b9dc2 100644 --- a/template/attachment.html +++ b/template/attachment.html @@ -8,14 +8,14 @@
-
{_file.DOWNLOAD_NAME}
+
{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}
{_file.COMMENT}
-
{_file.DOWNLOAD_NAME}
+
{% if _file.COMMENT %}{{ _file.COMMENT|e('html') }}{% else %}{{ _file.DOWNLOAD_NAME }}{% endif %}
{_file.COMMENT}
{_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
@@ -29,19 +29,6 @@ - - - - - - - - - - -

{_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]

- - diff --git a/template/bbcode.html b/template/bbcode.html index 940c0ac..b37ba23 100644 --- a/template/bbcode.html +++ b/template/bbcode.html @@ -37,6 +37,10 @@ + + + +
diff --git a/template/captcha_recaptcha.html b/template/captcha_recaptcha.html index a123f54..8fc7faa 100644 --- a/template/captcha_recaptcha.html +++ b/template/captcha_recaptcha.html @@ -1,30 +1,9 @@ - -
-
- -

{L_CONFIRMATION}

-

{L_CONFIRM_EXPLAIN}

- -
- - -
-

{L_RECAPTCHA_EXPLAIN}
-
- - -
-
-
+ + {% INCLUDEJS RECAPTCHA_SERVER ~ '.js?onload=phpbbRecaptchaOnLoad&hl=' ~ lang('RECAPTCHA_LANG') %} +
{L_RECAPTCHA_NOT_AVAILABLE} - - -
-
-
- diff --git a/template/confirm_delete_body.html b/template/confirm_delete_body.html index 9897496..637830a 100644 --- a/template/confirm_delete_body.html +++ b/template/confirm_delete_body.html @@ -49,6 +49,8 @@ + {% EVENT confirm_delete_body_delete_reason_before %} +

{L_DELETE_REASON_EXPLAIN}
diff --git a/template/forum_fn.js b/template/forum_fn.js index 3f59709..2e39365 100644 --- a/template/forum_fn.js +++ b/template/forum_fn.js @@ -273,11 +273,9 @@ function insertUser(formId, value) { function insert_marked_users(formId, users) { 'use strict'; - for (var i = 0; i < users.length; i++) { - if (users[i].checked) { - insertUser(formId, users[i].value); - } - } + $(users).filter(':checked').each(function() { + insertUser(formId, this.value); + }); window.close(); } @@ -462,7 +460,7 @@ function parseDocument($container) { $linksLast = $linksNotSkip.filter(filterLast), // The items that will be hidden last persistent = $this.attr('id') === 'nav-main', // Does this list already have a menu (such as quick-links)? html = '', - slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occured. + slack = 3; // Vertical slack space (in pixels). Determines how sensitive the script is in determining whether a line-break has occurred. // Add a hidden drop-down menu to each links list (except those that already have one) if (!persistent) { @@ -612,7 +610,7 @@ function parseDocument($container) { // If there are any images in the links list, run the check again after they have loaded $linksAll.find('img').each(function() { - $(this).load(function() { + $(this).on('load', function() { check(); }); }); diff --git a/template/forumlist_body.html b/template/forumlist_body.html index eab6528..4932860 100644 --- a/template/forumlist_body.html +++ b/template/forumlist_body.html @@ -95,15 +95,19 @@ {forumrow.LAST_POST_SUBJECT_TRUNCATED}
- {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL} + {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL} {L_VIEW_LATEST_POST} -
{forumrow.LAST_POST_TIME} +
- {L_NO_POSTS}
  + {% if forumrow.U_UNAPPROVED_TOPICS %} + {{ lang('TOPIC_UNAPPROVED_FORUM', forumrow.TOPICS) }} + {% else %} + {{ lang('NO_POSTS') }} + {% endif %} diff --git a/template/index_body.html b/template/index_body.html index b292c40..239a91c 100644 --- a/template/index_body.html +++ b/template/index_body.html @@ -29,6 +29,7 @@ {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} diff --git a/template/login_body.html b/template/login_body.html index ef08035..dc597af 100644 --- a/template/login_body.html +++ b/template/login_body.html @@ -33,6 +33,7 @@ {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN}
 
{S_HIDDEN_FIELDS}
diff --git a/template/login_body_oauth.html b/template/login_body_oauth.html index 156485d..1364d01 100644 --- a/template/login_body_oauth.html +++ b/template/login_body_oauth.html @@ -1,8 +1,6 @@ +
- -
-
 
-
{oauth.SERVICE_NAME}
-
- + {% for oauth in oauth %} + {{ oauth.SERVICE_NAME }} + {% endfor %}
diff --git a/template/login_forum.html b/template/login_forum.html index 7fa9736..c5c36d4 100644 --- a/template/login_forum.html +++ b/template/login_forum.html @@ -25,6 +25,7 @@
{S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN}
 
{S_HIDDEN_FIELDS}
diff --git a/template/mcp_ban.html b/template/mcp_ban.html index 5b798d9..86a3224 100644 --- a/template/mcp_ban.html +++ b/template/mcp_ban.html @@ -1,8 +1,6 @@ -
diff --git a/template/mcp_forum.html b/template/mcp_forum.html index f6c518e..82df5d5 100644 --- a/template/mcp_forum.html +++ b/template/mcp_forum.html @@ -86,7 +86,9 @@
+ {% EVENT topiclist_row_topic_by_author_before %} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} + {% EVENT topiclist_row_topic_by_author_after %}
diff --git a/template/mcp_move.html b/template/mcp_move.html index 45a9ae8..63197ef 100644 --- a/template/mcp_move.html +++ b/template/mcp_move.html @@ -43,12 +43,14 @@

{ADDITIONAL_MSG}

+ {% EVENT mcp_move_destination_forum_before %}
+ {% EVENT mcp_move_destination_forum_after %}
 
{MESSAGE_TEXT}
diff --git a/template/mcp_post.html b/template/mcp_post.html index af16c8a..c2297a8 100644 --- a/template/mcp_post.html +++ b/template/mcp_post.html @@ -31,10 +31,12 @@
+ {% EVENT mcp_post_report_buttons_top_before %}   + {% EVENT mcp_post_report_buttons_top_after %} {S_FORM_TOKEN}
@@ -69,8 +71,8 @@

{L_SENT_AT}{L_COLON} {POST_DATE}
{L_PM_FROM}{L_COLON} {POST_AUTHOR_FULL} -
{L_TO}{L_COLON} {to_recipient.NAME_FULL}{to_recipient.NAME}  -
{L_BCC}{L_COLON} {bcc_recipient.NAME_FULL}{bcc_recipient.NAME}  +
{L_TO}{L_COLON} {to_recipient.NAME_FULL} style="color:{to_recipient.COLOUR};">{to_recipient.NAME}  +
{L_BCC}{L_COLON} {bcc_recipient.NAME_FULL} style="color:{bcc_recipient.COLOUR};">{bcc_recipient.NAME} 

{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} » {POST_DATE}

@@ -106,10 +108,14 @@

+ {% EVENT mcp_post_text_before %} +
{POST_PREVIEW}
+ {% EVENT mcp_post_text_after %} +
{L_ATTACHMENTS}
diff --git a/template/mcp_topic.html b/template/mcp_topic.html index b56ed18..889cab8 100644 --- a/template/mcp_topic.html +++ b/template/mcp_topic.html @@ -118,9 +118,9 @@

- + {postrow.MINI_POST} - {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} [ {L_POST_DETAILS} ] + {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {% EVENT mcp_topic_post_author_full_prepend %}{postrow.POST_AUTHOR_FULL}{% EVENT mcp_topic_post_author_full_append %} [ {L_POST_DETAILS} ]

diff --git a/template/memberlist_body.html b/template/memberlist_body.html index 255e674..b8ff092 100644 --- a/template/memberlist_body.html +++ b/template/memberlist_body.html @@ -12,19 +12,33 @@ +{% EVENT memberlist_body_page_header_after %} + + {% EVENT memberlist_body_group_name_before %}

style="color:#{GROUP_COLOR};">{GROUP_NAME}

+ {% EVENT memberlist_body_group_name_after %}

{L_MANAGE_GROUP}

{GROUP_DESC} {GROUP_TYPE}

+ {% EVENT memberlist_body_group_desc_after %} +

{AVATAR_IMG} - {RANK_IMG} - {GROUP_RANK} + {% EVENT memberlist_body_group_rank_before %} + {% if RANK_IMG %}{{ RANK_IMG }}{% endif %} + {% if GROUP_RANK %} + {% if not RANK_IMG %} + {{ lang('GROUP_RANK') ~ lang('COLON') }} + {% endif %} + {{ GROUP_RANK }} + {% endif %} + {% EVENT memberlist_body_group_rank_after %}

+ {% EVENT memberlist_body_page_title_before %}

{PAGE_TITLE}{L_COLON} {SEARCH_WORDS}

@@ -60,6 +74,7 @@ {L_COMMA_SEPARATOR} {custom_fields.PROFILE_FIELD_NAME} {L_JOINED} {L_LAST_ACTIVE} + {% EVENT memberlist_body_memberlist_after %} @@ -88,15 +103,17 @@ {L_RANK}{L_GROUP_MEMBERS}{L_USERNAME} {L_POSTS} - {L_COMMA_SEPARATOR} {custom_fields.PROFILE_FIELD_NAME} + {% for field in custom_fields %}{% if not loop.first %}{L_COMMA_SEPARATOR} {% endif %}{{ field.PROFILE_FIELD_NAME }}{% endfor %} {L_JOINED} {L_LAST_ACTIVE} + {% EVENT memberlist_body_leaders_set_after %} {L_GROUP_MEMBERS} {L_POSTS} {L_COMMA_SEPARATOR} {custom_fields.PROFILE_FIELD_NAME} {L_JOINED} {L_LAST_ACTIVE} + {% EVENT memberlist_body_show_group_after %} @@ -108,9 +125,16 @@ {memberrow.RANK_IMG}{memberrow.RANK_TITLE} {memberrow.USERNAME_FULL} ({L_INACTIVE})
{L_SELECT} ] {memberrow.POSTS}{memberrow.POSTS} -
{memberrow.custom_fields.PROFILE_FIELD_VALUE}
  + + {%- for field in memberrow.custom_fields -%} + + {%- else -%} +   + {%- endfor -%} + {memberrow.JOINED} {memberrow.LAST_ACTIVE}  + {% EVENT memberlist_body_memberrow_after %} @@ -156,6 +180,8 @@
+{% EVENT memberlist_body_page_footer_before %} + diff --git a/template/memberlist_email.html b/template/memberlist_email.html index d9752be..eea699d 100644 --- a/template/memberlist_email.html +++ b/template/memberlist_email.html @@ -77,7 +77,7 @@

{L_EMAIL_BODY_EXPLAIN}
-
+
diff --git a/template/memberlist_search.html b/template/memberlist_search.html index b1c7a81..34915eb 100644 --- a/template/memberlist_search.html +++ b/template/memberlist_search.html @@ -12,7 +12,7 @@
diff --git a/template/ucp_pm_history.html b/template/ucp_pm_history.html index e97befc..b53eb0c 100644 --- a/template/ucp_pm_history.html +++ b/template/ucp_pm_history.html @@ -6,10 +6,8 @@
-
@@ -38,7 +36,7 @@

{history_row.MINI_POST} {L_SENT_AT}{L_COLON} {history_row.SENT_DATE}
- {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL} + {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}

{history_row.MESSAGE}{L_MESSAGE_REMOVED_FROM_OUTBOX}
@@ -56,4 +54,3 @@ {L_BACK_TO_TOP}

- diff --git a/template/ucp_pm_viewmessage.html b/template/ucp_pm_viewmessage.html index 4295867..7cb44a0 100644 --- a/template/ucp_pm_viewmessage.html +++ b/template/ucp_pm_viewmessage.html @@ -91,28 +91,28 @@
  • - {L_POST_EDIT_PM} + {L_BUTTON_EDIT}
  • - {L_DELETE_MESSAGE} + {L_BUTTON_DELETE}
  • - {L_REPORT_PM} + {L_BUTTON_REPORT}
  • - {L_POST_QUOTE_PM} + {L_BUTTON_QUOTE}
  • @@ -124,8 +124,8 @@

    {L_SENT_AT}{L_COLON} {SENT_DATE}
    {L_PM_FROM}{L_COLON} {MESSAGE_AUTHOR_FULL} -
    {L_TO}{L_COLON} {to_recipient.NAME_FULL}{to_recipient.NAME}  -
    {L_BCC}{L_COLON} {bcc_recipient.NAME_FULL}{bcc_recipient.NAME}  +
    {L_TO}{L_COLON} {to_recipient.NAME_FULL} style="color:{to_recipient.COLOUR};">{to_recipient.NAME}  +
    {L_BCC}{L_COLON} {bcc_recipient.NAME_FULL} style="color:{bcc_recipient.COLOUR};">{bcc_recipient.NAME} 

    diff --git a/template/ucp_pm_viewmessage_print.html b/template/ucp_pm_viewmessage_print.html index 7a88492..41ff5b8 100644 --- a/template/ucp_pm_viewmessage_print.html +++ b/template/ucp_pm_viewmessage_print.html @@ -42,7 +42,14 @@
    diff --git a/template/ucp_prefs_personal.html b/template/ucp_prefs_personal.html index 4cd9f66..1650705 100644 --- a/template/ucp_prefs_personal.html +++ b/template/ucp_prefs_personal.html @@ -85,8 +85,7 @@
    - diff --git a/template/ucp_profile_profile_info.html b/template/ucp_profile_profile_info.html index 69eda8c..ac0cd15 100644 --- a/template/ucp_profile_profile_info.html +++ b/template/ucp_profile_profile_info.html @@ -13,7 +13,7 @@
    -

    {L_BIRTHDAY_EXPLAIN}
    +

    {L_BIRTHDAY_EXPLAIN}
    diff --git a/template/ucp_profile_signature.html b/template/ucp_profile_signature.html index 614f6f4..ed28b7a 100644 --- a/template/ucp_profile_signature.html +++ b/template/ucp_profile_signature.html @@ -24,6 +24,7 @@

    {L_OPTIONS}

    + {% EVENT ucp_profile_signature_posting_editor_options_prepend %}
    diff --git a/template/ucp_register.html b/template/ucp_register.html index 38413ad..f44382f 100644 --- a/template/ucp_register.html +++ b/template/ucp_register.html @@ -1,7 +1,6 @@ - +{% if PROVIDER_TEMPLATE_FILE %} +
    +
    + +

    {{ SITENAME }} - {{ lang('OAUTH_REGISTRATION') }}

    + + {% include PROVIDER_TEMPLATE_FILE %} +
    +
    +{% endif %} +
    diff --git a/template/ucp_remind.html b/template/ucp_remind.html deleted file mode 100644 index 0ab1251..0000000 --- a/template/ucp_remind.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - -
    -
    - -
    -

    {L_SEND_PASSWORD}

    - -
    -
    -
    -
    -
    -
    -

    {L_EMAIL_REMIND}
    -
    -
    -
    -
     
    -
    {S_HIDDEN_FIELDS} 
    -
    - {S_FORM_TOKEN} -
    -
    - -
    -
    - - - diff --git a/template/ucp_reset_password.html b/template/ucp_reset_password.html new file mode 100644 index 0000000..0a05f69 --- /dev/null +++ b/template/ucp_reset_password.html @@ -0,0 +1,49 @@ + + +
    + +
    +
    + +
    +

    {{ lang('RESET_PASSWORD') }}

    + +
    + {% if S_IS_PASSWORD_RESET %} + {% if PASSWORD_RESET_ERRORS %}

    {{ PASSWORD_RESET_ERRORS | join('
    ') }}

    {% endif %} +
    +
    +
    +
    +
    +
    +
    +
    + {% else %} + {% if USERNAME_REQUIRED %} +

    {{ lang('EMAIL_NOT_UNIQUE') }}

    + {% endif %} +
    +

    {{ lang('EMAIL_REMIND') }}
    +
    +
    + {% if USERNAME_REQUIRED %} +
    +
    +
    +
    + {% endif %} + {% endif %} +
    +
     
    +
    {{ S_HIDDEN_FIELDS }} 
    +
    + {{ S_FORM_TOKEN }} +
    +
    + +
    +
    +
    + + diff --git a/template/viewforum_body.html b/template/viewforum_body.html index b5e12cd..40beb78 100644 --- a/template/viewforum_body.html +++ b/template/viewforum_body.html @@ -114,6 +114,7 @@
    {S_LOGIN_REDIRECT} + {S_FORM_TOKEN_LOGIN} @@ -156,7 +157,7 @@
  • - style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> + style="background-image: url('{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}'); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
    @@ -186,7 +187,7 @@ @@ -197,7 +198,9 @@
    - {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » {topicrow.FIRST_POST_TIME} + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} » + {% EVENT topiclist_row_topic_by_author_after %} » {L_IN} {topicrow.FORUM_NAME}
    @@ -223,13 +226,13 @@
    {topicrow.REPLIES} {L_REPLIES}
    {topicrow.VIEWS} {L_VIEWS}
    - {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} + {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {VIEW_LATEST_POST} -
    {topicrow.LAST_POST_TIME} +
    diff --git a/template/viewonline_body.html b/template/viewonline_body.html index dd0ca72..c019977 100644 --- a/template/viewonline_body.html +++ b/template/viewonline_body.html @@ -29,7 +29,7 @@ - {user_row.USERNAME_FULL} {L_IP}{L_COLON} {user_row.USER_IP} » {L_WHOIS} + {user_row.USERNAME_FULL} {L_IP}{L_COLON} {user_row.USER_IP} » {L_WHOIS}
    {user_row.USER_BROWSER} {user_row.FORUM_LOCATION} {user_row.LASTUPDATE} diff --git a/template/viewtopic_body.html b/template/viewtopic_body.html index 40249f2..6af33f2 100644 --- a/template/viewtopic_body.html +++ b/template/viewtopic_body.html @@ -224,7 +224,7 @@
    style="display: none;"> -

    class="first">{postrow.POST_ICON_IMG_ALT} {postrow.POST_SUBJECT}

    +

    class="first">{postrow.POST_ICON_IMG_ALT} {postrow.POST_SUBJECT}

    @@ -242,35 +242,35 @@
  • - {L_DELETE_POST} + {L_BUTTON_DELETE}
  • - {L_REPORT_POST} + {L_BUTTON_REPORT}
  • - {L_WARN_USER} + {L_BUTTON_WARN}
  • - {L_INFORMATION} + {L_BUTTON_INFORMATION}
  • - {L_QUOTE} + {L_BUTTON_QUOTE}
  • @@ -289,11 +289,12 @@ {postrow.MINI_POST} - {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} » {postrow.POST_DATE} + {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} »

    +

    @@ -304,6 +305,12 @@ {S_FORM_TOKEN}

    + +

    + + {L_POST_UNAPPROVED_EXPLAIN} +

    +

    @@ -326,6 +333,8 @@

    {postrow.MESSAGE}
    + +
    diff --git a/template/viewtopic_print.html b/template/viewtopic_print.html index b504949..658062f 100644 --- a/template/viewtopic_print.html +++ b/template/viewtopic_print.html @@ -38,7 +38,14 @@ diff --git a/template/viewtopic_topic_tools.html b/template/viewtopic_topic_tools.html index 397c807..272a434 100644 --- a/template/viewtopic_topic_tools.html +++ b/template/viewtopic_topic_tools.html @@ -11,7 +11,7 @@
  • - {S_WATCH_TOPIC_TITLE} + {S_WATCH_TOPIC_TITLE}
  • diff --git a/theme/colours.css b/theme/colours.css index 9483eb4..119296a 100644 --- a/theme/colours.css +++ b/theme/colours.css @@ -672,6 +672,11 @@ Colours and backgrounds for buttons.css box-shadow: 0 0 10px #0075B0; } +.search-results li:hover, +.search-results li.active { + background-color: #CFE1F6; +} + /* Icon images ---------------------------------------- */ diff --git a/theme/common.css b/theme/common.css index 3ab6503..4cb5d24 100644 --- a/theme/common.css +++ b/theme/common.css @@ -3,7 +3,7 @@ html { font-size: 100%; /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ - height: 100%; + height: 101%; } body { @@ -11,7 +11,7 @@ body { font-size: 10px; line-height: normal; margin: 0; - padding: 0; + padding: 12px 0; word-wrap: break-word; -webkit-print-color-adjust: exact; } @@ -176,6 +176,7 @@ a:hover { text-decoration: underline; } } .site_logo { + background-repeat: no-repeat; display: inline-block; width: 45px; height: 50px; @@ -981,8 +982,15 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Miscellaneous styles ---------------------------------------- */ .copyright { - padding: 5px; + font-size: 10px; text-align: center; + padding: 10px; +} + +.footer-row { + font-size: 10px; + line-height: 1.8; + margin: 0; } .small { @@ -1267,6 +1275,10 @@ ul.linklist:after, width: 50px; } +.dropdown .clone.hidden { + display: none; +} + .dropdown .clone.hidden + li.separator { display: none; } diff --git a/theme/cp.css b/theme/cp.css index d54c948..0041417 100644 --- a/theme/cp.css +++ b/theme/cp.css @@ -300,11 +300,14 @@ ol.def-rules li { padding: 0 3px; } +/* DEPRECATED 3.2.6 .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { border-left-color: transparent; border-right-color: transparent; } +*/ +.pmlist li.pm_message_reported_colour, .pm_message_reported_colour, .pmlist li.pm_marked_colour, .pm_marked_colour, .pmlist li.pm_replied_colour, .pm_replied_colour, .pmlist li.pm_friend_colour, .pm_friend_colour, diff --git a/theme/de/icon_user_online.gif b/theme/de/icon_user_online.gif new file mode 100644 index 0000000000000000000000000000000000000000..6b571ffce0d515170d728074029583feeb3f08da GIT binary patch literal 423 zcmV;Y0a*S=Nk%w1VLAXh0J9GOzS!%9$Llq&>k^~uAE)c5(d$>Z>p-#VZNTfC&g)FI z>$BDCkjm?M!|Tf2>i_@%A^8LW000jFEC2ui06G9V000F4(8)<_eK_mQyU$h_eq{NH z=wz;JnzAtIqH)d5qOD{2xZ6F;4;Z8jYenM`mQ*cUD8OMbKwO?H5kMedFa%a5wiId* z01^g4I3`yRhe=?~Zl5S~bb)}77Or+46$S)T23rFSb%8e&2?z;W1OtC)VvHLWTLNk^~uAE)c5(d$>Z>p-#VZNTfC&g)FI z>$BDCkjm?M!|Tf2>i_@%A^8LW000jFEC2ui06G9V000F4(8)<_eK_mQyU$h_eq{NH z=wz;JnzAtIqH)d5qOD{2xZ6F;4;Z8jYenM`mQ*cUD8OMbKwO?H5kMedFa%a5wiId* z01^g4I3`yRhe=?~Zl5S~bb)}77Or+46$S)T23rFSb%8e&2?z;W1OtC)VvHLWTLN zKjWEtlc{<;@3dQNZAY1^wlS1#6qxr^VD4j{DL1$$UgnwrM3)$=wy`wqWv<`DKkET! z_ZjXmwYqtvo;-I?>Na+vxBquyukctd^7KH^Zjh~o_K|` z=PX<6QMT42jOCjJ<~`w^aYtb86PAX3+>@^{*X|Nr@SL%7EB~BFj1^n>XFp`F+by{8 z1w;8Jp+&D41{qNN$pUtf4u}NB2?P882D7Fn!PZv4j?S)bhu&Vf2@|{~Pnqg5ea1|Q z*|P=a&C^-9kax)v#^uY^R;^-KyVh;P#!Wt3wr-Q!vBPlpZpnT7Tn--OIC4bs_;Hm} zr+)sJYuD^=-n6@OhyVV4`A3f|o<3!H@j~_WYtwh{j6Qxe{_=(O`*)dN zzij{hWn*BRCt(rL?%1p)q;}@ugomx|{JI`fA{HjO%1IcO-Pp0Q!@b|csjbFwl1l4j zb;%VWI~S*Vvl}F?n_*ep;5*x?=$Xxd$?0A5?cF&Vx zD(whe?YJpz>Vc`NyVu7Dc8Km?kaJTx^2u* Gum%8ywf-3Z diff --git a/theme/images/bg_list.gif b/theme/images/bg_list.gif deleted file mode 100644 index 89f8963fde57e8227f4ef1677724e16d1c664151..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 zcmZ?wbhEHbWMzn9c*elM+I)zqdOLI79=5h)oZV*x7rx}5{gA8wB4^(PrkWkB%?Ej> z-C}Jzz}9+%z2hYB^gA4#rx?pOv$Y)Io_vjO#$ADVPZ`QKGS}?no_K|^Y8z|IVYZgT zJX5Z7_MT&JJH|ij0bAQqrkb5>tw%Y!PVr2=$v@{2*M!T=^?L;7KH=y-!`gU&rD1Q@ zx&H$5pYhGSFSPhIN9Rew1)bABq^oqG| zH)qdTrs^H+9Vgh^k26+mVXoc9Shu6*;Rz@0k=_wVyPdSw6f*>i`N zuU^Z&earmegTm*}O5eWm{`@KQ=a2ON|0WzF919j4Y~~VDn{sf1VskrxsK=Cy#fy%1 zn;T`_*|8|uT~@)l%f@lil7`9Zl`CRS26ddCZjc-|!_v6LcQ$9yvo8lXFF()V(9E^g xam$K}JRTGIB2R5ud08@GA=^x^t*b(1A~t9B9+;{z6NIK7IQ1_U+qe&z{}8ckk}qyEks!c=P!?ST_Me@h1x-1A{Pw4oDryP6k%z2PV8u znOw~pT#m2VnyfYk#vV4(ers(vjj0t+TYO%FO?Ak4xy;bKFn0540!^&=klT6(mYBm*W`^lWZfPjE#xcj)cxMZ>MtgNhEmBm|^$)BH}c6N4m!T)2f?N^Mr zfW`k>caP7{&t!v~U#R7e%>Rwb{npmjhRFYm!ts87ers!MkB^UMwfC09?4zTjf}y%* zsNh~+UVOs*hrH=|!vAQu`dD*``T6-^s_2=r$Dg*!dU|?rwC&8y%x#aYaFeiQvGR4m z|M2keA^8LW002J#EC2ui01E&M000JPz~9di02l)f;g1j)F)kEcfbbIp7B`g$#<~my z0FNz1;=~%fg>hBlWEzP`3t}w1d^N>)Yy0Rlon06Q-Cq-+2H diff --git a/theme/images/icon_rate_bad.gif b/theme/images/icon_rate_bad.gif deleted file mode 100644 index 790188940877c1c9cc92c67b41b0ca989588e711..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmV;?0WSVWNk%w1VH5x;0M!5h1_1)*dz9;dncIPu&xV)2jhM2Wp(_Ck9svmAV1N2@ zlJa$v)MkPBdYJEblpqik>v@#oeU-&-gZPc7-+z|gVU@kB5FC`^9O+z{+BqpAvKRGHSTC6`eDI_?uKQ$(|xV*T(z`?@6GBh7F9!xXG z6$;J`2ul;r&Ivv~A<_v83l8280zOI;-w+TC2iHm$3;_WV5fl^y7UD=3@bd!_AwDDP z0|HvWfPp{;4fc+J@KG>>4*=J)DFLvdV!|dq3KZb*kChJ&9HPlW(7`}QRu4p6EVXjj Hk01a$`g+4M diff --git a/theme/images/icon_rate_good.gif b/theme/images/icon_rate_good.gif deleted file mode 100644 index 6d23034d71c11a1266960200abe623da0a7e37b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtnZNk%w1VH5x;0M!5hX=-fA%FHe?H30<*Q(R{O5+wl*8h5htfxG#Iy7P^= z=99MEn6=fKwbG=s!@R`J0R#tSrRaUT{cWS$fV1g`x$bwN&5F6|o5%H!xZ{ww;E%Q4 zmA2WW#O9r}%&f!OY;bg(s<*ht(?&>1dV72O`}_Cz_wn)Z?d|R9>FMR=<>27p-rnBa z+}zmM*wob2iHV7BZf9}w>-7(cq%)COm-9v;V61T`KF4LkxfGb2nN3=A9`3kw<<8`nl3=^E=613vCX9To}-7Z(*3 z2`Jnn(xKnK1QQC_V}fBqf&>U6N;oi(2nLA~BG?-c#Ya5}ASW{8Vh@5xUMN$l{1F5I EJK2rEx&QzG diff --git a/theme/images/quote.gif b/theme/images/quote.gif deleted file mode 100644 index d1992273e6d8ae066d8adc58760cf46d33e67acf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmV;K0A~M3Nk%w1VGjTd0J9GOaByxvKR>OksiB~qh=_*X-Pl-HR(yPVOG`_|#ld7` zV!61r($UP7l#w$tGwSK&A^8LW000jFEC2ui01p5R000C=@X1LlU4~Jn5*3c4OiAD% zg_MMd_Aq9!Oi1WHN;pdcONI^#04R_&fQ?BGs5t-~yJcwbAUulW9q2h+ diff --git a/theme/images/quote_rtl.gif b/theme/images/quote_rtl.gif deleted file mode 100644 index ac719cf280fba68810d89e25246a5eda18411f7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmV;L0A>G2Nk%w1VGjTd0J8u9aByxvKR>OksiB~qh=_*X-Pl-HR(yPVOG`_|#ld7` zV!61r($UP7l#w$tGwSK&A^8LW000jFEC2ui01p5R000C>@X1N*ONvou7A=SqB$MJe z0<{F9_AsGCPRprG%!yQ|JjH`aqt}oKdH_kScX;(2x5uzYcnqG==_$256(s=ggm6k) I&XWiLJOAfD!vFvP diff --git a/theme/images/site_logo.gif b/theme/images/site_logo.gif deleted file mode 100644 index 2517fbedd691d93bebf31860a8b75b8de8b450f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5070 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 + + + + + diff --git a/theme/plupload.css b/theme/plupload.css index f466803..b1f3ae2 100644 --- a/theme/plupload.css +++ b/theme/plupload.css @@ -3,6 +3,10 @@ margin-bottom: 1em; } +.attach-row-tpl { + display: none; +} + .file-list td { vertical-align: middle; } diff --git a/theme/print.css b/theme/print.css index 9445279..ee916dc 100644 --- a/theme/print.css +++ b/theme/print.css @@ -90,7 +90,7 @@ hr { font-size: 75%; } -/* Dont want to print url for names or titles in content area */ +/* Don't want to print url for names or titles in content area */ .postbody .author a:link, .postbody .author a:visited, html>body .postbody .author a:link:after, html>body .postbody .author a:visited:after, diff --git a/theme/responsive.css b/theme/responsive.css index fcc11f1..ca4054c 100644 --- a/theme/responsive.css +++ b/theme/responsive.css @@ -421,6 +421,7 @@ .column1, .column2, .left-box.profile-details { float: none; width: auto; + clear: both; } /* Polls diff --git a/theme/stylesheet.css b/theme/stylesheet.css index 45eb5b6..c402d56 100644 --- a/theme/stylesheet.css +++ b/theme/stylesheet.css @@ -1,21 +1,21 @@ /* phpBB3 Style Sheet -------------------------------------------------------------- - Style name: prosilver (the default phpBB 3.2.x style) + Style name: prosilver (the default phpBB 3.3.x style) Based on style: Original author: Tom Beddard ( http://www.subblue.com/ ) Modified by: phpBB Limited ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ -@import url("normalize.css?v=3.2"); -@import url("base.css?v=3.2"); -@import url("utilities.css?v=3.2"); -@import url("common.css?v=3.2"); -@import url("links.css?v=3.2"); -@import url("content.css?v=3.2"); -@import url("buttons.css?v=3.2"); -@import url("cp.css?v=3.2"); -@import url("forms.css?v=3.2"); -@import url("icons.css?v=3.2"); -@import url("colours.css?v=3.2"); -@import url("responsive.css?v=3.2"); +@import url("normalize.css?v=3.3"); +@import url("base.css?v=3.3"); +@import url("utilities.css?v=3.3"); +@import url("common.css?v=3.3"); +@import url("links.css?v=3.3"); +@import url("content.css?v=3.3"); +@import url("buttons.css?v=3.3"); +@import url("cp.css?v=3.3"); +@import url("forms.css?v=3.3"); +@import url("icons.css?v=3.3"); +@import url("colours.css?v=3.3"); +@import url("responsive.css?v=3.3");