← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/php/phpBB3/adm/style/install_update.html

  • Committer: William Grant
  • Date: 2009-02-23 23:47:02 UTC
  • mfrom: (1099.1.211 new-dispatch)
  • Revision ID: grantw@unimelb.edu.au-20090223234702-db4b1llly46ignwo
Merge from lp:~ivle-dev/ivle/new-dispatch.

Pretty much everything changes. Reread the setup docs. Backup your databases.
Every file is now in a different installed location, the configuration system
is rewritten, the dispatch system is rewritten, URLs are different, the
database is different, worksheets and exercises are no longer on the
filesystem, we use a templating engine, jail service protocols are rewritten,
we don't repeat ourselves, we have authorization rewritten, phpBB is gone,
and probably lots of other things that I cannot remember.

This is certainly the biggest commit I have ever made, and hopefully
the largest I ever will.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/php/phpBB3/adm/style/install_update.html
1
 
<!-- INCLUDE install_header.html -->
2
 
 
3
 
<script type="text/javascript">
4
 
// <![CDATA[
5
 
        function popup(url, width, height, name)
6
 
        {
7
 
                if (!name)
8
 
                {
9
 
                        name = '_popup';
10
 
                }
11
 
 
12
 
                window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
13
 
                return false;
14
 
        }
15
 
 
16
 
        function diff_popup(url)
17
 
        {
18
 
                popup(url, 950, 600, '_diff');
19
 
                return false;
20
 
        }
21
 
// ]]>
22
 
</script>
23
 
 
24
 
<!-- IF S_ERROR -->
25
 
        <div class="errorbox" style="margin-top: 0;">
26
 
                <h3>{L_NOTICE}</h3>
27
 
                <p>{ERROR_MSG}</p>
28
 
        </div>
29
 
<!-- ENDIF -->
30
 
 
31
 
<!-- IF S_IN_PROGRESS -->
32
 
 
33
 
        <div class="successbox" style="margin-top: 0;">
34
 
                <h3>{L_IN_PROGRESS}</h3>
35
 
                <p>{L_IN_PROGRESS_EXPLAIN}</p>
36
 
        </div>
37
 
 
38
 
<!-- ELSEIF S_INTRO -->
39
 
 
40
 
        <!-- IF S_WARNING -->
41
 
        <div class="successbox" style="margin-top: 0;">
42
 
                <h3>{L_NOTICE}</h3>
43
 
                <p>{WARNING_MSG}</p>
44
 
        </div>
45
 
        <!-- ENDIF -->
46
 
 
47
 
        <form id="install_update" method="post" action="{U_ACTION}">
48
 
 
49
 
        <h1>{L_UPDATE_INSTALLATION}</h1>
50
 
        <p>{L_UPDATE_INSTALLATION_EXPLAIN}</p>
51
 
 
52
 
        <fieldset class="submit-buttons">
53
 
                <input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" />
54
 
        </fieldset>
55
 
 
56
 
        </form>
57
 
 
58
 
<!-- ELSEIF S_UPLOAD_SUCCESS -->
59
 
 
60
 
        <form id="install_update" method="post" action="{U_ACTION}">
61
 
 
62
 
        <h1>{L_UPDATE_SUCCESS}</h1>
63
 
        <p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
64
 
 
65
 
        <fieldset class="submit-buttons">
66
 
                <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
67
 
        </fieldset>
68
 
 
69
 
        </form>
70
 
 
71
 
<!-- ENDIF -->
72
 
 
73
 
<!-- IF S_VERSION_CHECK -->
74
 
 
75
 
        <h1>{L_VERSION_CHECK}</h1>
76
 
 
77
 
        <p>{L_VERSION_CHECK_EXPLAIN}</p>
78
 
 
79
 
        <!-- IF S_UP_TO_DATE -->
80
 
                <div class="successbox">
81
 
                        <p>{L_VERSION_UP_TO_DATE}</p>
82
 
                </div>
83
 
        <!-- ELSE -->
84
 
                <div class="errorbox">
85
 
                        <p>{L_VERSION_NOT_UP_TO_DATE}</p>
86
 
                </div>
87
 
        <!-- ENDIF -->
88
 
 
89
 
        <fieldset>
90
 
                <legend></legend>
91
 
        <dl>
