From 2f60f7f8348956a8b0ab7379a91e9dc3ffb81d9d Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 22 Apr 2014 20:19:05 -0700 Subject: Commit changes to upstream themes from the 3.0.12 upgrade --- prosilver/template/editor.js | 13 +- prosilver/template/forum_fn.js | 2 +- prosilver/template/jumpbox.html | 2 +- prosilver/template/login_forum.html | 45 ++++--- prosilver/template/mcp_approve.html | 2 +- prosilver/template/mcp_front.html | 3 +- prosilver/template/mcp_notes_user.html | 2 +- prosilver/template/mcp_post.html | 1 + prosilver/template/mcp_topic.html | 5 +- prosilver/template/memberlist_body.html | 35 +----- prosilver/template/memberlist_leaders.html | 4 +- prosilver/template/memberlist_search.html | 4 + prosilver/template/memberlist_view.html | 8 +- prosilver/template/message_body.html | 12 +- prosilver/template/overall_footer.html | 2 +- prosilver/template/overall_header.html | 8 +- prosilver/template/posting_buttons.html | 4 +- prosilver/template/posting_editor.html | 18 +-- prosilver/template/report_body.html | 4 + prosilver/template/search_body.html | 2 +- prosilver/template/search_results.html | 1 + prosilver/template/simple_footer.html | 2 +- prosilver/template/template.cfg | 7 +- prosilver/template/ucp_groups_manage.html | 28 +++-- prosilver/template/ucp_groups_membership.html | 2 +- prosilver/template/ucp_main_front.html | 4 +- prosilver/template/ucp_pm_history.html | 2 +- prosilver/template/ucp_pm_message_header.html | 23 ++-- prosilver/template/ucp_pm_viewfolder.html | 1 - prosilver/template/ucp_pm_viewmessage.html | 11 +- prosilver/template/ucp_pm_viewmessage_print.html | 154 +++++++---------------- prosilver/template/ucp_prefs_personal.html | 12 +- prosilver/template/ucp_profile_reg_details.html | 4 +- prosilver/template/viewonline_body.html | 2 +- prosilver/template/viewtopic_body.html | 11 +- prosilver/template/viewtopic_print.html | 2 +- 36 files changed, 192 insertions(+), 250 deletions(-) (limited to 'prosilver/template') diff --git a/prosilver/template/editor.js b/prosilver/template/editor.js index ddc862b..c16b0ef 100644 --- a/prosilver/template/editor.js +++ b/prosilver/template/editor.js @@ -151,8 +151,10 @@ function insert_text(text, spaces, popup) { text = ' ' + text + ' '; } - - if (!isNaN(textarea.selectionStart)) + + // Since IE9, IE also has textarea.selectionStart, but it still needs to be treated the old way. + // Therefore we simply add a !is_ie here until IE fixes the text-selection completely. + if (!isNaN(textarea.selectionStart) && !is_ie) { var sel_start = textarea.selectionStart; var sel_end = textarea.selectionEnd; @@ -216,11 +218,12 @@ function addquote(post_id, username, l_wrote) } // Get text selection - not only the post content :( - if (window.getSelection) + // IE9 must use the document.selection method but has the *.getSelection so we just force no IE + if (window.getSelection && !is_ie && !window.opera) { theSelection = window.getSelection().toString(); } - else if (document.getSelection) + else if (document.getSelection && !is_ie) { theSelection = document.getSelection(); } @@ -453,4 +456,4 @@ function getCaretPosition(txtarea) } return caretPos; -} \ No newline at end of file +} diff --git a/prosilver/template/forum_fn.js b/prosilver/template/forum_fn.js index 4a85858..240fe7e 100644 --- a/prosilver/template/forum_fn.js +++ b/prosilver/template/forum_fn.js @@ -200,7 +200,7 @@ function selectCode(a) // Get ID of code block var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0]; - // Not IE + // Not IE and IE9+ if (window.getSelection) { var s = window.getSelection(); diff --git a/prosilver/template/jumpbox.html b/prosilver/template/jumpbox.html index f7b4fca..1029627 100644 --- a/prosilver/template/jumpbox.html +++ b/prosilver/template/jumpbox.html @@ -10,7 +10,7 @@ -
+
diff --git a/prosilver/template/login_forum.html b/prosilver/template/login_forum.html index a342a9a..81a83b6 100644 --- a/prosilver/template/login_forum.html +++ b/prosilver/template/login_forum.html @@ -1,31 +1,36 @@ -

