1 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
---|
2 | <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
|
---|
3 | <head>
|
---|
4 |
|
---|
5 | <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
|
---|
6 | <meta http-equiv="Content-Style-Type" content="text/css" />
|
---|
7 | <meta http-equiv="Content-Language" content="{S_USER_LANG}" />
|
---|
8 | <meta http-equiv="imagetoolbar" content="no" />
|
---|
9 | <!-- IF META -->{META}<!-- ENDIF -->
|
---|
10 | <title>{PAGE_TITLE}</title>
|
---|
11 |
|
---|
12 | <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
|
---|
13 |
|
---|
14 | <script type="text/javascript">
|
---|
15 | // <![CDATA[
|
---|
16 | function resize_panel()
|
---|
17 | {
|
---|
18 | var block = document.getElementById('codepanel');
|
---|
19 | var height;
|
---|
20 |
|
---|
21 | if (window.innerHeight)
|
---|
22 | {
|
---|
23 | height = window.innerHeight - 150;
|
---|
24 | block.style.height = height + 'px';
|
---|
25 | }
|
---|
26 | else
|
---|
27 | {
|
---|
28 | //whatever IE needs to do this
|
---|
29 | }
|
---|
30 | }
|
---|
31 |
|
---|
32 | window.onresize = resize_panel;
|
---|
33 |
|
---|
34 | // ]]>
|
---|
35 | </script>
|
---|
36 |
|
---|
37 | <style type="text/css">
|
---|
38 | /* <![CDATA[ */
|
---|
39 |
|
---|
40 | #main {
|
---|
41 | font-size: 1em;
|
---|
42 | line-height: 0.7em;
|
---|
43 | margin: 0;
|
---|
44 | padding: 0;
|
---|
45 | width: 99%;
|
---|
46 | }
|
---|
47 |
|
---|
48 | #diff_content {
|
---|
49 | padding: 30px 10px 10px;
|
---|
50 | }
|
---|
51 |
|
---|
52 | <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
|
---|
53 | div#codepanel {
|
---|
54 | width: 100%;
|
---|
55 | }
|
---|
56 | <!-- ELSE -->
|
---|
57 | div#codepanel {
|
---|
58 | background-color: #eee;
|
---|
59 | }
|
---|
60 | <!-- ENDIF -->
|
---|
61 |
|
---|
62 | <!-- IF DIFF_MODE neq 'unified' and DIFF_MODE neq 'side_by_side' -->
|
---|
63 | div#diff_content pre {
|
---|
64 | overflow: auto;
|
---|
65 | height: 414px;
|
---|
66 | width: 100% !important;
|
---|
67 | }
|
---|
68 | <!-- ENDIF -->
|
---|
69 |
|
---|
70 | <!-- IF not S_DIFF_NEW_FILE -->
|
---|
71 | /**
|
---|
72 | * Unified Diff
|
---|
73 | */
|
---|
74 | .file {
|
---|
75 | line-height: .7em;
|
---|
76 | overflow: auto;
|
---|
77 | height: 414px;
|
---|
78 | }
|
---|
79 |
|
---|
80 | .diff {
|
---|
81 | margin: 0;
|
---|
82 | }
|
---|
83 |
|
---|
84 | .added {
|
---|
85 | background-color: #dfd;
|
---|
86 | }
|
---|
87 |
|
---|
88 | .removed {
|
---|
89 | background-color: #fdd;
|
---|
90 | }
|
---|
91 |
|
---|
92 | .info {
|
---|
93 | color: #888;
|
---|
94 | }
|
---|
95 |
|
---|
96 | .context {
|
---|
97 | background-color: #eee;
|
---|
98 | }
|
---|
99 |
|
---|
100 | /**
|
---|
101 | * Inline Diff
|
---|
102 | */
|
---|
103 | .ins {
|
---|
104 | background-color: #dfd;
|
---|
105 | text-decoration: underline;
|
---|
106 | }
|
---|
107 |
|
---|
108 | .del {
|
---|
109 | background-color: #fdd;
|
---|
110 | text-decoration: line-through;
|
---|
111 | }
|
---|
112 |
|
---|
113 | /**
|
---|
114 | * Column Diff
|
---|
115 | */
|
---|
116 | table.hrdiff {
|
---|
117 | margin: 0 0 8px 5px;
|
---|
118 | width: 100%;
|
---|
119 | overflow: hidden;
|
---|
120 | border-bottom: 1px solid #999;
|
---|
121 | table-layout: fixed;
|
---|
122 | }
|
---|
123 |
|
---|
124 | table.hrdiff th {
|
---|
125 | text-align: left;
|
---|
126 | width: 50%;
|
---|
127 | color: #333;
|
---|
128 | font-family: Verdana,Helvetica,sans-serif;
|
---|
129 | font-size: 11px;
|
---|
130 | border-bottom: 1px solid #999;
|
---|
131 | background: transparent;
|
---|
132 | }
|
---|
133 |
|
---|
134 | table.hrdiff thead th {
|
---|
135 | font-weight: bold;
|
---|
136 | font-size: 110%;
|
---|
137 | padding: 2px;
|
---|
138 | }
|
---|
139 |
|
---|
140 | table.hrdiff tr:first-child th {
|
---|
141 | border-top: none;
|
---|
142 | }
|
---|
143 |
|
---|
144 | table.hrdiff tbody th {
|
---|
145 | padding: 2em 1px 1px 1px;
|
---|
146 | font-size: 80%;
|
---|
147 | border-top: 1px solid #999;
|
---|
148 | }
|
---|
149 |
|
---|
150 | table.hrdiff tbody td.old {
|
---|
151 | border-left: 1px solid #999;
|
---|
152 | border-right: 1px solid #999;
|
---|
153 | }
|
---|
154 | table.hrdiff tbody td.new {
|
---|
155 | border-right: 1px solid #999;
|
---|
156 | }
|
---|
157 |
|
---|
158 | table.hrdiff td pre {
|
---|
159 | overflow: auto;
|
---|
160 | display: block;
|
---|
161 | width: 100%;
|
---|
162 | overflow: auto;
|
---|
163 | display: block;
|
---|
164 | }
|
---|
165 |
|
---|
166 | table.hrdiff .unmodified {
|
---|
167 | background: #fff;
|
---|
168 | }
|
---|
169 |
|
---|
170 | table.hrdiff .added {
|
---|
171 | background: #9f9;
|
---|
172 | }
|
---|
173 |
|
---|
174 | table.hrdiff .added_empty {
|
---|
175 | background: #cfc;
|
---|
176 | }
|
---|
177 |
|
---|
178 | table.hrdiff .modified {
|
---|
179 | background: #fd9;
|
---|
180 | }
|
---|
181 |
|
---|
182 | table.hrdiff .removed {
|
---|
183 | background: #f99;
|
---|
184 | }
|
---|
185 |
|
---|
186 | table.hrdiff .removed_empty {
|
---|
187 | background: #fcc;
|
---|
188 | }
|
---|
189 |
|
---|
190 | table.hrdiff caption {
|
---|
191 | caption-side: top;
|
---|
192 | text-align: left;
|
---|
193 | margin: 0 0 8px 5px;
|
---|
194 | font-size: 90%;
|
---|
195 | font-weight: bold;
|
---|
196 | padding: 5px;
|
---|
197 | }
|
---|
198 |
|
---|
199 | table.hrdiff caption span {
|
---|
200 | height: 10px;
|
---|
201 | width: 10px;
|
---|
202 | line-height: 10px;
|
---|
203 | letter-spacing: 10px;
|
---|
204 | border: 1px solid #000;
|
---|
205 | margin-left: 0.5em;
|
---|
206 | vertical-align: baseline;
|
---|
207 | }
|
---|
208 |
|
---|
209 | <!-- ENDIF -->
|
---|
210 |
|
---|
211 | /* ]]> */
|
---|
212 | </style>
|
---|
213 |
|
---|
214 | </head>
|
---|
215 |
|
---|
216 | <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' -->
|
---|
217 | <body onload="resize_panel();">
|
---|
218 | <!-- ELSE -->
|
---|
219 | <body>
|
---|
220 | <!-- ENDIF -->
|
---|
221 |
|
---|
222 | <div id="wrap">
|
---|
223 | <div id="page-header">
|
---|
224 | <!-- IF S_DIFF_NEW_FILE -->
|
---|
225 |
|
---|
226 | <h1>{L_VIEWING_FILE_CONTENTS}</h1>
|
---|
227 | <!-- ELSE -->
|
---|
228 | <h1>{L_VIEWING_FILE_DIFF}</h1>
|
---|
229 | <!-- ENDIF -->
|
---|
230 | <!-- IF not S_DIFF_NEW_FILE -->
|
---|
231 | <p id="skip"><a href="#acp">{L_SKIP}</a></p>
|
---|
232 | <form method="post" action="">
|
---|
233 | <fieldset class="quick">
|
---|
234 | <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label>
|
---|
235 | <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select>
|
---|
236 |
|
---|
237 | <input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" />
|
---|
238 | </fieldset>
|
---|
239 | </form>
|
---|
240 | <!-- ENDIF -->
|
---|
241 | <!-- IF S_DIFF_CONFLICT_FILE -->
|
---|
242 | <div style="float: {S_CONTENT_FLOW_BEGIN};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div>
|
---|
243 | <br style="clear: both;" />
|
---|
244 | <!-- ENDIF -->
|
---|
245 | </div>
|
---|
246 |
|
---|
247 | <div id="page-body">
|
---|
248 | <div id="acp">
|
---|
249 | <div class="panel" id="codepanel">
|
---|
250 | <span class="corners-top"><span></span></span>
|
---|
251 | <div id="diff_content">
|
---|
252 | <div id="main">
|
---|
253 | {DIFF_CONTENT}
|
---|
254 | </div>
|
---|
255 | </div>
|
---|
256 | <span class="corners-bottom"><span></span></span>
|
---|
257 | </div>
|
---|
258 | </div>
|
---|
259 | </div>
|
---|
260 |
|
---|
261 |
|
---|
262 | <!-- INCLUDE simple_footer.html -->
|
---|