92
 
                <dt><label>{L_CURRENT_VERSION}</label></dt>
93
 
                <dd><strong>{CURRENT_VERSION}</strong></dd>
94
 
        </dl>
95
 
        <dl>
96
 
                <dt><label>{L_LATEST_VERSION}</label></dt>
97
 
                <dd><strong>{LATEST_VERSION}</strong></dd>
98
 
        </dl>
99
 
        <!-- IF PACKAGE_VERSION and not S_UP_TO_DATE -->
100
 
        <dl>
101
 
                <dt><label>{L_PACKAGE_UPDATES_TO}</label></dt>
102
 
                <dd><strong>{PACKAGE_VERSION}</strong></dd>
103
 
        </dl>
104
 
        <!-- ENDIF -->
105
 
        </fieldset>
106
 
 
107
 
        <!-- IF not S_UP_TO_DATE -->
108
 
 
109
 
                <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
110
 
 
111
 
                <fieldset class="submit-buttons">
112
 
                        <p>{L_UPDATE_DATABASE_EXPLAIN}</p>
113
 
                        <input class="button1" type="submit" name="db_update" value="{L_UPDATE_DATABASE}" />
114
 
                </fieldset>
115
 
 
116
 
                </form>
117
 
 
118
 
        <!-- ELSE -->
119
 
                <form id="install_update" method="post" action="{U_ACTION}">
120
 
 
121
 
                <fieldset class="submit-buttons">
122
 
                        <p>{L_CHECK_FILES_UP_TO_DATE}</p>
123
 
                        <input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
124
 
                </fieldset>
125
 
 
126
 
                </form>
127
 
        <!-- ENDIF -->
128
 
 
129
 
<!-- ELSEIF S_DB_UPDATE -->
130
 
 
131
 
        <!-- IF not S_DB_UPDATE_FINISHED -->
132
 
 
133
 
                <h1>{L_PERFORM_DATABASE_UPDATE}</h1>
134
 
 
135
 
                <p>
136
 
                        {L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br />
137
 
                </p>
138
 
 
139
 
                <br /><br />
140
 
 
141
 
                <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}">
142
 
 
143
 
                <fieldset class="submit-buttons">
144
 
                        <a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a>
145
 
 
146
 
                        <!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / -->
147
 
                </fieldset>
148
 
 
149
 
                </form>
150
 
 
151
 
        <!-- ELSE -->
152
 
 
153
 
                <h1>{L_UPDATE_DB_SUCCESS}</h1>
154
 
 
155
 
                <br /><br />
156
 
 
157
 
                <form id="install_update" method="post" action="{U_ACTION}">
158
 
 
159
 
                <fieldset class="submit-buttons">
160
 
                        <p>{L_CHECK_FILES_EXPLAIN}</p>
161
 
                        <input class="button1" type="submit" name="submit" value="{L_CHECK_FILES}" />
162
 
                </fieldset>
163
 
 
164
 
                </form>
165
 
 
166
 
        <!-- ENDIF -->
167
 
 
168
 
<!-- ELSEIF S_FILE_CHECK -->
169
 
 
170
 
        <!-- IF S_ALL_UP_TO_DATE -->
171
 
 
172
 
                <div class="successbox">
173
 
                        <h3>{L_UPDATE_SUCCESS}</h3>
174
 
                        <p>{L_ALL_FILES_UP_TO_DATE}</p>
175
 
                </div>
176
 
 
177
 
        <!-- ELSE -->
178
 
                <h1>{L_COLLECTED_INFORMATION}</h1>
179
 
 
180
 
                <p>{L_COLLECTED_INFORMATION_EXPLAIN}</p>
181
 
 
182
 
                <!-- IF S_NO_UPDATE_FILES -->
183
 
                        <div class="errorbox">
184
 
                                <h3>{L_NO_UPDATE_FILES}</h3>
185
 
 
186
 
                                <p>{L_NO_UPDATE_FILES_EXPLAIN}</p><br />
187
 
 
188
 
                                <strong>{NO_UPDATE_FILES}</strong>
189
 
                                
190
 
                        </div>
191
 
                <!-- ENDIF -->
192
 
 
193
 
                <form id="install_update" method="post" action="{U_UPDATE_ACTION}">
194
 
 
195
 
                <!-- IF .files -->
