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