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/imageset/imageset.cfg | 2 +- prosilver/style.cfg | 2 +- 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 +- prosilver/theme/bidi.css | 17 ++- prosilver/theme/buttons.css | 2 +- prosilver/theme/colours.css | 6 - prosilver/theme/common.css | 16 ++- prosilver/theme/content.css | 2 +- prosilver/theme/cp.css | 46 +++---- prosilver/theme/forms.css | 3 +- prosilver/theme/links.css | 2 +- prosilver/theme/print.css | 9 +- prosilver/theme/stylesheet.css | 12 +- prosilver/theme/theme.cfg | 2 +- prosilver/theme/tweaks.css | 16 ++- subsilver2/imageset/imageset.cfg | 2 +- subsilver2/style.cfg | 2 +- subsilver2/template/attachment.html | 2 +- subsilver2/template/captcha_default.html | 2 +- subsilver2/template/captcha_qa.html | 2 +- subsilver2/template/editor.js | 13 +- subsilver2/template/faq_body.html | 2 +- subsilver2/template/login_body.html | 2 +- subsilver2/template/login_forum.html | 8 ++ subsilver2/template/mcp_topic.html | 1 + subsilver2/template/memberlist_body.html | 7 +- subsilver2/template/memberlist_view.html | 8 +- subsilver2/template/overall_footer.html | 2 +- subsilver2/template/posting_body.html | 3 +- subsilver2/template/posting_buttons.html | 6 +- subsilver2/template/report_body.html | 8 ++ subsilver2/template/simple_footer.html | 2 +- subsilver2/template/template.cfg | 6 +- subsilver2/template/ucp_header.html | 4 +- subsilver2/template/ucp_main_front.html | 4 +- subsilver2/template/ucp_pm_history.html | 2 +- subsilver2/template/ucp_pm_viewmessage_print.html | 4 +- subsilver2/template/ucp_prefs_personal.html | 4 +- subsilver2/template/ucp_profile_reg_details.html | 2 +- subsilver2/template/viewforum_body.html | 2 +- subsilver2/template/viewtopic_print.html | 2 +- subsilver2/theme/stylesheet.css | 15 +-- subsilver2/theme/theme.cfg | 2 +- 78 files changed, 344 insertions(+), 354 deletions(-) diff --git a/prosilver/imageset/imageset.cfg b/prosilver/imageset/imageset.cfg index 7225207..22178d8 100644 --- a/prosilver/imageset/imageset.cfg +++ b/prosilver/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.9 +version = 3.0.12 # Images img_site_logo = site_logo.gif*52*139 diff --git a/prosilver/style.cfg b/prosilver/style.cfg index 83e762f..811e5f4 100644 --- a/prosilver/style.cfg +++ b/prosilver/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.9 \ No newline at end of file +version = 3.0.12 \ No newline at end of file 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/
diff --git a/prosilver/theme/bidi.css b/prosilver/theme/bidi.css index f441784..c258ed1 100644 --- a/prosilver/theme/bidi.css +++ b/prosilver/theme/bidi.css @@ -1,4 +1,4 @@ -/* proSilver RTL definitions +/* RTL definitions ---------------------------------------- */ /** @@ -519,7 +519,7 @@ /** * cp.css */ -/* proSilver Control Panel Styles +/* Control Panel Styles ---------------------------------------- */ @@ -591,6 +591,19 @@ /* PM Styles ----------------------------------------*/ +/* PM panel adjustments */ +.rtl .reply-all a.right { + background-position: 5% 60%; +} + +.rtl .reply-all a.right:hover { + background-position: 3% 60%; +} + +.rtl .reply-all { + padding-left: 5px; +} + /* Defined rules list for PM options */ .rtl ol.def-rules { padding-right: 0; diff --git a/prosilver/theme/buttons.css b/prosilver/theme/buttons.css index 6cffdc5..a9ded9c 100644 --- a/prosilver/theme/buttons.css +++ b/prosilver/theme/buttons.css @@ -1,4 +1,4 @@ -/* proSilver Button Styles +/* Button Styles ---------------------------------------- */ /* Rollover buttons diff --git a/prosilver/theme/colours.css b/prosilver/theme/colours.css index e98ce23..b9e4491 100644 --- a/prosilver/theme/colours.css +++ b/prosilver/theme/colours.css @@ -884,12 +884,6 @@ dl.mini dt { color: #000000 !important; } -/* PM panel adjustments */ -.pm-panel-header, -#cp-main .pm-message-nav { - border-bottom-color: #A4B3BF; -} - /* PM marking colours */ .pmlist li.pm_message_reported_colour, .pm_message_reported_colour { border-left-color: #BC2A4D; diff --git a/prosilver/theme/common.css b/prosilver/theme/common.css index a86f723..7eb00bd 100644 --- a/prosilver/theme/common.css +++ b/prosilver/theme/common.css @@ -1,4 +1,4 @@ -/* General proSilver Markup Styles +/* General Markup Styles ---------------------------------------- */ * { @@ -418,7 +418,19 @@ table.info tbody th { } .forumbg table.table1 { - margin: 0 -2px -1px -1px; + margin: 0; +} + +.forumbg-table > .inner { + margin: 0 -1px; +} + +.forumbg-table > .inner > span.corners-top { + margin: 0 -4px -1px -4px; +} + +.forumbg-table > .inner > span.corners-bottom { + margin: -1px -4px 0 -4px; } /* Misc layout styles diff --git a/prosilver/theme/content.css b/prosilver/theme/content.css index 64beb97..5f627c8 100644 --- a/prosilver/theme/content.css +++ b/prosilver/theme/content.css @@ -1,4 +1,4 @@ -/* proSilver Content Styles +/* Content Styles ---------------------------------------- */ ul.topiclist { diff --git a/prosilver/theme/cp.css b/prosilver/theme/cp.css index b574b0a..7c7158b 100644 --- a/prosilver/theme/cp.css +++ b/prosilver/theme/cp.css @@ -1,4 +1,4 @@ -/* proSilver Control Panel Styles +/* Control Panel Styles ---------------------------------------- */ @@ -104,6 +104,22 @@ ul.cplist { width: 100%; } +.tabs-container h2 { + float: left; + margin-bottom: 0px; +} + +.tabs-container #minitabs { + float: right; + margin-top: 19px; +} + +.tabs-container:after { + display: block; + clear: both; + content: ''; +} + /* CP tabbed menu ----------------------------------------*/ #tabs { @@ -349,31 +365,17 @@ dl.mini dd { } /* PM panel adjustments */ -.pm-panel-header { - margin: 0; - padding-bottom: 10px; - border-bottom: 1px dashed #A4B3BF; +.reply-all a.left { + background-position: 3px 60%; } -.reply-all { - display: block; - padding-top: 4px; - clear: both; - float: left; +.reply-all a.left:hover { + background-position: 0px 60%; } -.pm-panel-message { - padding-top: 10px; -} - -.pm-return-to { - padding-top: 23px; -} - -#cp-main .pm-message-nav { - margin: 0; - padding: 2px 10px 5px 10px; - border-bottom: 1px dashed #A4B3BF; +.reply-all { + font-size: 11px; + padding-top: 5px; } /* PM Message history */ diff --git a/prosilver/theme/forms.css b/prosilver/theme/forms.css index 803c608..4388873 100644 --- a/prosilver/theme/forms.css +++ b/prosilver/theme/forms.css @@ -1,4 +1,4 @@ -/* proSilver Form Styles +/* Form Styles ---------------------------------------- */ /* General form styles @@ -26,6 +26,7 @@ select { border: 1px solid #666666; padding: 1px; background-color: #FAFAFA; + font-size: 1em; } option { diff --git a/prosilver/theme/links.css b/prosilver/theme/links.css index 1f6c2af..05662b9 100644 --- a/prosilver/theme/links.css +++ b/prosilver/theme/links.css @@ -1,4 +1,4 @@ -/* proSilver Link Styles +/* Link Styles ---------------------------------------- */ /* Links adjustment to correctly display an order of rtl/ltr mixed content */ diff --git a/prosilver/theme/print.css b/prosilver/theme/print.css index 2cfcd4d..bc3ca80 100644 --- a/prosilver/theme/print.css +++ b/prosilver/theme/print.css @@ -1,10 +1,5 @@ -/* proSilver Print Style Sheet -------------------------------------------------- - Author: subBlue ( http://www.subBlue.com/ ) - Version: 25 August 2004 - - Copyright 2004 phpBB Group --------------------------------------------------*/ +/* Print Style Sheet +---------------------------------------- */ /* Lots still TODO here! */ diff --git a/prosilver/theme/stylesheet.css b/prosilver/theme/stylesheet.css index c7db605..4062017 100644 --- a/prosilver/theme/stylesheet.css +++ b/prosilver/theme/stylesheet.css @@ -1,11 +1,9 @@ -/* phpBB 3.0 Style Sheet +/* phpBB3 Style Sheet -------------------------------------------------------------- - Style name: proSilver - Based on style: proSilver (this is the default phpBB 3 style) - Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: - - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) + Style name: prosilver (the default phpBB 3.0.x style) + Based on style: + Original author: Tom Beddard ( http://www.subblue.com/ ) + Modified by: phpBB Group ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ diff --git a/prosilver/theme/theme.cfg b/prosilver/theme/theme.cfg index 4270094..03d82ed 100644 --- a/prosilver/theme/theme.cfg +++ b/prosilver/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.9 +version = 3.0.12 # Some configuration options diff --git a/prosilver/theme/tweaks.css b/prosilver/theme/tweaks.css index 30fe5fb..0c03020 100644 --- a/prosilver/theme/tweaks.css +++ b/prosilver/theme/tweaks.css @@ -1,4 +1,4 @@ -/* proSilver Style Sheet Tweaks +/* Style Sheet Tweaks These style definitions are mainly IE specific tweaks required due to its poor CSS support. @@ -87,10 +87,6 @@ dl.icon { float: none; } -* html .forumbg table.table1 { - margin: 0 -2px 0px -1px; -} - /* Headerbar height fix for IE7 and below */ * html #site-description p { margin-bottom: 1.0em; @@ -98,4 +94,14 @@ dl.icon { *:first-child+html #site-description p { margin-bottom: 1.0em; +} + +/* #minitabs fix for IE */ +.tabs-container { + zoom: 1; +} + +#minitabs { + white-space: nowrap; + *min-width: 50%; } \ No newline at end of file diff --git a/subsilver2/imageset/imageset.cfg b/subsilver2/imageset/imageset.cfg index d8cfabc..cb48b0f 100644 --- a/subsilver2/imageset/imageset.cfg +++ b/subsilver2/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.9 +version = 3.0.12 # Images img_site_logo = site_logo.gif*94*170 diff --git a/subsilver2/style.cfg b/subsilver2/style.cfg index 0cdb720..b99c433 100644 --- a/subsilver2/style.cfg +++ b/subsilver2/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -version = 3.0.9 +version = 3.0.12 diff --git a/subsilver2/template/attachment.html b/subsilver2/template/attachment.html index b5b547b..fca620b 100644 --- a/subsilver2/template/attachment.html +++ b/subsilver2/template/attachment.html @@ -72,7 +72,7 @@ - + diff --git a/subsilver2/template/captcha_default.html b/subsilver2/template/captcha_default.html index 4c65f81..e2edf0b 100644 --- a/subsilver2/template/captcha_default.html +++ b/subsilver2/template/captcha_default.html @@ -12,6 +12,6 @@ - diff --git a/subsilver2/template/captcha_qa.html b/subsilver2/template/captcha_qa.html index 23d2a92..3a5778b 100644 --- a/subsilver2/template/captcha_qa.html +++ b/subsilver2/template/captcha_qa.html @@ -3,6 +3,6 @@ - + diff --git a/subsilver2/template/editor.js b/subsilver2/template/editor.js index cd22812..151cf53 100644 --- a/subsilver2/template/editor.js +++ b/subsilver2/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; @@ -218,11 +220,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(); } @@ -456,4 +459,4 @@ function getCaretPosition(txtarea) } return caretPos; -} \ No newline at end of file +} diff --git a/subsilver2/template/faq_body.html b/subsilver2/template/faq_body.html index bbd9b82..6a4df36 100644 --- a/subsilver2/template/faq_body.html +++ b/subsilver2/template/faq_body.html @@ -13,7 +13,7 @@ {faq_block.BLOCK_TITLE}
- {faq_block.faq_row.FAQ_QUESTION}
+ {faq_block.faq_row.FAQ_QUESTION}

diff --git a/subsilver2/template/login_body.html b/subsilver2/template/login_body.html index 262341e..ba31651 100644 --- a/subsilver2/template/login_body.html +++ b/subsilver2/template/login_body.html @@ -68,7 +68,7 @@
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}		 + tabindex="{$CAPTCHA_TAB_INDEX}" />
{QA_CONFIRM_QUESTION}:
{L_CONFIRM_QUESTION_EXPLAIN}		 tabindex="{$CAPTCHA_TAB_INDEX}" />
- + diff --git a/subsilver2/template/login_forum.html b/subsilver2/template/login_forum.html index 96b025a..e91a406 100644 --- a/subsilver2/template/login_forum.html +++ b/subsilver2/template/login_forum.html @@ -1,5 +1,13 @@ + + + +