196
 
                        <!-- BEGIN files -->
197
 
                                <!-- IF files.S_STATUS -->
198
 
                                        <!-- IF not files.S_FIRST_ROW -->
199
 
                                                </fieldset></div>
200
 
                                        <!-- ENDIF -->
201
 
 
202
 
                                        <h2>{files.TITLE}</h2>
203
 
 
204
 
                                        <!-- IF files.STATUS eq 'not_modified' --><div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div><!-- ENDIF -->
205
 
                                        <p>{files.EXPLAIN}</p>
206
 
 
207
 
                                        <div style="display: <!-- IF files.STATUS neq 'not_modified' -->block<!-- ELSE -->none<!-- ENDIF -->;" id="{files.STATUS}">
208
 
 
209
 
                                        <fieldset>
210
 
                                                <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
211
 
                                <!-- ELSE -->
212
 
                                        <dl>
213
 
                                                <!-- IF files.STATUS eq 'up_to_date' -->
214
 
                                                        <dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd>
215
 
                                                <!-- ELSE -->
216
 
                                                        <dt style="width: 60%;">
217
 
                                                                <strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong>
218
 
                                                                <!-- IF files.S_CUSTOM -->
219
 
                                                                <br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span>
220
 
                                                                <!-- ENDIF -->
221
 
                                                                <!-- IF files.NUM_CONFLICTS -->
222
 
                                                                <br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span>
223
 
                                                                <!-- ENDIF -->
224
 
                                                        </dt>
225
 
                                                        <dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' -->&nbsp;<!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd>
226
 
                                                        <!-- IF files.S_CUSTOM -->
227
 
                                                                <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
228
 
                                                        <!-- ENDIF -->
229
 
                                                        
230
 
                                                        <!-- IF files.STATUS eq 'modified' -->
231
 
                                                        </dl>
232
 
                                                        <dl>
233
 
                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
234
 
                                                                <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
235
 
                                                        </dl>
236
 
                                                        <dl>
237
 
                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
238
 
                                                                <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
239
 
                                                        </dl>
240
 
                                                        <dl>
241
 
                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
242
 
                                                                <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
243
 
                                                        </dl>
244
 
                                                        <!-- IF not files.S_LAST_ROW -->
245
 
                                                        </fieldset>
246
 
 
247
 
                                                        <fieldset>
248
 
                                                                <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
249
 
                                                        <!-- ENDIF -->
250
 
 
251
 
                                                        <!-- ENDIF -->
252
 
 
253
 
                                                        <!-- IF files.STATUS eq 'conflict' -->
254
 
                                                        </dl>
255
 
                                                        <dl>
256
 
                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
257
 
                                                                <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
258
 
                                                        </dl>
259
 
                                                                <!-- IF not files.S_BINARY -->
260
 
                                                                        <dl>
261
 
                                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt>
262
 
                                                                                <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
263
 
                                                                        </dl>
264
 
                                                                        <dl>
265
 
                                                                                <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</label></dt>
266
 
                                                                                <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd>
267
 
                                                                        </dl>
268
 
                                                                <!-- ENDIF -->
269
 
                                                        <!-- IF not files.S_LAST_ROW -->
270
 
                                                        </fieldset>
271
 
 
272
 
                                                        <fieldset>
273
 
                                                                <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend>
274
 
                                                        <!-- ENDIF -->
275
 
 
276
 
                                                        <!-- ENDIF -->
277
 
                                                <!-- ENDIF -->
278
 
                                        <!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF -->
279
 
                                <!-- ENDIF -->
280
 
                        <!-- END files -->
281
 
 
282
 
                        </fieldset></div>
283
 
                <!-- ENDIF -->
284
 
 
285
 
                <br />
286
 
 
287
 
                <fieldset class="quick">
288
 
                        <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
289
 
                </fieldset>
290
 
 
291
 
                <br />
292
 
 
293
 
                <h1>{L_UPDATE_METHOD}</h1>
294
 
 
295
 
                <p>{L_UPDATE_METHOD_EXPLAIN}</p>
296
 
 
297
 
                <fieldset class="submit-buttons">
298
 
                        <input class="button1" type="submit" name="ftp_upload" value="{L_FTP_UPDATE_METHOD}" />&nbsp; &nbsp;<input class="button1" type="submit" name="download" value="{L_DOWNLOAD_UPDATE_METHOD}" />