{L_LOGIN} {FORUM_NAME}

+

{FORUM_NAME}

{S_FORM_TOKEN}
-

{L_LOGIN_FORUM}

- -
- -
-
 
-
{LOGIN_ERROR}
-
- -
-
-
-
-
-
 
-
{S_HIDDEN_FIELDS}
-
- {S_LOGIN_REDIRECT} -
+
+

{L_LOGIN}

+ +

{L_LOGIN_FORUM}

+ +
+ +
+
 
+
{LOGIN_ERROR}
+
+ + +
+
+
+
+ {S_LOGIN_REDIRECT} +
+
 
+
{S_HIDDEN_FIELDS}
+
+
+
diff --git a/prosilver/template/mcp_approve.html b/prosilver/template/mcp_approve.html index 329205e..185dd49 100644 --- a/prosilver/template/mcp_approve.html +++ b/prosilver/template/mcp_approve.html @@ -8,7 +8,7 @@

{MESSAGE_TITLE}

-

{ADDITIONAL_MSG}

+

{ADDITIONAL_MSG}

diff --git a/prosilver/template/mcp_front.html b/prosilver/template/mcp_front.html index 0891948..89ab753 100644 --- a/prosilver/template/mcp_front.html +++ b/prosilver/template/mcp_front.html @@ -28,7 +28,6 @@
{unapproved.SUBJECT} {unapproved.ATTACH_ICON_IMG}
- {report.PAGINATION} {L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} » {unapproved.POST_TIME}
@@ -120,7 +119,7 @@
    -
  • +
  • {pm_report.PM_SUBJECT} {pm_report.ATTACH_ICON_IMG}
    diff --git a/prosilver/template/mcp_notes_user.html b/prosilver/template/mcp_notes_user.html index c7c089e..7e92445 100644 --- a/prosilver/template/mcp_notes_user.html +++ b/prosilver/template/mcp_notes_user.html @@ -78,7 +78,7 @@ {usernotes.REPORT_AT} {usernotes.ACTION} - + diff --git a/prosilver/template/mcp_post.html b/prosilver/template/mcp_post.html index 9d4997e..f8403ff 100644 --- a/prosilver/template/mcp_post.html +++ b/prosilver/template/mcp_post.html @@ -74,6 +74,7 @@

      + {S_FORM_TOKEN}

    diff --git a/prosilver/template/mcp_topic.html b/prosilver/template/mcp_topic.html index a4d2a0f..13b661e 100644 --- a/prosilver/template/mcp_topic.html +++ b/prosilver/template/mcp_topic.html @@ -1,5 +1,6 @@ +

    {L_TOPIC}: {TOPIC_TITLE}

    diff --git a/prosilver/template/posting_buttons.html b/prosilver/template/posting_buttons.html index 19d55d1..78c2a0d 100644 --- a/prosilver/template/posting_buttons.html +++ b/prosilver/template/posting_buttons.html @@ -25,7 +25,7 @@ a: '{LA_BBCODE_A_HELP}', s: '{LA_BBCODE_S_HELP}', f: '{LA_BBCODE_F_HELP}', - e: '{LA_BBCODE_E_HELP}', + y: '{LA_BBCODE_Y_HELP}', d: '{LA_BBCODE_D_HELP}' ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' @@ -79,7 +79,7 @@ - + diff --git a/prosilver/template/posting_editor.html b/prosilver/template/posting_editor.html index 5f7fb84..5acdb3a 100644 --- a/prosilver/template/posting_editor.html +++ b/prosilver/template/posting_editor.html @@ -17,7 +17,7 @@
    - {to_recipient.NAME} {to_recipient.NAME_FULL}  + {to_recipient.NAME}{to_recipient.NAME_FULL}   
    @@ -29,7 +29,7 @@
    - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}   
    @@ -37,10 +37,10 @@
    -
    +
    {L_FIND_USERNAME}
    -
    -
    +
    +
    @@ -50,7 +50,7 @@
    - {to_recipient.NAME}{to_recipient.NAME_FULL}  + {to_recipient.NAME}{to_recipient.NAME_FULL}   
    @@ -87,8 +87,8 @@
    - - + +
    @@ -165,7 +165,7 @@
    -
    {attach_row.FILENAME}
    +
    {attach_row.FILENAME}
      diff --git a/prosilver/template/report_body.html b/prosilver/template/report_body.html index b0c6e08..2d6a857 100644 --- a/prosilver/template/report_body.html +++ b/prosilver/template/report_body.html @@ -10,6 +10,7 @@

    {L_REPORT_POST_EXPLAIN}{L_REPORT_MESSAGE_EXPLAIN}

    +
    {ERROR}
    @@ -27,6 +28,9 @@

    {L_CAN_LEAVE_BLANK}
    + + +
