makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-30 07:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

correctly display diff for conflicts

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-09-17 08:13:28 +00:00
parent 8bcfd33539
commit 6b5d195a98
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/adm/style/install_update_diff.html
View file

@ -15,9 +15,9 @@
// <![CDATA[ // <![CDATA[
function resize_panel() function resize_panel()
{ {
var block = document.getElementById('codepanel'); var block = document.getElementById('codepanel');
var height; var height;
if (window.innerHeight) if (window.innerHeight)
{ {
height = window.innerHeight - 150; height = window.innerHeight - 150;
@ -26,7 +26,7 @@ function resize_panel()
else else
{ {
//whatever IE needs to do this //whatever IE needs to do this
} }
} }
window.onresize = resize_panel; window.onresize = resize_panel;
@ -54,7 +54,7 @@ div#codepanel {
width: 100%; width: 100%;
} }
<!-- ELSE --> <!-- ELSE -->
div#codepanel { div#codepanel {
background-color: #eee; background-color: #eee;
} }
<!-- ENDIF --> <!-- ENDIF -->
@ -149,10 +149,10 @@ table.hrdiff tbody th {
table.hrdiff tbody td.old { table.hrdiff tbody td.old {
border-left: 1px solid #999; border-left: 1px solid #999;
border-right: 1px solid #999; border-right: 1px solid #999;
} }
table.hrdiff tbody td.new { table.hrdiff tbody td.new {
border-right: 1px solid #999; border-right: 1px solid #999;
} }
table.hrdiff td pre { table.hrdiff td pre {
@ -237,19 +237,19 @@ table.hrdiff caption span {
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
</fieldset> </fieldset>
</form> </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 --> <!-- ENDIF -->
</div> </div>
<div id="page-body"> <div id="page-body">
<div id="acp"> <div id="acp">
<div class="panel" id="codepanel"> <div class="panel" id="codepanel">
<span class="corners-top"><span></span></span> <span class="corners-top"><span></span></span>
<div id="diff_content"> <div id="diff_content">
<div id="main"> <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} {DIFF_CONTENT}
</div> </div>
</div> </div>
@ -257,6 +257,6 @@ table.hrdiff caption span {
</div> </div>
</div> </div>
</div> </div>
<!-- INCLUDE simple_footer.html --> <!-- INCLUDE simple_footer.html -->