mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-14 12:44:06 +02:00
the file updater. This is in CVS but the file is not able to be used without the correct update packages - no need to try.
Please note that even if the file is now in CVS it does not mean we provide an update path from Beta2 to any other version. git-svn-id: file:///svn/phpbb/trunk@6349 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
180
phpBB/adm/style/install_update_diff.html
Normal file
180
phpBB/adm/style/install_update_diff.html
Normal file
@@ -0,0 +1,180 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}">
|
||||
<head>
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
|
||||
<meta http-equiv="Content-Style-Type" content="text/css" />
|
||||
<meta http-equiv="imagetoolbar" content="no" />
|
||||
<!-- IF META -->{META}<!-- ENDIF -->
|
||||
<title>{PAGE_TITLE}</title>
|
||||
|
||||
<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
|
||||
|
||||
<style type="text/css">
|
||||
<!--
|
||||
|
||||
#main {
|
||||
font-size: 1.25em;
|
||||
line-height: 0.7em;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
width: 99%;
|
||||
}
|
||||
|
||||
<!-- IF not S_DIFF_NEW_FILE -->
|
||||
|
||||
/**
|
||||
* Unified Diff
|
||||
*/
|
||||
.file {
|
||||
border: 1px solid #eee;
|
||||
line-height: .7em;
|
||||
}
|
||||
|
||||
.diff {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.added {
|
||||
background-color: #dfd;
|
||||
}
|
||||
|
||||
.removed {
|
||||
background-color: #fdd;
|
||||
}
|
||||
|
||||
.info {
|
||||
color: #888;
|
||||
}
|
||||
|
||||
.context {
|
||||
background-color: #eee;
|
||||
}
|
||||
|
||||
/**
|
||||
* Inline Diff
|
||||
*/
|
||||
.ins {
|
||||
background-color: #dfd;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.del {
|
||||
background-color: #fdd;
|
||||
text-decoration: line-through;
|
||||
}
|
||||
|
||||
/**
|
||||
* Column Diff
|
||||
*/
|
||||
table.hrdiff {
|
||||
width: 99%;
|
||||
margin: 0 0 8px 5px;
|
||||
}
|
||||
|
||||
table.hrdiff th {
|
||||
text-align: left;
|
||||
width: 50%;
|
||||
color: #333;
|
||||
font-family: Verdana,Helvetica,sans-serif;
|
||||
font-size: 11px;
|
||||
border-bottom: 1px solid #999;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
table.hrdiff thead th {
|
||||
font-weight: bold;
|
||||
font-size: 110%;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
table.hrdiff tbody th {
|
||||
padding: 2em 1px 1px 1px;
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
table.hrdiff .unmodified {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
table.hrdiff .added {
|
||||
background: #9f9;
|
||||
}
|
||||
|
||||
table.hrdiff .added_empty {
|
||||
background: #cfc;
|
||||
}
|
||||
|
||||
table.hrdiff .modified {
|
||||
background: #fd9;
|
||||
}
|
||||
|
||||
table.hrdiff .removed {
|
||||
background: #f99;
|
||||
}
|
||||
|
||||
table.hrdiff .removed_empty {
|
||||
background: #fcc;
|
||||
}
|
||||
|
||||
table.hrdiff caption {
|
||||
caption-side: top;
|
||||
text-align: left;
|
||||
margin: 0 0 8px 5px;
|
||||
font-size: 90%;
|
||||
font-weight: bold;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
table.hrdiff caption span {
|
||||
height: 10px;
|
||||
width: 10px;
|
||||
line-height: 10px;
|
||||
letter-spacing: 10px;
|
||||
border: 1px solid #000;
|
||||
margin-left: 0.5em;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
<!-- ENDIF -->
|
||||
|
||||
//-->
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div id="wrap">
|
||||
<div id="page-header">
|
||||
<!-- IF S_DIFF_NEW_FILE -->
|
||||
<h1>{L_VIEWING_FILE_CONTENTS}</h1>
|
||||
<!-- ELSE -->
|
||||
<h1>{L_VIEWING_FILE_DIFF}</h1>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF not S_DIFF_NEW_FILE -->
|
||||
<br />
|
||||
<form method="post">
|
||||
<label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
|
||||
<select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
|
||||
<input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
|
||||
</form>
|
||||
<!-- ENDIF -->
|
||||
</div>
|
||||
|
||||
<div id="page-body">
|
||||
<div class="panel">
|
||||
<span class="corners-top"><span></span></span>
|
||||
<div id="content">
|
||||
<div id="main">
|
||||
<!-- IF S_DIFF_CONFLICT_FILE -->
|
||||
<div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
|
||||
<!-- ENDIF -->
|
||||
{DIFF_CONTENT}
|
||||
</div>
|
||||
</div>
|
||||
<span class="corners-bottom"><span></span></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- INCLUDE simple_footer.html -->
|
Reference in New Issue
Block a user