+ +
diff --git a/subsilver2/template/mcp_topic.html b/subsilver2/template/mcp_topic.html index 13865d2..f9f9382 100644 --- a/subsilver2/template/mcp_topic.html +++ b/subsilver2/template/mcp_topic.html @@ -135,6 +135,7 @@ +  
diff --git a/subsilver2/template/memberlist_body.html b/subsilver2/template/memberlist_body.html index cb7a7b2..800162b 100644 --- a/subsilver2/template/memberlist_body.html +++ b/subsilver2/template/memberlist_body.html @@ -14,7 +14,12 @@ - + diff --git a/subsilver2/template/memberlist_view.html b/subsilver2/template/memberlist_view.html index 9ef2b85..434d795 100644 --- a/subsilver2/template/memberlist_view.html +++ b/subsilver2/template/memberlist_view.html @@ -89,11 +89,11 @@ - + - +
{L_USERNAME_BEGINS_WITH}:  {L_USERNAME_BEGINS_WITH}: +   {L_FIND_USERNAME}
{L_ACTIVE_IN_FORUM}: {ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-		{ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-
{L_ACTIVE_IN_TOPIC}: {ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-		{ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-
@@ -148,10 +148,10 @@ {L_LOCATION}: {LOCATION} - + {L_AGE}: - {AGE} - + {AGE} diff --git a/subsilver2/template/overall_footer.html b/subsilver2/template/overall_footer.html index 5d6b639..6cd7a21 100644 --- a/subsilver2/template/overall_footer.html +++ b/subsilver2/template/overall_footer.html @@ -3,7 +3,7 @@
[ {L_ACP} ]

- Powered by phpBB® Forum Software © phpBB Group + {CREDIT_LINE}
{TRANSLATION_INFO}
[ {DEBUG_OUTPUT} ]
diff --git a/subsilver2/template/posting_body.html b/subsilver2/template/posting_body.html index fec6d7f..8e9934c 100644 --- a/subsilver2/template/posting_body.html +++ b/subsilver2/template/posting_body.html @@ -127,7 +127,7 @@ - +
{L_NO_TOPIC_ICON}{L_NO_PM_ICON} {L_NO_TOPIC_ICON}{L_NO_PM_ICON}
@@ -333,6 +333,7 @@ + diff --git a/subsilver2/template/posting_buttons.html b/subsilver2/template/posting_buttons.html index 92b4bd3..cfe69de 100644 --- a/subsilver2/template/posting_buttons.html +++ b/subsilver2/template/posting_buttons.html @@ -16,15 +16,15 @@ q: '{LA_BBCODE_Q_HELP}', c: '{LA_BBCODE_C_HELP}', l: '{LA_BBCODE_L_HELP}', + e: '{LA_BBCODE_LISTITEM_HELP}', o: '{LA_BBCODE_O_HELP}', p: '{LA_BBCODE_P_HELP}', w: '{LA_BBCODE_W_HELP}', 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}', - t: '{LA_BBCODE_T_HELP}', tip: '{L_STYLES_TIP}' ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' @@ -45,7 +45,7 @@ - + diff --git a/subsilver2/template/report_body.html b/subsilver2/template/report_body.html index 7cd7d10..57747ff 100644 --- a/subsilver2/template/report_body.html +++ b/subsilver2/template/report_body.html @@ -6,6 +6,11 @@ {L_REPORT_POST}{L_REPORT_MESSAGE} + + + {ERROR} + + {L_REPORT_POST_EXPLAIN}{L_REPORT_MESSAGE_EXPLAIN} @@ -25,6 +30,9 @@ {L_MORE_INFO}:
{L_CAN_LEAVE_BLANK} + + +   diff --git a/subsilver2/template/simple_footer.html b/subsilver2/template/simple_footer.html index 043be16..6cb4f40 100644 --- a/subsilver2/template/simple_footer.html +++ b/subsilver2/template/simple_footer.html @@ -2,7 +2,7 @@
- Powered by phpBB® Forum Software © phpBB Group + {CREDIT_LINE}
diff --git a/subsilver2/template/template.cfg b/subsilver2/template/template.cfg index 92ccfef..0c50275 100644 --- a/subsilver2/template/template.cfg +++ b/subsilver2/template/template.cfg @@ -19,5 +19,9 @@ # General Information about this template name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.9 +version = 3.0.12 +# Template inheritance +# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ +# Set value to empty to ignore template inheritance +inherit_from = subsilver2 diff --git a/subsilver2/template/ucp_header.html b/subsilver2/template/ucp_header.html index ea64dcb..1566a15 100644 --- a/subsilver2/template/ucp_header.html +++ b/subsilver2/template/ucp_header.html @@ -26,7 +26,7 @@ {L_USERNAMES}: -
+
[ {L_FIND_USERNAME} ] @@ -41,7 +41,7 @@ -
  
  
+
  
  
diff --git a/subsilver2/template/ucp_main_front.html b/subsilver2/template/ucp_main_front.html index fdef0bd..dc945c8 100644 --- a/subsilver2/template/ucp_main_front.html +++ b/subsilver2/template/ucp_main_front.html @@ -48,11 +48,11 @@ {L_ACTIVE_IN_FORUM}: - {ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]- + {ACTIVE_FORUM}
[ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]- {L_ACTIVE_IN_TOPIC}: - {ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]- + {ACTIVE_TOPIC}
[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]- diff --git a/subsilver2/template/ucp_pm_history.html b/subsilver2/template/ucp_pm_history.html index 8754aca..bf20108 100644 --- a/subsilver2/template/ucp_pm_history.html +++ b/subsilver2/template/ucp_pm_history.html @@ -37,7 +37,7 @@ - +
{history_row.MESSAGE}
{history_row.MESSAGE}{L_MESSAGE_REMOVED_FROM_OUTBOX}
diff --git a/subsilver2/template/ucp_pm_viewmessage_print.html b/subsilver2/template/ucp_pm_viewmessage_print.html index 6753a5b..cd55c16 100644 --- a/subsilver2/template/ucp_pm_viewmessage_print.html +++ b/subsilver2/template/ucp_pm_viewmessage_print.html @@ -61,7 +61,7 @@ hr.sep { - + @@ -114,7 +114,7 @@ hr.sep { - +
{SITENAME}
{L_PRIVATE_MESSAGING}		{SITENAME}
{L_PRIVATE_MESSAGING}

{S_TIMEZONE}
Powered by phpBB® Forum Software © phpBB Group
http://www.phpbb.com/		Powered by phpBB® Forum Software © phpBB Group
https://www.phpbb.com/
diff --git a/subsilver2/template/ucp_prefs_personal.html b/subsilver2/template/ucp_prefs_personal.html index e2266b7..4cd0f37 100644 --- a/subsilver2/template/ucp_prefs_personal.html +++ b/subsilver2/template/ucp_prefs_personal.html @@ -61,11 +61,13 @@ {L_POPUP_ON_PM}: checked="checked" />{L_YES}   checked="checked" />{L_NO} + {L_BOARD_LANGUAGE}: - + + {L_BOARD_STYLE}: diff --git a/subsilver2/template/ucp_profile_reg_details.html b/subsilver2/template/ucp_profile_reg_details.html index 78fb5a9..09f60ad 100644 --- a/subsilver2/template/ucp_profile_reg_details.html +++ b/subsilver2/template/ucp_profile_reg_details.html @@ -42,7 +42,7 @@ {L_CONFIRM_CHANGES} - {L_CURRENT_PASSWORD}:
{L_CURRENT_PASSWORD_EXPLAIN} + {L_CURRENT_PASSWORD}:
{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}{L_CURRENT_PASSWORD_EXPLAIN} diff --git a/subsilver2/template/viewforum_body.html b/subsilver2/template/viewforum_body.html index 6511fa5..ee6ec26 100644 --- a/subsilver2/template/viewforum_body.html +++ b/subsilver2/template/viewforum_body.html @@ -155,7 +155,7 @@ - +
 {S_WATCH_FORUM_TITLE}{L_MARK_TOPICS_READ} {L_MARK_TOPICS_READ} 
diff --git a/subsilver2/template/viewtopic_print.html b/subsilver2/template/viewtopic_print.html index 964c95f..1ca1ecc 100644 --- a/subsilver2/template/viewtopic_print.html +++ b/subsilver2/template/viewtopic_print.html @@ -128,7 +128,7 @@ hr.sep { {S_TIMEZONE} - Powered by phpBB® Forum Software © phpBB Group
http://www.phpbb.com/ + Powered by phpBB® Forum Software © phpBB Group
https://www.phpbb.com/ diff --git a/subsilver2/theme/stylesheet.css b/subsilver2/theme/stylesheet.css index c2b6718..177a988 100644 --- a/subsilver2/theme/stylesheet.css +++ b/subsilver2/theme/stylesheet.css @@ -1,14 +1,9 @@ -/* phpBB 3.0 Style Sheet +/* phpBB3 Style Sheet -------------------------------------------------------------- - Style name: subsilver2 - Based on style: subSilver (the default phpBB 2 style) - Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: psoTFX and the phpBB team ( http://www.phpbb.com ) - - This is an alternative style for phpBB3 for those wishing to stay with - the familiar subSilver style of phpBB version 2.x - - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) + Style name: subsilver2 + Based on style: subSilver (the default phpBB 2.0.x style) + Original author: Tom Beddard ( http://www.subblue.com/ ) + Modified by: phpBB Group ( https://www.phpbb.com/ ) -------------------------------------------------------------- */ diff --git a/subsilver2/theme/theme.cfg b/subsilver2/theme/theme.cfg index 94e2f6d..5c58dc6 100644 --- a/subsilver2/theme/theme.cfg +++ b/subsilver2/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.9 +version = 3.0.12 # Some configuration options -- cgit v1.2.3-70-g09d2