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 @@
- autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" data-overlay="false" /> + autocomplete="off" data-filter="phpbb.search.filter" data-ajax="member_search" data-min-length="3" data-url="{U_LIVE_SEARCH}" data-results="#user-search" /> diff --git a/template/posting_buttons.html b/template/posting_buttons.html index 14185ed..1564b5f 100644 --- a/template/posting_buttons.html +++ b/template/posting_buttons.html @@ -1,6 +1,5 @@ - @@ -55,7 +31,7 @@ @@ -120,7 +96,7 @@ - diff --git a/template/posting_layout.html b/template/posting_layout.html index bca9195..7c9deb5 100644 --- a/template/posting_layout.html +++ b/template/posting_layout.html @@ -38,27 +38,6 @@ - -
-
-
-

{L_SELECT_DESTINATION_FORUM}

-

{L_UNGLOBALISE_EXPLAIN}

-
-
-
-
- -
-
 
-
-
-
- -
-
- -
diff --git a/template/posting_pm_header.html b/template/posting_pm_header.html index 032d8c6..7fee914 100644 --- a/template/posting_pm_header.html +++ b/template/posting_pm_header.html @@ -32,7 +32,7 @@
  • - {to_recipient.NAME}{to_recipient.NAME_FULL} + {to_recipient.NAME}{to_recipient.NAME_FULL}
    • @@ -49,7 +49,7 @@
  • - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL} + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}
    • diff --git a/template/posting_poll_body.html b/template/posting_poll_body.html index ee7100a..7956496 100644 --- a/template/posting_poll_body.html +++ b/template/posting_poll_body.html @@ -15,8 +15,8 @@
    -
    -
    +
    +

    {L_POLL_OPTIONS_EXPLAIN}
    diff --git a/template/posting_preview.html b/template/posting_preview.html index aac117c..781d0de 100644 --- a/template/posting_preview.html +++ b/template/posting_preview.html @@ -31,6 +31,8 @@
    {PREVIEW_MESSAGE}
    + +
    {L_ATTACHMENTS}
    diff --git a/template/posting_review.html b/template/posting_review.html index 1304046..e5d285e 100644 --- a/template/posting_review.html +++ b/template/posting_review.html @@ -13,7 +13,7 @@
    -

    {post_review_row.POST_SUBJECT}

    +

    {post_review_row.POST_SUBJECT}

    {post_review_row.MINI_POST} @@ -22,7 +22,7 @@ {post_review_row.MINI_POST} - {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} » {post_review_row.POST_DATE} + {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} » {post_review_row.POST_DATE}

    {post_review_row.MESSAGE}
    diff --git a/template/posting_smilies.html b/template/posting_smilies.html index 54e82a5..b5794d5 100644 --- a/template/posting_smilies.html +++ b/template/posting_smilies.html @@ -1,10 +1,8 @@ - diff --git a/template/posting_topic_review.html b/template/posting_topic_review.html index 857c686..209dadf 100644 --- a/template/posting_topic_review.html +++ b/template/posting_topic_review.html @@ -5,10 +5,8 @@
    - @@ -26,7 +24,7 @@
    -

    {topic_review_row.POST_SUBJECT}

    +

    {topic_review_row.POST_SUBJECT}

      @@ -56,12 +54,14 @@ {topic_review_row.MINI_POST} - {L_POST_BY_AUTHOR} {topic_review_row.POST_AUTHOR_FULL} » {topic_review_row.POST_DATE} + {L_POST_BY_AUTHOR} {topic_review_row.POST_AUTHOR_FULL} » {topic_review_row.POST_DATE}

      {topic_review_row.MESSAGE}
      + +
      {L_ATTACHMENTS}
      diff --git a/template/search_results.html b/template/search_results.html index 6bc5c72..9ee13a4 100644 --- a/template/search_results.html +++ b/template/search_results.html @@ -108,7 +108,7 @@ @@ -117,7 +117,9 @@
      - {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » {searchresults.FIRST_POST_TIME} » {L_IN} {searchresults.FORUM_TITLE} + {% EVENT topiclist_row_topic_by_author_before %} + {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} » » {L_IN} {searchresults.FORUM_TITLE} + {% EVENT topiclist_row_topic_by_author_after %}
      @@ -142,13 +144,13 @@
      {searchresults.TOPIC_REPLIES} {L_REPLIES}
      {searchresults.TOPIC_VIEWS} {L_VIEWS}
      - {L_LAST_POST} {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} + {L_LAST_POST} {L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL} {VIEW_LATEST_POST} -
      {searchresults.LAST_POST_TIME} +
      @@ -181,7 +183,7 @@
      -
      {L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
      +
      {L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
      {searchresults.POST_DATE}
      {L_FORUM}{L_COLON} {searchresults.FORUM_TITLE}
      {L_TOPIC}{L_COLON} {searchresults.TOPIC_TITLE}
      @@ -194,6 +196,7 @@

      {searchresults.POST_SUBJECT}

      {searchresults.MESSAGE}
      +
      diff --git a/template/simple_footer.html b/template/simple_footer.html index 614c137..fde162a 100644 --- a/template/simple_footer.html +++ b/template/simple_footer.html @@ -24,9 +24,9 @@
    - - - + + + @@ -34,5 +34,7 @@ {$SCRIPTS} +{% EVENT simple_footer_body_after %} + diff --git a/template/ucp_agreement.html b/template/ucp_agreement.html index 943774c..7959925 100644 --- a/template/ucp_agreement.html +++ b/template/ucp_agreement.html @@ -3,8 +3,7 @@ - @@ -46,7 +43,8 @@
    - {L_COPPA_NO}  {L_COPPA_YES} + +   @@ -65,8 +63,6 @@

    {SITENAME} - {AGREEMENT_TITLE}

    {AGREEMENT_TEXT}

    -
    -

    {L_BACK}

    diff --git a/template/ucp_attachments.html b/template/ucp_attachments.html index 696f621..cfdbf9c 100644 --- a/template/ucp_attachments.html +++ b/template/ucp_attachments.html @@ -44,7 +44,7 @@
    {attachrow.DOWNLOAD_COUNT}
    {attachrow.POST_TIME}
    -
    +
    diff --git a/template/ucp_auth_link_oauth.html b/template/ucp_auth_link_oauth.html index 1831661..60061a3 100644 --- a/template/ucp_auth_link_oauth.html +++ b/template/ucp_auth_link_oauth.html @@ -1,5 +1,5 @@ - +

    {oauth.SERVICE_NAME}

    diff --git a/template/ucp_avatar_options_upload.html b/template/ucp_avatar_options_upload.html index 63a734e..666950e 100644 --- a/template/ucp_avatar_options_upload.html +++ b/template/ucp_avatar_options_upload.html @@ -1,6 +1,6 @@
    -
    +
    diff --git a/template/ucp_groups_manage.html b/template/ucp_groups_manage.html index f2b4f00..adc8c61 100644 --- a/template/ucp_groups_manage.html +++ b/template/ucp_groups_manage.html @@ -58,7 +58,7 @@     [ {L_COLOUR_SWATCH} ] - +
    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 @@
    {S_TIMEZONE}
    {PAGE_NUMBER}
    -
    Powered by phpBB® Forum Software © phpBB Limited
    https://www.phpbb.com/
    +
    +

    {{ CREDIT_LINE }} +

    + {% if TRANSLATION_INFO %} +

    {{ TRANSLATION_INFO }} +

    + {% endif %} +
    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 @@
    {S_TIMEZONE}
    {PAGE_NUMBER}
    -
    Powered by phpBB® Forum Software © phpBB Limited
    https://www.phpbb.com/
    +
    +

    {{ CREDIT_LINE }} +

    + {% if TRANSLATION_INFO %} +

    {{ TRANSLATION_INFO }} +

    + {% endif %} +
    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 0000000..6b571ff Binary files /dev/null and b/theme/de/icon_user_online.gif differ diff --git a/theme/de/index.htm b/theme/de/index.htm new file mode 100644 index 0000000..e69de29 diff --git a/theme/de/stylesheet.css b/theme/de/stylesheet.css new file mode 100644 index 0000000..604b299 --- /dev/null +++ b/theme/de/stylesheet.css @@ -0,0 +1,2 @@ +/* Online image */ +.online { background-image: url("./icon_user_online.gif"); } diff --git a/theme/de_x_sie/icon_user_online.gif b/theme/de_x_sie/icon_user_online.gif new file mode 100644 index 0000000..6b571ff Binary files /dev/null and b/theme/de_x_sie/icon_user_online.gif differ diff --git a/theme/de_x_sie/index.htm b/theme/de_x_sie/index.htm new file mode 100644 index 0000000..e69de29 diff --git a/theme/de_x_sie/stylesheet.css b/theme/de_x_sie/stylesheet.css new file mode 100644 index 0000000..604b299 --- /dev/null +++ b/theme/de_x_sie/stylesheet.css @@ -0,0 +1,2 @@ +/* Online image */ +.online { background-image: url("./icon_user_online.gif"); } diff --git a/theme/forms.css b/theme/forms.css index 5646a7d..99c898f 100644 --- a/theme/forms.css +++ b/theme/forms.css @@ -355,7 +355,7 @@ input.button3 { font-variant: small-caps; } -input[type="button"], input[type="submit"], input[type="reset"], input[type="checkbox"], input[type="radio"] { +input[type="button"], input[type="submit"], input[type="reset"], input[type="checkbox"], input[type="radio"], .search-results li { cursor: pointer; } diff --git a/theme/icons.css b/theme/icons.css index 6643f12..3ac5984 100644 --- a/theme/icons.css +++ b/theme/icons.css @@ -5,7 +5,7 @@ /* Global module setup --------------------------------*/ -/* Renamed version of .fa class for agnostic useage of icon fonts. +/* Renamed version of .fa class for agnostic usage of icon fonts. * Just change the name of the font after the 14/1 to the name of * the font you wish to use. */ diff --git a/theme/images/bg_header.gif b/theme/images/bg_header.gif deleted file mode 100644 index 351de9f..0000000 Binary files a/theme/images/bg_header.gif and /dev/null differ diff --git a/theme/images/bg_list.gif b/theme/images/bg_list.gif deleted file mode 100644 index 89f8963..0000000 Binary files a/theme/images/bg_list.gif and /dev/null differ diff --git a/theme/images/icon_download.gif b/theme/images/icon_download.gif deleted file mode 100644 index 70cd61c..0000000 Binary files a/theme/images/icon_download.gif and /dev/null differ diff --git a/theme/images/icon_offline.gif b/theme/images/icon_offline.gif deleted file mode 100644 index 5dc4212..0000000 Binary files a/theme/images/icon_offline.gif and /dev/null differ diff --git a/theme/images/icon_online.gif b/theme/images/icon_online.gif deleted file mode 100644 index d0d202d..0000000 Binary files a/theme/images/icon_online.gif and /dev/null differ diff --git a/theme/images/icon_rate_bad.gif b/theme/images/icon_rate_bad.gif deleted file mode 100644 index 7901889..0000000 Binary files a/theme/images/icon_rate_bad.gif and /dev/null differ diff --git a/theme/images/icon_rate_good.gif b/theme/images/icon_rate_good.gif deleted file mode 100644 index 6d23034..0000000 Binary files a/theme/images/icon_rate_good.gif and /dev/null differ diff --git a/theme/images/quote.gif b/theme/images/quote.gif deleted file mode 100644 index d199227..0000000 Binary files a/theme/images/quote.gif and /dev/null differ diff --git a/theme/images/quote_rtl.gif b/theme/images/quote_rtl.gif deleted file mode 100644 index ac719cf..0000000 Binary files a/theme/images/quote_rtl.gif and /dev/null differ diff --git a/theme/images/site_logo.gif b/theme/images/site_logo.gif deleted file mode 100644 index 2517fbe..0000000 Binary files a/theme/images/site_logo.gif and /dev/null differ diff --git a/theme/images/site_logo.svg b/theme/images/site_logo.svg new file mode 100644 index 0000000..4ce8903 --- /dev/null +++ b/theme/images/site_logo.svg @@ -0,0 +1,6 @@ + + + + + + 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");