diff --git a/prosilver/template/search_body.html b/prosilver/template/search_body.html index 6616b95..4b1d30d 100644 --- a/prosilver/template/search_body.html +++ b/prosilver/template/search_body.html @@ -98,7 +98,7 @@ -
+
diff --git a/prosilver/template/search_results.html b/prosilver/template/search_results.html index f2a4435..0ea9d8a 100644 --- a/prosilver/template/search_results.html +++ b/prosilver/template/search_results.html @@ -1,6 +1,7 @@

{SEARCH_TITLE}{SEARCH_MATCHES}: {SEARCH_WORDS}

+

{L_SEARCHED_QUERY}: {SEARCHED_QUERY}

{L_IGNORED_TERMS}: {IGNORED_WORDS}

diff --git a/prosilver/template/simple_footer.html b/prosilver/template/simple_footer.html index 9795140..cc54c42 100644 --- a/prosilver/template/simple_footer.html +++ b/prosilver/template/simple_footer.html @@ -1,6 +1,6 @@ -
Powered by phpBB® Forum Software © phpBB Group +
{CREDIT_LINE}
{TRANSLATION_INFO}
{DEBUG_OUTPUT}
diff --git a/prosilver/template/template.cfg b/prosilver/template/template.cfg index 42383a0..af84a0a 100644 --- a/prosilver/template/template.cfg +++ b/prosilver/template/template.cfg @@ -19,7 +19,12 @@ # General Information about this template name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.9 +version = 3.0.12 # Defining a different template bitfield template_bitfield = lNg= + +# Template inheritance +# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ +# Set value to empty to ignore template inheritance +inherit_from = prosilver diff --git a/prosilver/template/ucp_groups_manage.html b/prosilver/template/ucp_groups_manage.html index bce3143..c904613 100644 --- a/prosilver/template/ucp_groups_manage.html +++ b/prosilver/template/ucp_groups_manage.html @@ -6,19 +6,18 @@
- + + +
+

{ERROR_MSG}

+
+ +

{L_GROUPS_EXPLAIN}

{L_GROUP_DETAILS}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - +
@@ -55,7 +54,7 @@

{L_GROUP_COLOR_EXPLAIN}
-
    [ {L_COLOUR_SWATCH} ]
+
    [ {L_COLOUR_SWATCH} ]
