From 376d6a2d9137b99455d722f8a291a5b6b287d714 Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 30 May 2014 00:11:01 +0200 Subject: [PATCH 1/4] [ticket/12615] Fixed inproper clearing of .topic-actions PHPBB3-12615 --- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/theme/content.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index eb61bd3e72..21fc725cf7 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -59,7 +59,7 @@ -
+ diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index b66c841d7c..0dc10db5b7 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -237,6 +237,12 @@ div[class].topic-actions { height: auto; } +.topic-actions:after { + content: ''; + clear: both; + display: block; +} + /* Post body styles ----------------------------------------*/ .postbody { From 082a6b29a96ad57ec53e72c9c2b57d919d457d49 Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 12:42:45 +0200 Subject: [PATCH 2/4] [ticket/12541] Activate attachments tab when files are dropped into textarea PHPBB3-12541 --- phpBB/assets/javascript/plupload.js | 5 +++ phpBB/styles/prosilver/template/forum_fn.js | 40 +++++++++++++-------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index 8ffd452a09..5445e83e15 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -586,6 +586,11 @@ uploader.bind('FilesAdded', function(up, files) { return; } + // Switch the active tab if the style supports it + if (typeof activateSubPanel == 'function') { + activateSubPanel('attach-panel'); + } + // Show the file list if there aren't any files currently. if (!$('#file-list-container').is(':visible')) { $('#file-list-container').show(100); diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 52293a8f2a..a0d65a2210 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -104,28 +104,38 @@ jQuery(document).ready(function() { show_panel = this.getAttribute('data-show-panel'); if (panels.length) { - subPanels(show_panel); + activateSubPanel(show_panel, panels); childNodes.click(function () { - subPanels(this.getAttribute('data-subpanel')); + activateSubPanel(this.getAttribute('data-subpanel'), panels); return false; }); } - - function subPanels(p) { - var i; - - if (typeof(p) === 'string') { - show_panel = p; - } - - for (i = 0; i < panels.length; i++) { - jQuery('#' + panels[i]).css('display', panels[i] === show_panel ? 'block' : 'none'); - jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === show_panel); - } - } }); }); +/** +* Activate specific subPanel +*/ +function activateSubPanel(p, panels) { + var i; + + if (typeof(p) === 'string') { + show_panel = p; + } + + if (typeof(panels) === 'undefined') { + panels = []; + jQuery('.sub-panels a[data-subpanel]').each(function() { + panels.push(this.getAttribute('data-subpanel')); + }); + } + + for (i = 0; i < panels.length; i++) { + jQuery('#' + panels[i]).css('display', panels[i] === show_panel ? 'block' : 'none'); + jQuery('#' + panels[i] + '-tab').toggleClass('activetab', panels[i] === show_panel); + } +} + /** * Call print preview */ From 560e0f97be1129a8b93fc7486cc28f1bea30471e Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 14:05:46 +0200 Subject: [PATCH 3/4] [ticket/12565] Empty anchors introduce white-space in IE11 PHPBB3-12565 --- phpBB/styles/prosilver/template/overall_footer.html | 2 +- phpBB/styles/prosilver/template/overall_header.html | 4 ++-- phpBB/styles/prosilver/template/simple_header.html | 2 +- .../styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/template/viewtopic_print.html | 2 +- phpBB/styles/prosilver/theme/links.css | 4 ++++ phpBB/styles/subsilver2/template/faq_body.html | 4 ++-- phpBB/styles/subsilver2/template/mcp_post.html | 4 ++-- phpBB/styles/subsilver2/template/overall_header.html | 2 +- phpBB/styles/subsilver2/template/posting_review.html | 2 +- phpBB/styles/subsilver2/template/posting_topic_review.html | 2 +- phpBB/styles/subsilver2/template/search_results.html | 2 +- phpBB/styles/subsilver2/template/simple_header.html | 2 +- phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 +- phpBB/styles/subsilver2/template/viewtopic_body.html | 6 +++--- phpBB/styles/subsilver2/theme/stylesheet.css | 4 ++++ 17 files changed, 28 insertions(+), 20 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 28ed215662..e9c95aa799 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -33,7 +33,7 @@
- + {RUN_CRON_TASK}
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index d18fff6bb0..e5371e792e 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -57,7 +57,7 @@
- +
@@ -89,7 +89,7 @@ - +
diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 48f6cc87da..d31dd32cf6 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -35,5 +35,5 @@
- +
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 551e58f62f..ce0f4941a5 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -11,7 +11,7 @@
- +

{SITENAME}

diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index eb61bd3e72..5e660b03b8 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -117,7 +117,7 @@ - +
diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index 98308c4adc..5c44f58adb 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -11,7 +11,7 @@
- +

{SITENAME}

diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index ff6df7c9a7..86cdf9c10e 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -228,3 +228,7 @@ a.feed-icon-forum { float: right; margin: 3px; } + +a.anchor { + display: block; +} diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html index 22c4145a20..b3c41e932a 100644 --- a/phpBB/styles/subsilver2/template/faq_body.html +++ b/phpBB/styles/subsilver2/template/faq_body.html @@ -1,6 +1,6 @@ - +
@@ -38,7 +38,7 @@ -
» {faq_block.faq_row.FAQ_QUESTION}
+
» {faq_block.faq_row.FAQ_QUESTION}
{faq_block.faq_row.FAQ_ANSWER}

{L_BACK_TO_TOP}

diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 0f000ca931..f5052ee2d0 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -144,7 +144,7 @@ -
+
@@ -166,7 +166,7 @@ -
+
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index b4a2fa5b59..314e284155 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -140,7 +140,7 @@ function marklist(id, name, state) - +
diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html index baf159aecd..c118499564 100644 --- a/phpBB/styles/subsilver2/template/posting_review.html +++ b/phpBB/styles/subsilver2/template/posting_review.html @@ -23,7 +23,7 @@
-
{post_review_row.L_IGNORE_POST} + diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html index 23ea56a216..20976861fc 100644 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ b/phpBB/styles/subsilver2/template/posting_topic_review.html @@ -23,7 +23,7 @@ -
{post_review_row.POST_AUTHOR_FULL} {topic_review_row.L_IGNORE_POST} + diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html index 3649bb9633..23d0b3a146 100644 --- a/phpBB/styles/subsilver2/template/search_results.html +++ b/phpBB/styles/subsilver2/template/search_results.html @@ -97,7 +97,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index 36ac149691..faeeaea3d5 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -18,5 +18,5 @@ - +
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index ad06da2b7e..c07edb0f68 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -18,7 +18,7 @@
-
style="color: {topic_review_row.POST_AUTHOR_COLOUR}">{topic_review_row.POST_AUTHOR} {searchresults.L_IGNORE_POST}

 {L_FORUM}{L_COLON} {searchresults.FORUM_TITLE}   {L_TOPIC}{L_COLON} {searchresults.TOPIC_TITLE}

 {L_FORUM}{L_COLON} {searchresults.FORUM_TITLE}   {L_TOPIC}{L_COLON} {searchresults.TOPIC_TITLE}

{searchresults.POST_AUTHOR_FULL}
+ diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html index 0c7900076b..8f83bfbea6 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ b/phpBB/styles/subsilver2/template/viewtopic_body.html @@ -141,8 +141,8 @@
{history_row.MESSAGE_AUTHOR_FULL} - - + + {postrow.L_POST_DELETED_MESSAGE} @@ -155,7 +155,7 @@ - + style="color: {postrow.POST_AUTHOR_COLOUR}">{postrow.POST_AUTHOR} diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css index ea8e660e30..e69eec4f14 100644 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ b/phpBB/styles/subsilver2/theme/stylesheet.css @@ -458,6 +458,10 @@ th a:hover { text-decoration: underline; } +a.anchor { + display: block; +} + /* Form Elements ------------ */ From dc43073450b858cfc4de4492bb97ee683c6f6344 Mon Sep 17 00:00:00 2001 From: PayBas Date: Mon, 2 Jun 2014 14:22:31 +0200 Subject: [PATCH 4/4] [ticket/12521] Fix MCP merge topics row overflow PHPBB3-12521 --- phpBB/styles/prosilver/theme/content.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index b66c841d7c..a018b25ef7 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -37,7 +37,7 @@ ul.topiclist dt { } ul.topiclist.missing-column dt { - margin-right: -330px; + margin-right: -345px; } ul.topiclist.two-long-columns dt { @@ -55,7 +55,7 @@ ul.topiclist dt .list-inner { } ul.topiclist.missing-column dt .list-inner { - margin-right: 330px; + margin-right: 345px; } ul.topiclist.two-long-columns dt .list-inner {