aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/install_update_diff.html
blob: 2f38aa1ed4b8e96f31e39cead210515312c0b2c9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
<!DOCTYPE html>
<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
<head>
<meta charset="{S_CONTENT_ENCODING}">
<!-- IF META -->{META}<!-- ENDIF -->
<title>{PAGE_TITLE}</title>

<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />

<script type="text/javascript">
// <![CDATA[
function resize_panel()
{
	var block = document.getElementById('codepanel');
	var height;

	if (window.innerHeight)
	{
		height = window.innerHeight - 150;
		block.style.height = height + 'px';
	}
	else
	{
		//whatever IE needs to do this
	}
}

window.onresize = resize_panel;

// ]]>
</script>

<style type="text/css">
/* <![CDATA[ */

#main {
	font-size: 1em;
	line-height: 0.7em;
	margin: 0;
	padding: 0;
	width: 99%;
}

#diff_content {
	padding: 30px 10px 10px;
}

<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
div#codepanel {
	width: 100%;
}
<!-- ELSE -->
div#codepanel {
	background-color: #eee;
}
<!-- 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 -->
/**
* Unified Diff
*/
.file {
	line-height: .7em;
	overflow: auto;
	height: 414px;
}

.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 {
	margin: 0 0 8px 5px;
	width: 100%;
	overflow: hidden;
	border-bottom: 1px solid #999;
	table-layout: fixed;
}

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 tr:first-child th {
	border-top: none;
}

table.hrdiff tbody th {
	padding: 2em 1px 1px 1px;
	font-size: 80%;
	border-top: 1px solid #999;
}

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 {
	overflow: auto;
	display: block;
	width: 100%;
	overflow: auto;
	display: block;
}

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>

<!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
<body onload="resize_panel();">
<!-- ELSE -->
<body>
<!-- ENDIF -->

<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 -->
		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
		<form method="post" action="">
		<fieldset class="quick">
			<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}" />
		</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>
			<span class="corners-bottom"><span></span></span>
		</div>
		</div>
	</div>


<!-- INCLUDE simple_footer.html -->