Author: toonarmy
Date: Sun Jul 26 18:58:10 2009
New Revision: 9861
Log:
XHTML mistakes in the updater. #46585
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php
Modified: branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html Sun Jul 26 18:58:10 2009
***************
*** 28,33 ****
--- 28,36 ----
//whatever IE needs to do this
}
}
+
+ window.onresize = resize_panel;
+
// ]]>
</script>
***************
*** 48,57 ****
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
- overflow: auto;
width: 100%;
- height: 350px;
- display: inline-block;
}
<!-- ELSE -->
div#codepanel {
--- 51,57 ----
***************
*** 59,70 ****
--- 59,80 ----
}
<!-- ENDIF -->
+ <!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' -->
+ div#diff_content pre {
+ overflow: auto;
+ height: 414px;
+ width: 100% !important;
+ }
+ <!-- ENDIF -->
+
<!-- IF not S_DIFF_NEW_FILE -->
/**
* Unified Diff
*/
.file {
line-height: .7em;
+ overflow: auto;
+ height: 414px;
}
.diff {
***************
*** 203,211 ****
</head>
-
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
! <body onresize="resize_panel();" onload="resize_panel();">
<!-- ELSE -->
<body>
<!-- ENDIF -->
--- 213,220 ----
</head>
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
! <body onload="resize_panel();">
<!-- ELSE -->
<body>
<!-- ENDIF -->
***************
*** 220,226 ****
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
! <form method="post">
<fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
--- 229,235 ----
<!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
! <form method="post" action="">
<fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sun Jul 26 18:58:10 2009
***************
*** 264,270 ****
<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li>
<li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li>
<li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li>
! <li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015)</li>
<li>[Fix] Log password changes via password reset function. (Bug #41365)</li>
<li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting "display" (Bug #41385 - Patch by Eelke and fade2gray)</li>
--- 264,270 ----
<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li>
<li>[Fix] Add missing anti-abuse email headers to acp_inactive.php and ucp_resend.php.</li>
<li>[Fix] Only remind users in the correct inactive states depending on the board account activation level.</li>
! <li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #41745, #42265 - Patch by nickvergessen, #38465, #43015, #46585 - Patch by Raimon)</li>
<li>[Fix] Log password changes via password reset function. (Bug #41365)</li>
<li>[Fix] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting "display" (Bug #41385 - Patch by Eelke and fade2gray)</li>
Modified: branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/diff/renderer.php Sun Jul 26 18:58:10 2009
***************
*** 536,542 ****
*/
function get_diff_content($diff)
{
! return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
}
function _block_header($xbeg, $xlen, $ybeg, $ylen)
--- 536,542 ----
*/
function get_diff_content($diff)
{
! return '<textarea style="height: 290px;" rows="15" cols="76" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
}
function _block_header($xbeg, $xlen, $ybeg, $ylen)
|