@@ -143,8 +142,15 @@ +
+ + + + + + - + diff --git a/prosilver/template/ucp_groups_membership.html b/prosilver/template/ucp_groups_membership.html index a147dbf..ef595dd 100644 --- a/prosilver/template/ucp_groups_membership.html +++ b/prosilver/template/ucp_groups_membership.html @@ -93,7 +93,7 @@
{pending.GROUP_DESC}
{pending.GROUP_STATUS} -
disabled="diabled" />
+
disabled="disabled" />
diff --git a/prosilver/template/ucp_main_front.html b/prosilver/template/ucp_main_front.html index 39c5d4f..4a6fa3b 100644 --- a/prosilver/template/ucp_main_front.html +++ b/prosilver/template/ucp_main_front.html @@ -34,8 +34,8 @@
{L_JOINED}:
{JOINED}
{L_VISITED}:
{LAST_VISIT_YOU}
{L_TOTAL_POSTS}:
{POSTS} | {L_SEARCH_YOUR_POSTS}
({POSTS_DAY} / {POSTS_PCT}){POSTS}
-
{L_ACTIVE_IN_FORUM}:
{ACTIVE_FORUM}
({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})
-
{L_ACTIVE_IN_TOPIC}:
{ACTIVE_TOPIC}
({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})
+
{L_ACTIVE_IN_FORUM}:
{ACTIVE_FORUM}
({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})
+
{L_ACTIVE_IN_TOPIC}:
{ACTIVE_TOPIC}
({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})
{L_YOUR_WARNINGS}:
{WARNING_IMG} [{WARNINGS}]
diff --git a/prosilver/template/ucp_pm_history.html b/prosilver/template/ucp_pm_history.html index 9051eb2..0767920 100644 --- a/prosilver/template/ucp_pm_history.html +++ b/prosilver/template/ucp_pm_history.html @@ -24,7 +24,7 @@

class="current">{history_row.SUBJECT}

{history_row.MINI_POST_IMG} {L_SENT_AT}: {history_row.SENT_DATE}
{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}

-
{history_row.MESSAGE}
+
{history_row.MESSAGE}{L_MESSAGE_REMOVED_FROM_OUTBOX}
diff --git a/prosilver/template/ucp_pm_message_header.html b/prosilver/template/ucp_pm_message_header.html index fcebab0..ae66dd0 100644 --- a/prosilver/template/ucp_pm_message_header.html +++ b/prosilver/template/ucp_pm_message_header.html @@ -1,25 +1,22 @@

{L_TITLE}: {CUR_FOLDER_NAME}

-
+
+ +

{FOLDER_STATUS}

-
-
{L_POST_REPLY_PM}
+
{L_POST_REPLY_PM}
{L_UCP_PM_COMPOSE}
{L_FORWARD_PM}
+
{L_REPLY_TO_ALL}
- - -
» {L_REPLY_TO_ALL}
- - - -
-
- - + diff --git a/prosilver/template/ucp_pm_viewfolder.html b/prosilver/template/ucp_pm_viewfolder.html index d7e02e4..c9f28ce 100644 --- a/prosilver/template/ucp_pm_viewfolder.html +++ b/prosilver/template/ucp_pm_viewfolder.html @@ -2,7 +2,6 @@ -
diff --git a/prosilver/template/ucp_pm_viewmessage.html b/prosilver/template/ucp_pm_viewmessage.html index df0cf25..1840732 100644 --- a/prosilver/template/ucp_pm_viewmessage.html +++ b/prosilver/template/ucp_pm_viewmessage.html @@ -1,18 +1,21 @@ - + +
+
+ -
+
{L_VIEW_PREVIOUS_HISTORY} {L_VIEW_NEXT_HISTORY}
-
-
+
+
diff --git a/prosilver/template/ucp_pm_viewmessage_print.html b/prosilver/template/ucp_pm_viewmessage_print.html index b1a9329..67e14de 100644 --- a/prosilver/template/ucp_pm_viewmessage_print.html +++ b/prosilver/template/ucp_pm_viewmessage_print.html @@ -1,120 +1,56 @@ + -{SITENAME} :: {PAGE_TITLE} - - - + + + + + + +{META} +{SITENAME} • {PAGE_TITLE} + + - - -
{L_MEMBERS}
{L_GROUPS_NO_MEMBERS}{L_GROUPS_NO_MEMBERS}
- - - - - - - - - - -
{SITENAME}
{L_PRIVATE_MESSAGING}

