|
From: Meik S. <acy...@ph...> - 2009-09-17 08:13:46
|
Author: acydburn
Date: Thu Sep 17 09:13:28 2009
New Revision: 10156
Log:
correctly display diff for conflicts
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/install_update_diff.html
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 Thu Sep 17 09:13:28 2009
***************
*** 15,23 ****
// <![CDATA[
function resize_panel()
{
! var block = document.getElementById('codepanel');
var height;
!
if (window.innerHeight)
{
height = window.innerHeight - 150;
--- 15,23 ----
// <![CDATA[
function resize_panel()
{
! var block = document.getElementById('codepanel');
var height;
!
if (window.innerHeight)
{
height = window.innerHeight - 150;
***************
*** 26,32 ****
else
{
//whatever IE needs to do this
! }
}
window.onresize = resize_panel;
--- 26,32 ----
else
{
//whatever IE needs to do this
! }
}
window.onresize = resize_panel;
***************
*** 54,60 ****
width: 100%;
}
<!-- ELSE -->
! div#codepanel {
background-color: #eee;
}
<!-- ENDIF -->
--- 54,60 ----
width: 100%;
}
<!-- ELSE -->
! div#codepanel {
background-color: #eee;
}
<!-- ENDIF -->
***************
*** 149,158 ****
table.hrdiff tbody td.old {
border-left: 1px solid #999;
! border-right: 1px solid #999;
}
table.hrdiff tbody td.new {
! border-right: 1px solid #999;
}
table.hrdiff td pre {
--- 149,158 ----
table.hrdiff tbody td.old {
border-left: 1px solid #999;
! border-right: 1px solid #999;
}
table.hrdiff tbody td.new {
! border-right: 1px solid #999;
}
table.hrdiff td pre {
***************
*** 238,255 ****
</fieldset>
</form>
<!-- ENDIF -->
</div>
!
<div id="page-body">
<div id="acp">
<div class="panel" id="codepanel">
<span class="corners-top"><span></span></span>
<div id="diff_content">
<div id="main">
-
- <!-- IF S_DIFF_CONFLICT_FILE -->
- <div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
- <!-- ENDIF -->
{DIFF_CONTENT}
</div>
</div>
--- 238,255 ----
</fieldset>
</form>
<!-- ENDIF -->
+ <!-- IF S_DIFF_CONFLICT_FILE -->
+ <div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
+ <br style="clear: both;" />
+ <!-- ENDIF -->
</div>
!
<div id="page-body">
<div id="acp">
<div class="panel" id="codepanel">
<span class="corners-top"><span></span></span>
<div id="diff_content">
<div id="main">
{DIFF_CONTENT}
</div>
</div>
***************
*** 257,262 ****
</div>
</div>
</div>
!
<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
--- 257,262 ----
</div>
</div>
</div>
!
<!-- INCLUDE simple_footer.html -->
\ No newline at end of file
|