makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12521] Fix MCP merge topics row overflow
  [ticket/12565] Empty anchors introduce white-space in IE11
  [ticket/12541] Activate attachments tab when files are dropped into textarea
  [ticket/12615] Fixed inproper clearing of .topic-actions
This commit is contained in:
Cesar G 2014-06-04 23:09:02 -07:00
commit 7d18b605a5
20 changed files with 68 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/assets/javascript/plupload.js
View file

@ -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);

20
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -104,14 +104,19 @@ 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) {
/**
* Activate specific subPanel
*/
function activateSubPanel(p, panels) {
var i;
if (typeof(p) === 'string') {
@ -119,13 +124,18 @@ jQuery(document).ready(function() {
}
$('input[name="show_panel"]').val(show_panel);
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

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -33,7 +33,7 @@
</div>
<div>
<a id="bottom" accesskey="z"></a>
<a id="bottom" class="anchor" accesskey="z"></a>
<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
</div>

4
phpBB/styles/prosilver/template/overall_header.html
View file

@ -57,7 +57,7 @@
<!-- EVENT overall_header_body_before -->
<div id="wrap">
<a id="top" accesskey="t"></a>
<a id="top" class="anchor" accesskey="t"></a>
<div id="page-header">
<div class="headerbar">
<div class="inner">
@ -89,7 +89,7 @@
<!-- EVENT overall_header_page_body_before -->
<a id="start_here"></a>
<a id="start_here" class="anchor"></a>
<div id="page-body">
<!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) -->
<div id="information" class="rules">

2
phpBB/styles/prosilver/template/simple_header.html
View file

@ -35,5 +35,5 @@
<!-- EVENT simple_header_body_before -->
<div id="simple-wrap">
<a id="top" accesskey="t"></a>
<a id="top" class="anchor" accesskey="t"></a>
<div id="page-body">

2
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
View file

@ -11,7 +11,7 @@
</head>
<body id="phpbb">
<div id="wrap">
<a id="top" accesskey="t"></a>
<a id="top" class="anchor" accesskey="t"></a>
<div id="page-header">
<h1>{SITENAME}</h1>

4
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -59,7 +59,7 @@
<!-- ENDIF -->
</div>
<!-- ENDIF -->
<div class="clear"></div>
</div>
<!-- IF S_HAS_POLL -->
@ -117,7 +117,7 @@
<!-- BEGIN postrow -->
<!-- EVENT viewtopic_body_postrow_post_before -->
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF -->
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF -->
<div id="p{postrow.POST_ID}" class="post <!-- IF postrow.S_ROW_COUNT is odd -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF postrow.S_UNREAD_POST --> unreadpost<!-- ENDIF --><!-- IF postrow.S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF postrow.S_POST_DELETED --> deleted<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> online<!-- ENDIF --><!-- IF postrow.POSTER_WARNINGS --> warned<!-- ENDIF -->">
<div class="inner">

2
phpBB/styles/prosilver/template/viewtopic_print.html
View file

@ -11,7 +11,7 @@
</head>
<body id="phpbb">
<div id="wrap">
<a id="top" accesskey="t"></a>
<a id="top" class="anchor" accesskey="t"></a>
<div id="page-header">
<h1>{SITENAME}</h1>

10
phpBB/styles/prosilver/theme/content.css
View file

@ -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 {
@ -237,6 +237,12 @@ div[class].topic-actions {
height: auto;
}
.topic-actions:after {
content: '';
clear: both;
display: block;
}
/* Post body styles
----------------------------------------*/
.postbody {

4
phpBB/styles/prosilver/theme/links.css
View file

@ -228,3 +228,7 @@ a.feed-icon-forum {
float: right;
margin: 3px;
}
a.anchor {
display: block;
}

4
phpBB/styles/subsilver2/template/faq_body.html
View file

@ -1,6 +1,6 @@
<!-- INCLUDE overall_header.html -->
<a name="faqtop"></a>
<a name="faqtop" class="anchor"></a>
<div id="pagecontent">
@ -38,7 +38,7 @@
<!-- ELSE -->
<td class="row2" valign="top">
<!-- ENDIF -->
<div class="postbody"><a name="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}"></a><b>&#187; {faq_block.faq_row.FAQ_QUESTION}</b></div>
<div class="postbody"><a name="f{faq_block.S_ROW_COUNT}r{faq_block.faq_row.S_ROW_COUNT}" class="anchor"></a><b>&#187; {faq_block.faq_row.FAQ_QUESTION}</b></div>
<div class="postbody">{faq_block.faq_row.FAQ_ANSWER}</div>
<p class="gensmall"><a href="#faqtop">{L_BACK_TO_TOP}</a></p>
</td>

4
phpBB/styles/subsilver2/template/mcp_post.html
View file

@ -144,7 +144,7 @@
<!-- IF S_TOPIC_REVIEW --><!-- INCLUDE posting_topic_review.html --><!-- ENDIF -->
<!-- ELSE -->
<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER -->
<br /><a name="mod"></a>
<br /><a name="mod" class="anchor"></a>
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>
@ -166,7 +166,7 @@
<!-- ENDIF -->
<!-- IF S_CAN_VIEWIP -->
<br /><a name="ip"></a>
<br /><a name="ip" class="anchor"></a>
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>

2
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -140,7 +140,7 @@ function marklist(id, name, state)
<!-- EVENT overall_header_body_before -->
<a name="top"></a>
<a name="top" class="anchor"></a>
<div id="wrapheader">

2
phpBB/styles/subsilver2/template/posting_review.html
View file

@ -23,7 +23,7 @@
<td colspan="2">{post_review_row.L_IGNORE_POST}</td>
<!-- ELSE -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.POST_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{post_review_row.POST_ID}" class="anchor"></a>
<table width="150" cellspacing="0" cellpadding="4" border="0">
<tr>
<td align="center"><b class="postauthor">{post_review_row.POST_AUTHOR_FULL}</b></td>

2
phpBB/styles/subsilver2/template/posting_topic_review.html
View file

@ -23,7 +23,7 @@
<!-- IF topic_review_row.S_IGNORE_POST -->
<td colspan="2">{topic_review_row.L_IGNORE_POST}</td>
<!-- ELSE -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.POST_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a id="pr{topic_review_row.POST_ID}" class="anchor"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center"><b class="postauthor"<!-- IF topic_review_row.POST_AUTHOR_COLOUR --> style="color: {topic_review_row.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{topic_review_row.POST_AUTHOR}</b></td>

2
phpBB/styles/subsilver2/template/search_results.html
View file

@ -97,7 +97,7 @@
<!-- IF searchresults.S_IGNORE_POST -->
<td class="gensmall" colspan="2" height="25" align="center">{searchresults.L_IGNORE_POST}</td>
<!-- ELSE -->
<td colspan="2" height="25"><p class="topictitle"><a name="p{searchresults.POST_ID}" id="p{searchresults.POST_ID}"></a>&nbsp;{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> &nbsp; {L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> </p></td>
<td colspan="2" height="25"><p class="topictitle"><a name="p{searchresults.POST_ID}" id="p{searchresults.POST_ID}" class="anchor"></a>&nbsp;{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a> &nbsp; {L_TOPIC}{L_COLON} <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> </p></td>
</tr>
<tr class="row1">
<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POST_AUTHOR_FULL}</b></td>

2
phpBB/styles/subsilver2/template/simple_header.html
View file

@ -18,5 +18,5 @@
<body class="{S_CONTENT_DIRECTION} {BODY_CLASS}">
<!-- EVENT simple_header_body_before -->
<a name="top"></a>
<a name="top" class="anchor"></a>
<div id="wrapcentre">

2
phpBB/styles/subsilver2/template/ucp_pm_history.html
View file

@ -18,7 +18,7 @@
</tr>
<!-- BEGIN history_row -->
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.MSG_ID}"></a>
<td rowspan="2" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><a name="{history_row.MSG_ID}" class="anchor"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center" colspan="2"><span class="postauthor">{history_row.MESSAGE_AUTHOR_FULL}</span></td>

6
phpBB/styles/subsilver2/template/viewtopic_body.html
View file

@ -141,8 +141,8 @@
<!-- IF postrow.S_POST_HIDDEN -->
<td class="gensmall" colspan="2" height="25" align="center">
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF -->
<a name="p{postrow.POST_ID}"></a>
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF -->
<a name="p{postrow.POST_ID}" class="anchor"></a>
<!-- IF postrow.S_POST_HIDDEN -->
<!-- IF postrow.S_POST_DELETED -->
{postrow.L_POST_DELETED_MESSAGE}
@ -155,7 +155,7 @@
<!-- ELSE -->
<td align="center" valign="middle">
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF --><a name="p{postrow.POST_ID}"></a>
<!-- IF postrow.S_FIRST_UNREAD --><a id="unread" class="anchor" data-url="{postrow.U_MINI_POST}"></a><!-- ENDIF --><a name="p{postrow.POST_ID}" class="anchor"></a>
<b class="postauthor"<!-- IF postrow.POST_AUTHOR_COLOUR --> style="color: {postrow.POST_AUTHOR_COLOUR}"<!-- ENDIF -->>{postrow.POST_AUTHOR}</b>
</td>
<td width="100%" height="25">

4
phpBB/styles/subsilver2/theme/stylesheet.css
View file

@ -458,6 +458,10 @@ th a:hover {
text-decoration: underline;
}
a.anchor {
display: block;
}
/* Form Elements
------------ */