{SUBJECT}
{PAGE_NUMBER}
- -
- - - - - - - - - - - - - - - - - - - - - - - -
{L_PM_FROM}: {MESSAGE_AUTHOR} [ {SENT_DATE} ]
{L_TO}: - - class="sep">{to_recipient.NAME}  - -
{L_BCC}: - - class="sep">{bcc_recipient.NAME}  - -
{MESSAGE}
- -
- - - - - - - - -
{PAGE_NUMBER}{S_TIMEZONE}
Powered by phpBB® Forum Software © phpBB Group
http://www.phpbb.com/
+ +
+ + +
+

{SITENAME}

+

{SITE_DESCRIPTION}

+ +

{L_PRIVATE_MESSAGING}

+
+ +
+
{PAGE_NUMBER}
+
+

{SUBJECT}

+
{L_SENT_AT} {SENT_DATE}
+
{L_PM_FROM} {MESSAGE_AUTHOR}
+ +
{L_TO} {to_recipient.NAME} 
+ + +
{L_BCC} {bcc_recipient.NAME} 
+ +
+
{MESSAGE}
+
+
+
+ +
+
{S_TIMEZONE}
{PAGE_NUMBER}
+
Powered by phpBB® Forum Software © phpBB Group
https://www.phpbb.com/
+
+
\ No newline at end of file diff --git a/prosilver/template/ucp_prefs_personal.html b/prosilver/template/ucp_prefs_personal.html index 9022346..600319f 100644 --- a/prosilver/template/ucp_prefs_personal.html +++ b/prosilver/template/ucp_prefs_personal.html @@ -63,11 +63,13 @@ -
-
-
-
- + +
+
+
+
+ +
diff --git a/prosilver/template/ucp_profile_reg_details.html b/prosilver/template/ucp_profile_reg_details.html index edd58d5..5eb55dc 100644 --- a/prosilver/template/ucp_profile_reg_details.html +++ b/prosilver/template/ucp_profile_reg_details.html @@ -45,7 +45,7 @@
-

{L_CURRENT_PASSWORD_EXPLAIN}
+

{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}{L_CURRENT_PASSWORD_EXPLAIN}
@@ -54,7 +54,7 @@
- {S_HIDDEN_FIELDS}  + {S_HIDDEN_FIELDS}  {S_FORM_TOKEN}
diff --git a/prosilver/template/viewonline_body.html b/prosilver/template/viewonline_body.html index b111d74..3f1f0e6 100644 --- a/prosilver/template/viewonline_body.html +++ b/prosilver/template/viewonline_body.html @@ -7,7 +7,7 @@ -
+
diff --git a/prosilver/template/viewtopic_body.html b/prosilver/template/viewtopic_body.html index 32292f8..57de96d 100644 --- a/prosilver/template/viewtopic_body.html +++ b/prosilver/template/viewtopic_body.html @@ -4,13 +4,10 @@
{FORUM_DESC}
- -

- - {L_MODERATOR}{L_MODERATORS}: {MODERATORS} - - -

+ +

+ {L_MODERATOR}{L_MODERATORS}: {MODERATORS} +

diff --git a/prosilver/template/viewtopic_print.html b/prosilver/template/viewtopic_print.html index 0fd0e6d..39d2d76 100644 --- a/prosilver/template/viewtopic_print.html +++ b/prosilver/template/viewtopic_print.html @@ -44,7 +44,7 @@
{S_TIMEZONE}
{PAGE_NUMBER}
-
Powered by phpBB® Forum Software © phpBB Group
http://www.phpbb.com/
+
Powered by phpBB® Forum Software © phpBB Group
https://www.phpbb.com/
-- cgit v1.2.3-70-g09d2