Changeset 928 for trunk/templates

Timestamp:

03/10/07 23:49:39 (21 months ago)

Author:

kake

Message:

Write tests for and fix bugs #48 and #173; in the process, move preview_node() and edit_node() from wiki.cgi into OpenGuides.pm, and add more functionality to OpenGuides::Test.

Files:

• trunk/templates/edit_form.tt (modified) (10 diffs)

trunk/templates/edit_form.tt

@@ +1 @@
+[% USE CGI %]
 [% INCLUDE header.tt page_title = "Edit $node_name - $site_name" %]
 <div id="content">
@@ -4 +5 @@
 <div id="maincontent">
 <h1 align="center">Edit &quot;[% node_name %]&quot;</h1>
+
+[% IF conflict %]
+  <div class="warning_text">
+    Someone has committed changes to this node since you began editing.
+    You will need to manually merge your changes into the new version.
+  </div>
+[% END %]
 
 [% IF preview_html AND preview_above_edit_box %]
@@ -15 +23 @@
   <table summary="Form for editing page attributes">
     <tr>
-      <td colspan="2">
+      <td colspan="[% IF conflict %]3[% ELSE %]2[% END %]">
         [%# Put the td outside the TRY-CATCH because TT will print everything
             up to where it gets the error - avoid mismatched tags. %]
@@ -39 +47 @@
     </tr>
     <tr>
-      <td colspan="2" align="center"><a href="[% cgi_url %]?[% node_param %]">(cancel edit)</a></td>
+      <td colspan="[% IF conflict %]3[% ELSE %]2[% END %]" align="center"><a href="[% cgi_url %]?[% node_param %]">(cancel edit)</a></td>
     </tr>
     <tr>
-      <td colspan="2">
+      <td colspan="[% IF conflict %]3[% ELSE %]2[% END %]">
         <fieldset>
           <legend>Main information (required)</legend>
@@ -49 +57 @@
               <td class="label"><label for="content">Content:</label></td>
               <td><textarea name="content" id="content_textarea" rows="21" cols="70" wrap="virtual">[% content %]</textarea></td>
+              [% IF conflict %]
+                <td><small>[% CGI.escapeHTML(new_content) %]</small></td>
+              [% END %]
             </tr>
             <tr>
@@ -57 +68 @@
               <td><textarea name="locales" id="locales" rows="5" cols="70">[% FOREACH locale = locales %][% locale.name %]
 [% END %]</textarea></td>
+              [% IF conflict %]
+                <td>[% FOREACH locale = new_locales %][% CGI.escapeHTML(locale) %]<br/>[% END %]</td>
+              [% END %]
             </tr>
             <tr>
@@ -62 +76 @@
               <td><textarea name="categories" id="categories" rows="5" cols="70">[% FOREACH category = categories %][% category.name %]
 [% END %]</textarea></td>
+              [% IF conflict %]
+                <td>[% FOREACH category = new_categories %][% CGI.escapeHTML(category) %]<br/>[% END %]</td>
+              [% END %]
             </tr>
           </table>
@@ -76 +93 @@
                 [% INCLUDE node_photo_notes.tt %]
               </td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_node_image) %]</td>
+              [% END %]
             </tr>
 [% END %]
@@ -81 +101 @@
               <td class="label"><label for="phone">Phone:</label></td>
               <td><input type="text" size="50" id="phone" name="phone" value="[% phone %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_phone) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="fax">Fax:</label></td>
               <td><input type="text" size="50" id="fax" name="fax" value="[% fax %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_fax) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="website">Website:</label></td>
               <td><input type="text" size="50" id="website" name="website" value="[% website %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_website) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="hours">Opening hours:</label></td>
               <td><input type="text" size="50" id="hours" name="hours_text" value="[% hours_text %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(hours_text) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="address">Address:</label></td>
               <td><input type="text" size="50" id="address" name="address" value="[% address %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_address) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="postcode">Postcode:</label></td>
               <td><input type="text" size="50" id="postcode" name="postcode" value="[% postcode %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_postcode) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="[% coord_field_1 %]">[% coord_field_1_name %]:</label></td>
               <td><input type="text" size="50" id="[% coord_field_1 %]" name="[% coord_field_1 %]" value="[% coord_field_1_value %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_coord_field_1_value) %]</td>
+              [% END %]
             </tr>
             <tr>
               <td class="label"><label for="[% coord_field_2 %]">[% coord_field_2_name %]:</label></td>
               <td><input type="text" size="50" id="[% coord_field_2 %]" name="[% coord_field_2 %]" value="[% coord_field_2_value %]" /></td>
+              [% IF conflict %]
+                <td>[% CGI.escapeHTML(new_coord_field_2_value) %]</td>
+              [% END %]
             </tr>
             <tr>
@@ -131 +175 @@
     </tr>
     <tr>
-      <td colspan="2" align="center">
+      <td colspan="[% IF conflict %]3[% ELSE %]2[% END %]" align="center">
         <a href="[% cgi_url %]?[% node_param %]">(cancel edit)</a>
       </td>