templates/edit_conflict.html

   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" xml:lang="en" lang="en">
   3 <head>
   4 <title>Edit conflict</title>
   5 <meta name="author" content="http://merjis.com/" />
   6 <link rel="stylesheet" href="/_css/standard.css" type="text/css" title="Standard"/>
   7 <link rel="stylesheet" href="/_css/editor.css" type="text/css" title="Standard"/>
   8 <script src="/_js/editor.js" type="text/javascript"></script>
   9 </head><body>
  10
  11 <h1><span>Edit conflict</span></h1>
  12
  13 <p>
  14 Someone else edited that page while you were editing it.  This leads
  15 to an <strong>edit conflict</strong> which you have to fix by hand.
  16 </p>
  17
  18 <ul>
  19 <li> <a target="_blank" href="/::url_html_tag::/edit">Edit the page again</a>
  20   (opens in a new window so you can refer back to this page) </li>
  21 <li> <a href="/::url_html_tag::">Abandon your changes</a> </li>
  22 </ul>
  23
  24 <table id="edit_conflict" width="100%">
  25 <tr>
  26 <th class="other"> Other person's edits </th>
  27 <th class="our"> Your edits </th>
  28 </tr>
  29 <tr>
  30 <td class="other" width="50%">
  31 <pre>
  32 ::other_diff_html::
  33 </pre>
  34 </td>
  35 <td class="our" width="50%">
  36 <pre>
  37 ::our_diff_html::
  38 </pre>
  39 </td>
  40 </tr>
  41 </table>
  42
  43 ::include(footer.html)::
  44 </body>
  45 </html>