mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

XHTML mistakes in the updater. #46585

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9861 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2009-07-26 17:58:10 +00:00
parent 19bff35057
commit b6ebd2e497
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/adm/style/install_update_diff.html
View File

@ -28,6 +28,9 @@ function resize_panel()
//whatever IE needs to do this //whatever IE needs to do this
} }
} }
window.onresize = resize_panel;
// ]]> // ]]>
</script> </script>
@ -48,10 +51,7 @@ function resize_panel()
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel { div#codepanel {
overflow: auto;
width: 100%; width: 100%;
height: 350px;
display: inline-block;
} }
<!-- ELSE --> <!-- ELSE -->
div#codepanel { div#codepanel {
@ -59,12 +59,22 @@ div#codepanel {
} }
<!-- ENDIF --> <!-- 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 --> <!-- IF not S_DIFF_NEW_FILE -->
/** /**
* Unified Diff * Unified Diff
*/ */
.file { .file {
line-height: .7em; line-height: .7em;
overflow: auto;
height: 414px;
} }
.diff { .diff {
@ -203,9 +213,8 @@ table.hrdiff caption span {
</head> </head>
<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
<body onresize="resize_panel();" onload="resize_panel();"> <body onload="resize_panel();">
<!-- ELSE --> <!-- ELSE -->
<body> <body>
<!-- ENDIF --> <!-- ENDIF -->
@ -220,7 +229,7 @@ table.hrdiff caption span {
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF not S_DIFF_NEW_FILE --> <!-- IF not S_DIFF_NEW_FILE -->
<p id="skip"><a href="#acp">{L_SKIP}</a></p> <p id="skip"><a href="#acp">{L_SKIP}</a></p>
<form method="post"> <form method="post" action="">
<fieldset class="quick"> <fieldset class="quick">
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select> <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>

2
phpBB/docs/CHANGELOG.html
View File

@ -264,7 +264,7 @@
<li>[Fix] Changed the success message when requesting a new password to be more accurate. (Bug #41405)</li> <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] 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] 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] 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] 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] Poll, negative durations generate error (Bug #41295 - Patch by TerraFrost)</li>
<li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting &quot;display&quot; (Bug #41385 - Patch by Eelke and fade2gray)</li> <li>[Fix] Visibility of custom field on registration is incorrectly controlled by setting &quot;display&quot; (Bug #41385 - Patch by Eelke and fade2gray)</li>

2
phpBB/includes/diff/renderer.php
View File

@ -536,7 +536,7 @@ class diff_renderer_raw extends diff_renderer
*/ */
function get_diff_content($diff) function get_diff_content($diff)
{ {
return '<textarea style="height: 290px;" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>'; return '<textarea style="height: 290px;" rows="15" cols="76" class="full">' . htmlspecialchars($this->render($diff)) . '</textarea>';
} }
function _block_header($xbeg, $xlen, $ybeg, $ylen) function _block_header($xbeg, $xlen, $ybeg, $ylen)