diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-17 08:13:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-09-17 08:13:28 +0000 |
| commit | 6b5d195a980145011800125f44466ab4823654f2 (patch) | |
| tree | 167c77e9bb540329502bfece7016b29b8055393f /phpBB/adm/style/install_update_diff.html | |
| parent | 8bcfd33539e6a4ed9cfbab8b21cc0b0f2847b6c8 (diff) | |
| download | forums-6b5d195a980145011800125f44466ab4823654f2.tar forums-6b5d195a980145011800125f44466ab4823654f2.tar.gz forums-6b5d195a980145011800125f44466ab4823654f2.tar.bz2 forums-6b5d195a980145011800125f44466ab4823654f2.tar.xz forums-6b5d195a980145011800125f44466ab4823654f2.zip | |
correctly display diff for conflicts
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10156 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/install_update_diff.html')
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index d794c5c516..b65a014312 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -15,9 +15,9 @@ // <![CDATA[ function resize_panel() { - var block = document.getElementById('codepanel'); + var block = document.getElementById('codepanel'); var height; - + if (window.innerHeight) { height = window.innerHeight - 150; @@ -26,7 +26,7 @@ function resize_panel() else { //whatever IE needs to do this - } + } } window.onresize = resize_panel; @@ -54,7 +54,7 @@ div#codepanel { width: 100%; } <!-- ELSE --> -div#codepanel { +div#codepanel { background-color: #eee; } <!-- ENDIF --> @@ -149,10 +149,10 @@ table.hrdiff tbody th { table.hrdiff tbody td.old { border-left: 1px solid #999; - border-right: 1px solid #999; + border-right: 1px solid #999; } table.hrdiff tbody td.new { - border-right: 1px solid #999; + border-right: 1px solid #999; } table.hrdiff td pre { @@ -238,18 +238,18 @@ table.hrdiff caption span { </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"> - -<!-- 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> @@ -257,6 +257,6 @@ table.hrdiff caption span { </div> </div> </div> - + <!-- INCLUDE simple_footer.html -->
\ No newline at end of file |