299
 
                </fieldset>
300
 
 
301
 
                </form>
302
 
 
303
 
        <!-- ENDIF -->
304
 
 
305
 
<!-- ELSEIF S_DOWNLOAD_FILES -->
306
 
 
307
 
        <h1>{L_DOWNLOAD_UPDATE_METHOD}</h1>
308
 
 
309
 
        <p>{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}</p>
310
 
 
311
 
        <form id="install_update" method="post" action="{U_ACTION}">
312
 
 
313
 
        <fieldset>
314
 
                <legend>{L_SELECT_DOWNLOAD_FORMAT}</legend>
315
 
        <dl>
316
 
                <dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt>
317
 
                <dd>{RADIO_BUTTONS}</dd>
318
 
        </dl>
319
 
        </fieldset>
320
 
 
321
 
        <fieldset class="submit-buttons">
322
 
                {S_HIDDEN_FIELDS}
323
 
                <input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" />&nbsp; &nbsp;<input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
324
 
        </fieldset>
325
 
 
326
 
        </form>
327
 
 
328
 
        <br /><br />
329
 
 
330
 
        <p>{L_MAPPING_FILE_STRUCTURE}</p>
331
 
 
332
 
        <table cellspacing="1">
333
 
                <col class="row1" /><col class="row2" /><col class="row1" />
334
 
        <thead>
335
 
        <tr>
336
 
                <th style="width: 49%">{L_ARCHIVE_FILE}</th>
337
 
                <th style="width: 2%">&nbsp;</th>
338
 
                <th style="width: 49%">{L_DESTINATION}</th>
339
 
        </tr>
340
 
        </thead>
341
 
        <tbody>
342
 
        <!-- BEGIN location -->
343
 
        <tr>
344
 
                <td>{location.SOURCE}</td>
345
 
                <td><strong>&raquo;</strong></td>
346
 
                <td>{location.DESTINATION}</td>
347
 
        </tr>
348
 
        <!-- END location -->
349
 
        </tbody>
350
 
        </table>
351
 
 
352
 
<!-- ELSEIF S_FTP_UPLOAD -->
353
 
 
354
 
        <h1>{L_SELECT_FTP_SETTINGS}</h1>
355
 
 
356
 
        <form id="install_update" method="post" action="{U_ACTION}">
357
 
 
358
 
        <!-- IF S_CONNECTION_SUCCESS -->
359
 
                <div class="successbox">
360
 
                        <p>{L_CONNECTION_SUCCESS}</p>
361
 
                </div>
362
 
        <!-- ELSEIF S_CONNECTION_FAILED -->
363
 
                <div class="errorbox">
364
 
                        <p>{L_CONNECTION_FAILED}<br />{ERROR_MSG}</p>
365
 
                </div>
366
 
        <!-- ENDIF -->
367
 
 
368
 
        <fieldset>
369
 
                <legend>{L_FTP_SETTINGS}</legend>
370
 
        <dl>
371
 
                <dt><label>{L_UPLOAD_METHOD}:</label></dt>
372
 
                <dd><strong>{UPLOAD_METHOD}</strong></dd>
373
 
        </dl>
374
 
        <!-- BEGIN data -->
375
 
        <dl>
376
 
                <dt><label for="{data.DATA}">{data.NAME}:</label><br /><span>{data.EXPLAIN}</span></dt>
377
 
                <dd><input type="<!-- IF data.DATA == 'password' -->password<!-- ELSE -->text<!-- ENDIF -->" id="{data.DATA}" name="{data.DATA}" value="{data.DEFAULT}" /></dd>
378
 
        </dl>
379
 
        <!-- END data -->
380
 
        </fieldset>
381
 
        
382
 
        <fieldset class="submit-buttons">
383
 
                {S_HIDDEN_FIELDS}
384
 
                <input class="button2" type="submit" name="check_again" value="{L_BACK}" />
385
 
                <input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" />
386
 
                <input class="button1" type="submit" name="submit" value="{L_UPDATE_FILES}" />
387
 
        </fieldset>
388
 
 
389
 
        </form>
390
 
 
391
 
<!-- ENDIF -->
392
 
 
393
 
<!-- INCLUDE install_footer.html -->