source: trunk/templates/edit_conflict.tt @ 811

Last change on this file since 811 was 617, checked in by Dominic Hargreaves, 17 years ago

New css id maincontent, and misc template bugfixes

  • Property svn:eol-style set to native
  • Property svn:keywords set to Author Date Id Revision
File size: 4.6 KB
Line 
1[% USE CGI %]
2[% INCLUDE header.tt %]
3[% INCLUDE banner.tt %]
4<div id="content">
5[% INCLUDE navbar.tt %]
6<div id="maincontent">
7<h2>Edit "[% node_name %]"</h2>
8
9<div class="warning_text">
10Someone has committed changes to this node since you began editing.
11You will need to manually merge your changes into the new version.
12</div>
13
14<br clear="all" />
15
16<form action="[% cgi_url %]" method="POST">
17<table summary="Layout containing table">
18  <tr>
19    <td colspan="3">
20    <fieldset>
21    <legend>Main information</legend>
22    <table summary="Editing areas for reconciling edit conflicts">
23      <tr>
24        <td class="label"><label for="content">Content:</label></td>
25        <td><textarea name="content" id="content" rows="21" cols="40">[% stored_content %]</textarea></td>
26        <td><small>[% CGI.escapeHTML(new_content) %]</small></td>
27      </tr>
28      <tr>
29        <td class="label"><label for="locales">Locales:<br />(one per line)</label></td>
30[%# NOTE: The whitespace in the next two textareas is deliberate, to avoid
31    getting bogus tabs and blank lines in the textarea content.  Please
32    do not reintroduce this bug.  Test on more than one browser. #%]
33        <td><textarea id="locales" name="locales" rows="5" cols="40">[% FOREACH locale = stored_locales %][% locale %]
34[% END %]</textarea></td>
35        <td>[% FOREACH locale = new_locales %][% CGI.escapeHTML(locale) %]<br/>[% END %]</td>
36      </tr>
37      <tr>
38        <td class="label"><label>Categories:<br />(one per line)</label></td>
39        <td><textarea id="categories" name="categories" rows="5" cols="40">[% FOREACH category = stored_categories %][% category %]
40[% END %]</textarea></td>
41        <td>[% FOREACH category = new_categories %][% CGI.escapeHTML(category) %]<br/>[% END %]</td>
42      </tr>
43    </table>
44    </fieldset>
45    &nbsp;
46    <fieldset>
47    <legend>Metadata</legend>
48    <table>
49      <tr>
50        <td class="label"><label for="phone">Phone:</label></td>
51        <td><input type="text" size="50" id="phone" name="phone" value="[% stored_phone %]"></td>
52        <td>[% CGI.escapeHTML(new_phone) %]</td>
53      </tr>
54      <tr>
55        <td class="label"><label for="fax">Fax:</label></td>
56        <td><input type="text" size="50" id="fax" name="fax" value="[% stored_fax %]"></td>
57        <td>[% CGI.escapeHTML(new_fax) %]</td>
58      </tr>
59            <tr>
60        <td class="label"><label for="website">Website:</label></td>
61        <td><input type="text" size="50" id="website" name="website" value="[% stored_website %]"></td>
62        <td>[% CGI.escapeHTML(new_website) %]
63      </tr>
64            <tr>
65        <td class="label"><label for="hours">Opening hours:</label></td>
66        <td><input type="text" size="50" id="hours" name="hours_text" value="[% stored_hours_text %]"></td>
67        <td>[% CGI.escapeHTML(new_hours_text) %]</td>
68      </tr>
69            <tr>
70        <td class="label"><label for="address">Address:</label></td>
71        <td><input type="text" size="50" id="address" name="address" value="[% stored_address %]"></td>
72        <td>[% CGI.escapeHTML(new_address) %]</td>
73      </tr>
74            <tr>
75        <td class="label"><label for="postcode">Postcode:</label></td>
76        <td><input type="text" size="50" id="postcode" name="postcode" value="[% stored_postcode %]"></td>
77        <td>[% CGI.escapeHTML(new_postcode) %]</td>
78      </tr>
79            <tr>
80        <td class="label"><label for="os_x">OS X coordinate:</label></td>
81        <td><input type="text" size="50" id="os_x" name="os_x" value="[% stored_os_x %]">
82        <td>[% CGI.escapeHTML(new_os_x) %]</td>
83      </tr>
84            <tr>
85        <td class="label"><label for="os_y">OS Y coordinate:</label></td>
86        <td><input type="text" size="50" id="os_y" name="os_y" value="[% stored_os_y %]"></td>
87        <td>[% CGI.escapeHTML(new_os_y) %]</td>
88      </tr>
89      <tr>
90        <td class="label"><label for="map_link">Map link:</label></td>
91        <td><input type="text" size="70" id="map_link" name="map_link" value="[% map_link %]"></td>
92      </tr>
93    </table>
94    </fieldset>
95    &nbsp;
96    [% INCLUDE openguides_information_boxes.tt %]
97    </td>
98  </tr>
99  <tr>
100    <td align="center"><input type="submit" name="preview" value="Preview changes" class="form_button" /></td>
101    <td align="center"><input type="submit" name="Save" value="Save changes" class="form_button" /></td>
102  </tr>
103  <tr>
104    <td colspan="2" align="center"><a href="[% cgi_url %]?[% node_param %]">(cancel edit)</a></td>
105  </tr>
106</table>
107<input type="hidden" name="title" value="[% node_name %]">
108<input type="hidden" name="checksum" value="[% checksum %]" />
109</form>
110
111[% IF preview_html %]
112  <h2>Preview</h2>
113  [% INCLUDE display_metadata.tt %]
114
115  [% preview_html %]
116[% END %]
117
118</div>
119[% INCLUDE footer.tt %]
Note: See TracBrowser for help on using the repository browser.