changeset 1211:e63c9c8d0ad9

Move revision info to the end
author Shitiz Garg <mail@dragooon.net>
date Fri, 06 Jan 2012 18:11:14 +0530
parents d5c6c9ada478
children 98d0b7dfaf1a
files MoinMoin/items/__init__.py MoinMoin/templates/atom.html MoinMoin/templates/diff_text_atom.html
diffstat 3 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/items/__init__.py	Fri Jan 06 17:33:34 2012 +0530
+++ b/MoinMoin/items/__init__.py	Fri Jan 06 18:11:14 2012 +0530
@@ -736,9 +736,9 @@
 
     _render_data_diff_text = _render_data_diff
     _render_data_diff_raw = _render_data_diff
-    
+
     def _render_data_diff_atom(self, oldrev, newrev):
-        return render_template('atom.html', 
+        return render_template('atom.html',
                                oldrev=oldrev, newrev=newrev, get='binary',
                                content=Markup(self._render_data()))
 
--- a/MoinMoin/templates/atom.html	Fri Jan 06 17:33:34 2012 +0530
+++ b/MoinMoin/templates/atom.html	Fri Jan 06 18:11:14 2012 +0530
@@ -33,6 +33,8 @@
 {%- elif get == 'comment_cont_merge' -%}
     <p style="font-size: 14px">...{{ comment }}</p> <br /> {{ content }}
 {%- elif get == 'first_revision' -%}
+    {{ content }}
+    <br />
     <table class="moin-diff" cellpadding="10" width="100%">
         <tr>
             <td class="moin-diff-header" style="width: 100%;">
@@ -40,10 +42,10 @@
             </td>
         </tr>
     </table>
-    <br />
-    {{ content }}
     <strong>{{ safe_style() }}</strong>
 {%- elif get == 'binary' -%}
+    {{ content }}
+    <br />
     <table class="moin-diff" cellpadding="10" width="100%">
         <tr>
             <td class="moin-diff-header" style="width: 50%;">
@@ -54,7 +56,5 @@
             </td>
         </tr>
     </table>
-    <br />
-    {{ content }}
     {{ safe_style() }}
 {%- endif -%}
\ No newline at end of file
--- a/MoinMoin/templates/diff_text_atom.html	Fri Jan 06 17:33:34 2012 +0530
+++ b/MoinMoin/templates/diff_text_atom.html	Fri Jan 06 18:11:14 2012 +0530
@@ -15,6 +15,14 @@
     </div>
 {% endmacro %}
 <table class="moin-diff" style="width: 100%;">
+    {% for llineno, lcontent, rlineno, rcontent in diffs %}
+        <tr>
+            <td style="vertical-align: top;">{{ llineno }}:</td>
+            <td class="moin-diff-removed" style="vertical-align: top; background-color:#ff9; word-wrap: break-word;"><blockquote>{{ lcontent }}</blockquote></td>
+            <td style="vertical-align: top;">{{ rlineno }}:</td>
+            <td class="moin-diff-added" style="vertical-align: top; background-color: #cfc; word-wrap: break-word;"><blockquote>{{ rcontent }}</blockquote></td>
+        </tr>
+    {% endfor %}
     <tr>
         <td class="moin-diff-header-line" style="width: 3%;">
         </td>
@@ -25,15 +33,8 @@
         </td>
         <td class="moin-diff-header" style="width: 47%;">
             <strong>{{ show_meta(newrev) }}</strong>
-        </td>    </tr>
-    {% for llineno, lcontent, rlineno, rcontent in diffs %}
-        <tr>
-            <td style="vertical-align: top;">{{ llineno }}:</td>
-            <td class="moin-diff-removed" style="vertical-align: top; background-color:#ff9; word-wrap: break-word;"><blockquote>{{ lcontent }}</blockquote></td>
-            <td style="vertical-align: top;">{{ rlineno }}:</td>
-            <td class="moin-diff-added" style="vertical-align: top; background-color: #cfc; word-wrap: break-word;"><blockquote>{{ rcontent }}</blockquote></td>
-        </tr>
-    {% endfor %}
+        </td>    
+    </tr>
 </table>
 <style type="text/css">
     .moin-diff-added span { background-color: #80FF80; }