changeset 1365:6cb48018d6aa

mass update part 2 - change DOS line endings to unix
author Roger Haase <crosseyedpenguin@yahoo.com>
date Wed, 06 Jun 2012 15:03:59 -0700
parents 582e7109a8c1
children 6f785bab3b97
files MoinMoin/templates/atom.html MoinMoin/templates/diff_text_atom.html
diffstat 2 files changed, 105 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/atom.html	Wed Jun 06 15:03:07 2012 -0700
+++ b/MoinMoin/templates/atom.html	Wed Jun 06 15:03:59 2012 -0700
@@ -1,62 +1,62 @@
-{% import "utils.html" as utils %}
-{% macro show_meta(rev) %}
-    <div class="moin-diff-info moin-diff-info-rev-id">
-        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-size">
-        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-comment">
-        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
-    </div>
-{% endmacro %}
-
-{# A few style rules to ensure the content doesn't overflow #}
-{% macro atom_style() %}
-    <style type="text/css">
-        img {
-            max-width: 100%;
-        }
-        td {
-            padding-right: 10px;
-        }
-        table {
-            width: 100%;
-        }
-    </style>
-{% endmacro %}
-
-{%- if get == 'xml' -%}
-    <?xml-stylesheet type="text/xsl" href="{{ theme_static('atom.xslt') }}"?>
-{%- elif get == 'comment_cont_merge' -%}
-    <p style="font-size: 1.2em">…{{ 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%;">
-                <strong>{{ show_meta(rev) }}</strong>
-            </td>
-        </tr>
-    </table>
-    {{ atom_style() }}
-{%- elif get == 'binary' -%}
-    {{ content }}
-    <br />
-    <table class="moin-diff" cellpadding="10" width="100%">
-        <tr>
-            <td class="moin-diff-header" style="width: 50%;">
-                <strong>{{ show_meta(oldrev) }}</strong>
-            </td>
-            <td class="moin-diff-header" style="width: 50%;">
-                <strong>{{ show_meta(newrev) }}</strong>
-            </td>
-        </tr>
-    </table>
-    {{ atom_style() }}
-{%- endif -%}
-
+{% import "utils.html" as utils %}
+{% macro show_meta(rev) %}
+    <div class="moin-diff-info moin-diff-info-rev-id">
+        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-size">
+        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-comment">
+        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
+    </div>
+{% endmacro %}
+
+{# A few style rules to ensure the content doesn't overflow #}
+{% macro atom_style() %}
+    <style type="text/css">
+        img {
+            max-width: 100%;
+        }
+        td {
+            padding-right: 10px;
+        }
+        table {
+            width: 100%;
+        }
+    </style>
+{% endmacro %}
+
+{%- if get == 'xml' -%}
+    <?xml-stylesheet type="text/xsl" href="{{ theme_static('atom.xslt') }}"?>
+{%- elif get == 'comment_cont_merge' -%}
+    <p style="font-size: 1.2em">…{{ 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%;">
+                <strong>{{ show_meta(rev) }}</strong>
+            </td>
+        </tr>
+    </table>
+    {{ atom_style() }}
+{%- elif get == 'binary' -%}
+    {{ content }}
+    <br />
+    <table class="moin-diff" cellpadding="10" width="100%">
+        <tr>
+            <td class="moin-diff-header" style="width: 50%;">
+                <strong>{{ show_meta(oldrev) }}</strong>
+            </td>
+            <td class="moin-diff-header" style="width: 50%;">
+                <strong>{{ show_meta(newrev) }}</strong>
+            </td>
+        </tr>
+    </table>
+    {{ atom_style() }}
+{%- endif -%}
+
--- a/MoinMoin/templates/diff_text_atom.html	Wed Jun 06 15:03:07 2012 -0700
+++ b/MoinMoin/templates/diff_text_atom.html	Wed Jun 06 15:03:59 2012 -0700
@@ -1,43 +1,43 @@
-{% import "utils.html" as utils %}
-
-{% macro show_meta(rev) %}
-    <div class="moin-diff-info moin-diff-info-rev-id">
-        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-size">
-        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
-    </div>
-    <div class="moin-diff-info moin-diff-info-rev-comment">
-        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
-        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
-    </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>
-        <td class="moin-diff-header" style="width: 47%;">
-            <strong>{{ show_meta(oldrev) }}</strong>
-        </td>
-        <td class="moin-diff-header-line" style="width: 3%;">
-        </td>
-        <td class="moin-diff-header" style="width: 47%;">
-            <strong>{{ show_meta(newrev) }}</strong>
-        </td>    
-    </tr>
-</table>
-<style type="text/css">
-    .moin-diff-added span { background-color: #80FF80; }
-    .moin-diff-removed span { background-color: #FFFF80; }
-</style>
-
+{% import "utils.html" as utils %}
+
+{% macro show_meta(rev) %}
+    <div class="moin-diff-info moin-diff-info-rev-id">
+        <span class="moin-diff-info-caption">{{ _('Revision') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['revid'] | shorten_id }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-size">
+        <span class="moin-diff-info-caption">{{ _('Size') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['size'] }}</span>
+    </div>
+    <div class="moin-diff-info moin-diff-info-rev-comment">
+        <span class="moin-diff-info-caption">{{ _('Comment') }}:</span>
+        <span class="moin-diff-info-value">{{ rev.meta['comment'] }}</span>
+    </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>
+        <td class="moin-diff-header" style="width: 47%;">
+            <strong>{{ show_meta(oldrev) }}</strong>
+        </td>
+        <td class="moin-diff-header-line" style="width: 3%;">
+        </td>
+        <td class="moin-diff-header" style="width: 47%;">
+            <strong>{{ show_meta(newrev) }}</strong>
+        </td>
+    </tr>
+</table>
+<style type="text/css">
+    .moin-diff-added span { background-color: #80FF80; }
+    .moin-diff-removed span { background-color: #FFFF80; }
+</style>
+