changeset 2761:31628ac3ec21

mass correction of indentation on many templates
author RogerHaase <haaserd@gmail.com>
date Sun, 24 Aug 2014 08:39:32 -0700
parents 2d7189275f1b
children f8e28b0f4c36
files MoinMoin/apps/admin/templates/admin/index.html MoinMoin/apps/admin/templates/admin/trash.html MoinMoin/apps/admin/templates/admin/wikiconfig.html MoinMoin/apps/admin/templates/admin/wikiconfighelp.html MoinMoin/apps/admin/templates/user/highlighterhelp.html MoinMoin/apps/admin/templates/user/interwikihelp.html MoinMoin/apps/admin/templates/user/itemsize.html MoinMoin/templates/404.html MoinMoin/templates/ajaxsearch.html MoinMoin/templates/all.html MoinMoin/templates/base.html MoinMoin/templates/blog/layout.html MoinMoin/templates/content.html MoinMoin/templates/delete.html MoinMoin/templates/destroy.html MoinMoin/templates/diff.html MoinMoin/templates/error.html MoinMoin/templates/forms.html MoinMoin/templates/global_history.html MoinMoin/templates/global_tags.html MoinMoin/templates/highlight.html MoinMoin/templates/history.html MoinMoin/templates/index.html MoinMoin/templates/itemviews.html MoinMoin/templates/layout.html MoinMoin/templates/link_list_item_panel.html MoinMoin/templates/login.html MoinMoin/templates/lookup.html MoinMoin/templates/lostpass.html MoinMoin/templates/mail/content_diff.html MoinMoin/templates/mail/html_base.html MoinMoin/templates/mail/meta_diff.html MoinMoin/templates/mail/notification_main.html MoinMoin/templates/meta.html MoinMoin/templates/modify.html MoinMoin/templates/modify_anywikidraw.html MoinMoin/templates/modify_select_contenttype.html MoinMoin/templates/modify_select_itemtype.html MoinMoin/templates/modify_select_template.html MoinMoin/templates/modify_svg-edit.html MoinMoin/templates/modify_text.html MoinMoin/templates/modify_text_html.html MoinMoin/templates/modify_twikidraw.html MoinMoin/templates/openid_register.html MoinMoin/templates/recoverpass.html MoinMoin/templates/refs.html MoinMoin/templates/register.html MoinMoin/templates/rename.html MoinMoin/templates/revert.html MoinMoin/templates/search.html MoinMoin/templates/show.html MoinMoin/templates/show_nonexistent.html MoinMoin/templates/sitemap.html MoinMoin/templates/snippets.html MoinMoin/templates/ticket/base.html MoinMoin/templates/ticket/submit.html MoinMoin/templates/tickets.html MoinMoin/templates/usersettings.html MoinMoin/templates/usersettings_forms.html MoinMoin/templates/utils.html MoinMoin/themes/basic/templates/delete.html MoinMoin/themes/basic/templates/destroy.html MoinMoin/themes/basic/templates/diff.html MoinMoin/themes/basic/templates/highlight.html MoinMoin/themes/basic/templates/history.html MoinMoin/themes/basic/templates/index.html MoinMoin/themes/basic/templates/itemviews.html MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/login.html MoinMoin/themes/basic/templates/meta.html MoinMoin/themes/basic/templates/modify.html MoinMoin/themes/basic/templates/modify_binary.html MoinMoin/themes/basic/templates/modify_text.html MoinMoin/themes/basic/templates/register.html MoinMoin/themes/basic/templates/rename.html MoinMoin/themes/basic/templates/show.html MoinMoin/themes/basic/templates/snippets.html MoinMoin/themes/basic/templates/usersettings.html MoinMoin/themes/basic/templates/usersettings_forms.html
diffstat 79 files changed, 2189 insertions(+), 2189 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/admin/index.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/index.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,12 +1,12 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Admin Menu") }}</h1>
-<ul>
-    <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("Users") }}</a></li>
-    <li><a href="{{ url_for('admin.groupbrowser') }}">{{ _("Groups") }}</a></li>
-    <li><a href="{{ url_for('admin.item_acl_report') }}">{{ _("Item ACL Report") }}</a></li>
-    <li><a href="{{ url_for('admin.trash', namespace='all') }}">{{ _("Trash") }}</a></li>
-    <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
-    <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Wiki Configuration Help") }}</a></li>
-</ul>
+    <h1>{{ _("Admin Menu") }}</h1>
+    <ul>
+        <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("Users") }}</a></li>
+        <li><a href="{{ url_for('admin.groupbrowser') }}">{{ _("Groups") }}</a></li>
+        <li><a href="{{ url_for('admin.item_acl_report') }}">{{ _("Item ACL Report") }}</a></li>
+        <li><a href="{{ url_for('admin.trash', namespace='all') }}">{{ _("Trash") }}</a></li>
+        <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
+        <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Wiki Configuration Help") }}</a></li>
+    </ul>
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/admin/trash.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/trash.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,10 +1,10 @@
 {% extends theme("layout.html") %}
 {% import "utils.html" as utils %}
 {% block content %}
-{% if headline %}
-<h1>{{ headline }}</h1>
-{% endif %}
-Total: {{ results|count }}
+    {% if headline %}
+        <h1>{{ headline }}</h1>
+    {% endif %}
+    Total: {{ results|count }}
     {% if results %}
         <table class="zebra">
             <thead>
@@ -19,18 +19,18 @@
             </thead>
             <tbody>
                 {% for result in results| sort(attribute='mtime', reverse=True)%}
-                <tr>
-                    <td class="moin-wordbreak">{{ result.oldname|join(' | ') }}</td>
-                    <td>{{ result.revid | shorten_id }}</td>
-                    <td>{{ result.mtime|datetimeformat }}</td>
-                    <td class="moin-wordbreak">{{ utils.show_editor_info(result.editor)  }}</td>
-                    <td class="moin-wordbreak">{{ result.comment }}</td>
-                    <td><a href="{{ url_for('frontend.show_item', item_name=result.fqname) }}">{{ _('show') }}</a></td>
-                    {% if user.may.write(result.fqname) -%}
-                    <td><a href="{{ url_for('frontend.history', item_name=result.fqname) }}">{{ _('History') }}</a></td>
-                    <td><a href="{{ url_for('frontend.destroy_item', item_name=result.fqname) }}">{{ _('Destroy') }}</a></td>
-                    {%- endif %}
-                </tr>
+                    <tr>
+                        <td class="moin-wordbreak">{{ result.oldname|join(' | ') }}</td>
+                        <td>{{ result.revid | shorten_id }}</td>
+                        <td>{{ result.mtime|datetimeformat }}</td>
+                        <td class="moin-wordbreak">{{ utils.show_editor_info(result.editor)  }}</td>
+                        <td class="moin-wordbreak">{{ result.comment }}</td>
+                        <td><a href="{{ url_for('frontend.show_item', item_name=result.fqname) }}">{{ _('show') }}</a></td>
+                        {% if user.may.write(result.fqname) -%}
+                            <td><a href="{{ url_for('frontend.history', item_name=result.fqname) }}">{{ _('History') }}</a></td>
+                            <td><a href="{{ url_for('frontend.destroy_item', item_name=result.fqname) }}">{{ _('Destroy') }}</a></td>
+                        {%- endif %}
+                    </tr>
                 {% endfor %}
             </tbody>
         </table>
--- a/MoinMoin/apps/admin/templates/admin/wikiconfig.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/wikiconfig.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,35 +1,35 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Show Wiki Configuration") }}</h1>
-<p>
-{{ _("This table shows all settings in this wiki that do not have default values. "
-     "Settings that the configuration system doesn't know about are shown in italic, "
-     "those may be due to third-party extensions needing configuration or settings that "
-     "were removed from Moin.")
-}}
-</p>
-<table class="zebra">
-<thead>
-<tr>
-<th>{{ _('Variable Name') }}</th>
-<th>{{ _('Setting') }}</th>
-</tr>
-</thead>
-<tbody>
-{% for name, value in found %}
-<tr>
-<td>
-    {% if name in settings %}
-        {{ name }}
-    {% else %}
-        <em>{{ name }}</em>
-    {% endif %}
-</td>
-<td>
-    <code>{{ "%r" % (value, ) }}</code>
-</td>
-</tr>
-{% endfor %}
-</tbody>
-</table>
+    <h1>{{ _("Show Wiki Configuration") }}</h1>
+    <p>
+        {{ _("This table shows all settings in this wiki that do not have default values. "
+             "Settings that the configuration system doesn't know about are shown in italic, "
+             "those may be due to third-party extensions needing configuration or settings that "
+             "were removed from Moin.")
+        }}
+    </p>
+    <table class="zebra">
+        <thead>
+            <tr>
+                <th>{{ _('Variable Name') }}</th>
+                <th>{{ _('Setting') }}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for name, value in found %}
+                <tr>
+                    <td>
+                        {% if name in settings %}
+                            {{ name }}
+                        {% else %}
+                            <em>{{ name }}</em>
+                        {% endif %}
+                    </td>
+                    <td>
+                        <code>{{ "%r" % (value, ) }}</code>
+                    </td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/admin/wikiconfighelp.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/admin/wikiconfighelp.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,28 +1,28 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Wiki Configuration Help") }}</h1>
-{% for heading, desc, opts in groups %}
-    <h2>{{ heading }}</h2>
-    {% if desc %}
-        <p>{{ desc }}</p>
-    {% endif %}
-    <table class="zebra">
-    <thead>
-    <tr>
-        <th>{{ _('Variable Name') }}</th>
-        <th>{{ _('Default') }}</th>
-        <th>{{ _('Description') }}</th>
-    </tr>
-    </thead>
-    <tbody>
-    {% for name, default, description in opts %}
-        <tr>
-            <td>{{ name }}</td>
-            <td><code>{{ default }}</code></td>
-            <td>{{ description }}</td>
-        </tr>
+    <h1>{{ _("Wiki Configuration Help") }}</h1>
+    {% for heading, desc, opts in groups %}
+        <h2>{{ heading }}</h2>
+        {% if desc %}
+            <p>{{ desc }}</p>
+        {% endif %}
+        <table class="zebra">
+            <thead>
+                <tr>
+                    <th>{{ _('Variable Name') }}</th>
+                    <th>{{ _('Default') }}</th>
+                    <th>{{ _('Description') }}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for name, default, description in opts %}
+                    <tr>
+                        <td>{{ name }}</td>
+                        <td><code>{{ default }}</code></td>
+                        <td>{{ description }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
     {% endfor %}
-    </tbody>
-    </table>
-{% endfor %}
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/user/highlighterhelp.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/user/highlighterhelp.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,6 +1,6 @@
 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Highlighters") }}</h1>
-{{ utils.table(headings, rows) }}
+    <h1>{{ _("Highlighters") }}</h1>
+    {{ utils.table(headings, rows) }}
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/user/interwikihelp.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/user/interwikihelp.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,6 +1,6 @@
 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("InterWiki Names") }}</h1>
-{{ utils.table(headings, rows, url_cols=[2]) }}
+    <h1>{{ _("InterWiki Names") }}</h1>
+    {{ utils.table(headings, rows, url_cols=[2]) }}
 {% endblock %}
--- a/MoinMoin/apps/admin/templates/user/itemsize.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/apps/admin/templates/user/itemsize.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,6 +1,6 @@
 {% import "utils.html" as utils %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Item Sizes (last revision)") }}</h1>
-{{ utils.table(headings, rows, filesize_cols=[1], itemname_cols=[2]) }}
+    <h1>{{ _("Item Sizes (last revision)") }}</h1>
+    {{ utils.table(headings, rows, filesize_cols=[1], itemname_cols=[2]) }}
 {% endblock %}
--- a/MoinMoin/templates/404.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/404.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,8 +2,8 @@
 {% extends theme("layout.html") %}
 {% block content %}
 
-<p>
-{{ _("The item '%(item_name)s' does not exist.", item_name=item_name) }}
-</p>
+    <p>
+        {{ _("The item '%(item_name)s' does not exist.", item_name=item_name) }}
+    </p>
 
 {% endblock %}
--- a/MoinMoin/templates/ajaxsearch.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/ajaxsearch.html	Sun Aug 24 08:39:32 2014 -0700
@@ -12,12 +12,12 @@
         {% endif %}
         <p class="searchstats">
             {% if results %}
-            {{ _("%(result_len)d results found (%(runtime).3f secs).",
-                  result_len=results|length, runtime=results.runtime
-                )
-            }}
+                {{ _("%(result_len)d results found (%(runtime).3f secs).",
+                      result_len=results|length, runtime=results.runtime
+                    )
+                }}
             {% else %}
-            {{ _("No results found (%(runtime).3f secs).", runtime=results.runtime) }}
+                {{ _("No results found (%(runtime).3f secs).", runtime=results.runtime) }}
             {% endif %}
         </p>
         {% if results %}
@@ -62,7 +62,7 @@
                         {% else %}
                             <tr>
                                 <td class="moin-wordbreak">
-                                <a class="moin-interwiki" href="{{ url_for_item(item_name=result['name'], wiki_name=result['wikiname'], rev=result['revid']) }}"><b>{{ "%s:%s" % (result['wikiname'], result['name']) }}</b></a>
+                                    <a class="moin-interwiki" href="{{ url_for_item(item_name=result['name'], wiki_name=result['wikiname'], rev=result['revid']) }}"><b>{{ "%s:%s" % (result['wikiname'], result['name']) }}</b></a>
                                 </td>
                             </tr>
                         {% endif %}
--- a/MoinMoin/templates/all.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/all.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,9 +1,9 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Global Views") }}</h1>
-<ul>
-    <li><a href="{{ url_for('frontend.global_history', namespace='all') }}">{{ _("History") }}</a></li>
-    <li><a href="{{ url_for('frontend.global_tags', namespace='all') }}">{{ _("Tags") }}</a></li>
-    <li><a href="{{ url_for('frontend.index', item_name='all') }}">{{ _("Index") }}</a></li>
-</ul>
+    <h1>{{ _("Global Views") }}</h1>
+    <ul>
+        <li><a href="{{ url_for('frontend.global_history', namespace='all') }}">{{ _("History") }}</a></li>
+        <li><a href="{{ url_for('frontend.global_tags', namespace='all') }}">{{ _("Tags") }}</a></li>
+        <li><a href="{{ url_for('frontend.index', item_name='all') }}">{{ _("Index") }}</a></li>
+    </ul>
 {% endblock %}
--- a/MoinMoin/templates/base.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/base.html	Sun Aug 24 08:39:32 2014 -0700
@@ -11,84 +11,84 @@
 {% endif %}
 
 <html>
-<head>
-{% block head %}
-    {% block head_meta %}
-    <meta charset="utf-8" />{# must be at the beginning #}
-    {% if pi_refresh -%}
-        {{ '<meta http-equiv="refresh" content="%d;URL=%s" />' % pi_refresh }}
-    {%- endif %}
-    {% for name, content in theme_supp.meta_items -%}
-        <meta name="{{ name }}" content="{{ content }}" />
-    {% endfor %}
-    {% endblock %}
-
-    {{ head }}
+    <head>
+        {% block head %}
+            {% block head_meta %}
+                <meta charset="utf-8" />{# must be at the beginning #}
+                {% if pi_refresh -%}
+                    {{ '<meta http-equiv="refresh" content="%d;URL=%s" />' % pi_refresh }}
+                {%- endif %}
+                {% for name, content in theme_supp.meta_items -%}
+                    <meta name="{{ name }}" content="{{ content }}" />
+                {% endfor %}
+            {% endblock %}
 
-    {% block head_title %}
-    <title>
-        {%- if title -%}
-            {{ title }}
-        {% elif title_name %}
-            {{ title_name }}
-        {% elif headline %}
-            {{ headline }}
-        {% else %}
-            {{ item_name }}
-        {%- endif %} -
-    {%- if cfg.html_pagetitle -%} {{ cfg.html_pagetitle }}{% else %} {{ cfg.sitename }}{%- endif -%}
-    </title>
-    {% endblock %}
-
-    {% block head_links %}
+            {{ head }}
 
-    {% block bootstrap_stylesheet %}
-    {% endblock %}
-
-    {% block icons_stylesheet %}
-    <link rel="stylesheet" href="{{ url_for('serve.files', name='font_awesome', filename='css/font-awesome.css') }}" />
-    {% endblock %}
-
-    <link rel="shortcut icon" href="{{ url_for('static', filename='logos/favicon.ico') }}" />
+            {% block head_title %}
+                <title>
+                    {%- if title -%}
+                        {{ title }}
+                    {% elif title_name %}
+                        {{ title_name }}
+                    {% elif headline %}
+                        {{ headline }}
+                    {% else %}
+                        {{ item_name }}
+                    {%- endif %} -
+                    {%- if cfg.html_pagetitle -%} {{ cfg.html_pagetitle }}{% else %} {{ cfg.sitename }}{%- endif -%}
+                </title>
+            {% endblock %}
 
-    {% block theme_stylesheets %}
-    <link media="all" rel="stylesheet" href="{{ theme_static('css/theme.css') }}" />
-    <link media="all" rel="stylesheet" href="{{ url_for('static', filename='css/common.css') }}" />
-    {% endblock %}
-    {{ stylesheets }}
-    {% if user.valid and user.css_url -%}
-        <link media="all" rel="stylesheet" title="{{ user.name }}'s stylesheet" href="{{ user.css_url }}" />
-    {%- endif %}
-    {% endblock %}
+            {% block head_links %}
+
+                {% block bootstrap_stylesheet %}
+                {% endblock %}
+
+                {% block icons_stylesheet %}
+                    <link rel="stylesheet" href="{{ url_for('serve.files', name='font_awesome', filename='css/font-awesome.css') }}" />
+                {% endblock %}
+
+                <link rel="shortcut icon" href="{{ url_for('static', filename='logos/favicon.ico') }}" />
+
+                {% block theme_stylesheets %}
+                    <link media="all" rel="stylesheet" href="{{ theme_static('css/theme.css') }}" />
+                    <link media="all" rel="stylesheet" href="{{ url_for('static', filename='css/common.css') }}" />
+                {% endblock %}
+                {{ stylesheets }}
+                {% if user.valid and user.css_url -%}
+                    <link media="all" rel="stylesheet" title="{{ user.name }}'s stylesheet" href="{{ user.css_url }}" />
+                {%- endif %}
+            {% endblock %}
 
 
-{% endblock %}
-</head>
-<body{% if body_onload %} onload="{{ body_onload }}"{% endif %} lang="{{ theme_supp.ui_lang }}" dir="{{ theme_supp.ui_dir }}">
-{% block layout %}
-    <h1>Extend this block only if you want to change layout. If you want to put content, extends layout.html and use placeholders item and content.</h1>
-{% endblock %}
-
-<div id="moin-options-for-javascript" style="display: none">
-{% block options_for_javascript %}
-    {# implement this block to pass server side options to client side javascript. #}
-{% endblock %}
-</div>
+        {% endblock %}
+    </head>
+    <body{% if body_onload %} onload="{{ body_onload }}"{% endif %} lang="{{ theme_supp.ui_lang }}" dir="{{ theme_supp.ui_dir }}">
+        {% block layout %}
+            <h1>Extend this block only if you want to change layout. If you want to put content, extends layout.html and use placeholders item and content.</h1>
+        {% endblock %}
 
-{% block body_scripts %} {# js before </body> reduces IE8 js errors related to svgweb #}
-    <script src="{{ url_for('serve.files', name='jquery', filename='jquery.min.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/jquery.i18n.min.js') }}"></script>
-    <script src="{{ url_for('frontend.template', filename='dictionary.js') }}"></script>
-    <script src="{{ url_for('serve.files', name='bootstrap', filename='js/bootstrap.min.js') }}"></script>
-    <script src="{{ url_for('serve.files', name='autosize', filename='jquery.autosize-min.js') }}"></script>
-    <script src="{{ url_for('serve.files', name='jquery_tablesorter', filename='jquery.tablesorter.js') }}"></script>
-    <script src="{{ url_for('static', filename='js/common.js') }}"></script>
-    {{ scripts }}
-    <!--[if lt IE 9]>
-        {# TODO: use a local copy later #}
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-{% endblock %}
+        <div id="moin-options-for-javascript" style="display: none">
+            {% block options_for_javascript %}
+                {# implement this block to pass server side options to client side javascript. #}
+            {% endblock %}
+        </div>
 
-</body>
+        {% block body_scripts %} {# js before </body> reduces IE8 js errors related to svgweb #}
+            <script src="{{ url_for('serve.files', name='jquery', filename='jquery.min.js') }}"></script>
+            <script src="{{ url_for('static', filename='js/jquery.i18n.min.js') }}"></script>
+            <script src="{{ url_for('frontend.template', filename='dictionary.js') }}"></script>
+            <script src="{{ url_for('serve.files', name='bootstrap', filename='js/bootstrap.min.js') }}"></script>
+            <script src="{{ url_for('serve.files', name='autosize', filename='jquery.autosize-min.js') }}"></script>
+            <script src="{{ url_for('serve.files', name='jquery_tablesorter', filename='jquery.tablesorter.js') }}"></script>
+            <script src="{{ url_for('static', filename='js/common.js') }}"></script>
+            {{ scripts }}
+            <!--[if lt IE 9]>
+                {# TODO: use a local copy later #}
+                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+            <![endif]-->
+        {% endblock %}
+
+    </body>
 </html>
--- a/MoinMoin/templates/blog/layout.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/blog/layout.html	Sun Aug 24 08:39:32 2014 -0700
@@ -39,7 +39,7 @@
 
             <div id="moin-blog-body">
                 <div id="moin-blog-content">
-                {% block blog_content %}<br />{% endblock %}
+                    {% block blog_content %}<br />{% endblock %}
                 </div>
                 {% if blog_name and supertags %}
                     <div id="moin-blog-sidebar">
--- a/MoinMoin/templates/content.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/content.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block layout %}
-{% if data_rendered %}
-    <div id="moin-content-data">
-    {{ data_rendered }}
-    <div>
-{% endif %}
+    {% if data_rendered %}
+        <div id="moin-content-data">
+            {{ data_rendered }}
+        </div>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/delete.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/delete.html	Sun Aug 24 08:39:32 2014 -0700
@@ -4,15 +4,15 @@
 {% set title = _("Delete '%(item_name)s'", item_name=fqname.value) %}
 
 {% block content %}
-<h1>{{ title }}</h1>
-<div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=fqname)) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['comment']) }}
-    {{ forms.render_textcha(gen, form) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+    <h1>{{ title }}</h1>
+    <div class="moin-form">
+        {{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=fqname)) }}
+            {{ forms.render_errors(form) }}
+            <dl>
+                {{ forms.render(form['comment']) }}
+                {{ forms.render_textcha(gen, form) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/destroy.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/destroy.html	Sun Aug 24 08:39:32 2014 -0700
@@ -4,29 +4,29 @@
 {% set title = _("DESTROY COMPLETE ITEM '%(item_name)s'", item_name=fqname.value) %}
 
 {% block content %}
-{% if rev_id == None %}
-    <h1>{{ title }}</h1>
-    <div class="moin-form">
-    {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=fqname.fullname)) }}
-      {{ forms.render_errors(form) }}
-      <dl>
-        {{ forms.render(form['comment']) }}
-        {{ forms.render_textcha(gen, form) }}
-      </dl>
-      {{ forms.render_submit(form) }}
-    {{ gen.form.close() }}
-    </div>
-{% else %}
-    <h1>{{ _("DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)", item_name=item.name, rev_id=rev_id | shorten_id) }}</h1>
-    <div class="moin-form">
-    {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=fqname.fullname, rev=rev_id)) }}
-      {{ forms.render_errors(form) }}
-      <dl>
-        {{ forms.render(form['comment']) }}
-        {{ forms.render_textcha(gen, form) }}
-      </dl>
-      {{ forms.render_submit(form) }}
-    {{ gen.form.close() }}
-    </div>
-{% endif %}
+    {% if rev_id == None %}
+        <h1>{{ title }}</h1>
+        <div class="moin-form">
+            {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=fqname.fullname)) }}
+                {{ forms.render_errors(form) }}
+                <dl>
+                    {{ forms.render(form['comment']) }}
+                    {{ forms.render_textcha(gen, form) }}
+                </dl>
+                {{ forms.render_submit(form) }}
+            {{ gen.form.close() }}
+        </div>
+    {% else %}
+        <h1>{{ _("DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)", item_name=item.name, rev_id=rev_id | shorten_id) }}</h1>
+        <div class="moin-form">
+            {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=fqname.fullname, rev=rev_id)) }}
+                {{ forms.render_errors(form) }}
+                <dl>
+                    {{ forms.render(form['comment']) }}
+                    {{ forms.render_textcha(gen, form) }}
+                </dl>
+                {{ forms.render_submit(form) }}
+            {{ gen.form.close() }}
+        </div>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/diff.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/diff.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,8 +1,8 @@
 {% extends theme("show.html") %}
 {% block content %}
-{% block headline %}
-<h1>{{ _("Diff for '%(item_name)s'", item_name=newrev.item.name) }}</h1>
-<br>
+    {% block headline %}
+        <h1>{{ _("Diff for '%(item_name)s'", item_name=newrev.item.name) }}</h1>
+        <br>
+    {% endblock %}
+    {{ diff_html }}
 {% endblock %}
-{{ diff_html }}
-{% endblock %}
--- a/MoinMoin/templates/error.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/error.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,5 +1,5 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ title }}</h1>
-<p>{{ description }}</p>
+    <h1>{{ title }}</h1>
+    <p>{{ description }}</p>
 {% endblock %}
--- a/MoinMoin/templates/forms.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/forms.html	Sun Aug 24 08:39:32 2014 -0700
@@ -25,16 +25,16 @@
 
 {% macro render_textcha(gen, form) %}
     {% if form.textcha_question.value %}
-    <dt class="moin-textcha">
-        {{ gen.label(form.textcha) }}
-    </dt>
-    <dd class="moin-textcha">
-        {# The value of -51 below is the sum of signature length, timestamp and a space (see security/textcha.py) #}
-        {{ form.textcha_question.value[:-51] }}
-        {{ gen.input(form.textcha_question, type='hidden') }}<br />
-        {{ gen.input(form.textcha) }}
-        {{ render_errors(form.textcha) }}
-    </dd>
+        <dt class="moin-textcha">
+            {{ gen.label(form.textcha) }}
+        </dt>
+        <dd class="moin-textcha">
+            {# The value of -51 below is the sum of signature length, timestamp and a space (see security/textcha.py) #}
+            {{ form.textcha_question.value[:-51] }}
+            {{ gen.input(form.textcha_question, type='hidden') }}<br />
+            {{ gen.input(form.textcha) }}
+            {{ render_errors(form.textcha) }}
+        </dd>
     {% endif %}
 {% endmacro %}
 
@@ -213,11 +213,11 @@
 {% macro render_file_uploader(submit_url) %} {# pages that use this macro must also use file_uploader_scripts macro below #}
     <div id="file_upload">
         <div class="upload-form">
-        <form action="{{ submit_url }}" method="POST" enctype="multipart/form-data" class="upload_file">
-            <input type="file" name="data_file" multiple>
-            <button type="submit">{{ _("Upload") }}</button>
-            <div class="file_upload_label" style="margin: 0;">{{ _("Upload files") }}</div>
-        </form>
+            <form action="{{ submit_url }}" method="POST" enctype="multipart/form-data" class="upload_file">
+                <input type="file" name="data_file" multiple>
+                <button type="submit">{{ _("Upload") }}</button>
+                <div class="file_upload_label" style="margin: 0;">{{ _("Upload files") }}</div>
+            </form>
         </div>
         <div class="file_upload_overall_progress"><div style="display:none;"></div></div>
         <div class="file_upload_buttons">
--- a/MoinMoin/templates/global_history.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/global_history.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,13 +2,13 @@
 {% import "utils.html" as utils %}
 
 {% block head %}
-{{ super() }}
-<link rel="alternate" title="Global History" href="{{ url_for('feed.atom') }}" type="application/atom+xml" />
+    {{ super() }}
+    <link rel="alternate" title="Global History" href="{{ url_for('feed.atom') }}" type="application/atom+xml" />
 {% endblock %}
 
 {% block content %}
-<h1>{{ _("Global History") }}</h1>
-<div class='moin-clr'></div>
+    <h1>{{ _("Global History") }}</h1>
+    <div class='moin-clr'></div>
     <div id="moin-global-history">
         {% for day, revs in history %}
            {% set latest_timestamp = revs[0].meta['mtime'] %}
@@ -16,48 +16,48 @@
                 <div class="moin-history-container-header">
                     <h2>{{ day }}</h2>
                     {% if user.valid %}
-                    <a class="bookmark-link btn btn-primary" href="{{ url_for('frontend.bookmark', time=latest_timestamp+1) }}">{{ _("Set bookmark") }}</a>
+                        <a class="bookmark-link btn btn-primary" href="{{ url_for('frontend.bookmark', time=latest_timestamp+1) }}">{{ _("Set bookmark") }}</a>
                     {% endif %}
                 </div>
                 <div class="moin-history-container-body">
                     <table class="zebra table table-hover">
-                    {% for rev in revs %}
-                        {% set meta = rev.meta %}
-                        <tr>
-                            <td class="moin-action col-md-1">
-                                <span title="{{ meta.action|title }}" class="moin-history-{{ meta.action|lower }}"></span>
-                            </td>
-                            <td class="moin-history-links col-md-1">
-                                <a href="{{ url_for('frontend.history', item_name=rev.fqname, bookmark=bookmark_time) }}">HIST</a>
-                                {% if bookmark_time -%}
-                                    <a href="{{ url_for('frontend.diff', item_name=rev.fqname, bookmark=bookmark_time) }}">DIFF</a>
-                                {%- endif %}
-                            </td>
-                            <td class="moin-history-time col-md-1">{{ meta.mtime|timeformat }}</td>
-                            <td class="moin-history-item col-md-7">
-                                <a class="{{ meta.contenttype|contenttype_to_class }}" href="{{ url_for('frontend.show_item', item_name=rev.fqname) }}" title="{{ meta.contenttype }}">
-                                    {% if meta.name %}
-                                        {{ meta.name|join(' | ') }}
-                                    {% elif meta.summary %}
-                                        {{ meta.summary }}
-                                    {% else %}
-                                        {{ rev.fqname|shorten_fqname }}
-                                    {% endif %}
-                                </a>
-                            </td>
-                        </tr>
-                    {% endfor %}
+                        {% for rev in revs %}
+                            {% set meta = rev.meta %}
+                            <tr>
+                                <td class="moin-action col-md-1">
+                                    <span title="{{ meta.action|title }}" class="moin-history-{{ meta.action|lower }}"></span>
+                                </td>
+                                <td class="moin-history-links col-md-1">
+                                    <a href="{{ url_for('frontend.history', item_name=rev.fqname, bookmark=bookmark_time) }}">HIST</a>
+                                    {% if bookmark_time -%}
+                                        <a href="{{ url_for('frontend.diff', item_name=rev.fqname, bookmark=bookmark_time) }}">DIFF</a>
+                                    {%- endif %}
+                                </td>
+                                <td class="moin-history-time col-md-1">{{ meta.mtime|timeformat }}</td>
+                                <td class="moin-history-item col-md-7">
+                                    <a class="{{ meta.contenttype|contenttype_to_class }}" href="{{ url_for('frontend.show_item', item_name=rev.fqname) }}" title="{{ meta.contenttype }}">
+                                        {% if meta.name %}
+                                            {{ meta.name|join(' | ') }}
+                                        {% elif meta.summary %}
+                                            {{ meta.summary }}
+                                        {% else %}
+                                            {{ rev.fqname|shorten_fqname }}
+                                        {% endif %}
+                                    </a>
+                                </td>
+                            </tr>
+                        {% endfor %}
                     </table>
                 </div>
             </div>
         {% endfor %}
         {% if bookmark_time %}
-        <div class="moin-history-container">
-            <div class="moin-history-container-header">
-                <h2>{{ bookmark_time|datetimeformat }}</h2>
-                <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
+            <div class="moin-history-container">
+                <div class="moin-history-container-header">
+                    <h2>{{ bookmark_time|datetimeformat }}</h2>
+                    <a class="bookmark-link" href="{{ url_for('frontend.bookmark', time='del') }}">{{ _("Delete bookmark") }}</a>
+                </div>
             </div>
-        </div>
         {% endif %}
     </div>
 {% endblock %}
--- a/MoinMoin/templates/global_tags.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/global_tags.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,13 +1,13 @@
 {% extends theme("layout.html") %}
 {% block content %}
-{% if headline %}
-<h1>{{ headline }}</h1>
-{% endif %}
-{% if tags %}
-<ul class="moin-tags three-col">
-    {% for cls, tag in tags %}
-    <li class="{{ cls }}"><a href="{{ url_for('frontend.tagged_items', tag=tag, namespace=fqname.namespace) }}">{{ tag }}</a></li>
-    {% endfor %}
-</ul>
-{% endif %}
+    {% if headline %}
+        <h1>{{ headline }}</h1>
+    {% endif %}
+    {% if tags %}
+        <ul class="moin-tags three-col">
+            {% for cls, tag in tags %}
+                <li class="{{ cls }}"><a href="{{ url_for('frontend.tagged_items', tag=tag, namespace=fqname.namespace) }}">{{ tag }}</a></li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/highlight.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/highlight.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,8 +3,8 @@
 {% set title = _("Syntax highlighting of '%(name)s'", name=item_name) %}
 
 {% block content %}
-{% block headline %}
-<h1>{{ title }} </h1>
+    {% block headline %}
+        <h1>{{ title }} </h1>
+    {% endblock %}
+    {{ data_text }}
 {% endblock %}
-{{ data_text }}
-{% endblock %}
--- a/MoinMoin/templates/history.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/history.html	Sun Aug 24 08:39:32 2014 -0700
@@ -6,88 +6,88 @@
 {% block content %}
     {% set (history, next_offset, previous_offset) = history_page %}
     {% if history %}
-    <div class='moin-offset-links'>
-        {% if previous_offset >= 0 %}
-            <a href="{{ url_for('frontend.history', item_name=item_name, offset=previous_offset) }}" title="{{ _("Previous") }}">&laquo;</a>
-        {% endif %}
-        {% if next_offset %}
-            <a href="{{ url_for('frontend.history', item_name=item_name, offset=next_offset) }}" title="{{ _("Next") }}">&raquo;</a>
-        {% endif %}
-    </div>
-    <h1>{{ title }}</h1>
-    <div class="moin-clr"></div>
-    <form action="{{ url_for('frontend.diff', item_name=item_name) }}" method="GET">
-        <div id="moin-page-history">
-        <table class="zebra">
-            <thead>
-                <tr>
-                    {% if fqname.field == 'name_exact' %}
-                        <th>{{ _("Item ID") }}</th>
-                    {% else %}
-                        <th>{{ _("Name") }}</th>
-                    {% endif %}
+        <div class='moin-offset-links'>
+            {% if previous_offset >= 0 %}
+                <a href="{{ url_for('frontend.history', item_name=item_name, offset=previous_offset) }}" title="{{ _("Previous") }}">&laquo;</a>
+            {% endif %}
+            {% if next_offset %}
+                <a href="{{ url_for('frontend.history', item_name=item_name, offset=next_offset) }}" title="{{ _("Next") }}">&raquo;</a>
+            {% endif %}
+        </div>
+        <h1>{{ title }}</h1>
+        <div class="moin-clr"></div>
+        <form action="{{ url_for('frontend.diff', item_name=item_name) }}" method="GET">
+            <div id="moin-page-history">
+                <table class="zebra">
+                    <thead>
+                        <tr>
+                            {% if fqname.field == 'name_exact' %}
+                                <th>{{ _("Item ID") }}</th>
+                            {% else %}
+                                <th>{{ _("Name") }}</th>
+                            {% endif %}
 
-                    <th>{{ _("Rev.") }}</th>
-                    <th>{{ _("Timestamp") }}</th>
-                    <th class="moin-integer">{{ _("Size") }}</th>
-                    <th><input type="submit" value="Diff" /></th>
-                    <th>{{ _("Editor") }}</th>
-                    <th>{{ _("Content-Type") }}</th>
-                    <th>{{ _("Comment") }}</th>
-                    <th colspan="6">{{ _("Actions") }}</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for doc in history %}
-                <tr>
-                    {% if fqname.field == 'name_exact' %}
-                        <td class="moin-wordbreak">
-                            <a href="{{ url_for_item(doc.itemid, field='itemid', namespace=fqname.namespace, endpoint='frontend.history') }}">{{ doc.itemid|shorten_id }}</a>
-                        </td>
-                    {% else %}
-                        <td class="moin-wordbreak">
-                            {% for name in doc.name %}
-                                {% if not loop.first %}|{% endif %}
-                                <a href="{{ url_for_item(name, namespace=fqname.namespace, endpoint='frontend.history') }}">{{ name }}</a>
-                            {% endfor %}
-                        </td>
+                            <th>{{ _("Rev.") }}</th>
+                            <th>{{ _("Timestamp") }}</th>
+                            <th class="moin-integer">{{ _("Size") }}</th>
+                            <th><input type="submit" value="Diff" /></th>
+                            <th>{{ _("Editor") }}</th>
+                            <th>{{ _("Content-Type") }}</th>
+                            <th>{{ _("Comment") }}</th>
+                            <th colspan="6">{{ _("Actions") }}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for doc in history %}
+                            <tr>
+                                {% if fqname.field == 'name_exact' %}
+                                    <td class="moin-wordbreak">
+                                        <a href="{{ url_for_item(doc.itemid, field='itemid', namespace=fqname.namespace, endpoint='frontend.history') }}">{{ doc.itemid|shorten_id }}</a>
+                                    </td>
+                                {% else %}
+                                    <td class="moin-wordbreak">
+                                        {% for name in doc.name %}
+                                            {% if not loop.first %}|{% endif %}
+                                            <a href="{{ url_for_item(name, namespace=fqname.namespace, endpoint='frontend.history') }}">{{ name }}</a>
+                                        {% endfor %}
+                                    </td>
+                                {% endif %}
+                                <td>{{ doc.revid|shorten_id }}</td>
+                                <td>{{ doc.mtime|datetimeformat }}</td>
+                                <td class="moin-integer">{{ doc.size }}</td>
+                                <td>
+                                    <div class="moin-hist-rev">
+                                        <input type="radio" name="rev1" value="{{ doc.revid }}" />
+                                        <input type="radio" name="rev2" value="{{ doc.revid }}" />
+                                    </div>
+                                </td>
+                                <td class="moin-wordbreak">{{ utils.editor_info(doc) }}</td>
+                                <td class="moin-wordbreak">{{ doc.contenttype }}</td>
+                                <td class="moin-wordbreak">{{ doc.comment }}</td>
+                                <td><a href="{{ url_for('frontend.show_item', item_name=fqname, rev=doc.revid) }}">{{ _('show') }}</a></td>
+                                <td><a href="{{ url_for('frontend.show_item_meta', item_name=fqname, rev=doc.revid) }}">{{ _('meta') }}</a></td>
+                                <td><a href="{{ url_for('frontend.download_item', item_name=fqname, rev=doc.revid) }}">{{ _('download') }}</a></td>
+                                <td><a href="{{ url_for('frontend.highlight_item', item_name=fqname, rev=doc.revid) }}">{{ _('highlight') }}</a></td>
+                                {% if user.may.write(fqname) -%}
+                                    <td><a href="{{ url_for('frontend.revert_item', item_name=fqname, rev=doc.revid) }}">{{ _('revert') }}</a></td>
+                                {%- endif %}
+                                {% if user.may.destroy(fqname) -%}
+                                    <td><a href="{{ url_for('frontend.destroy_item', item_name=fqname, rev=doc.revid) }}">{{ _('destroy') }}</a></td>
+                                {%- endif %}
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                    {% if bookmark_time %}
+                        <tfoot>
+                            <tr>
+                                <td colspan="2">Bookmark is set to</td>
+                                <td>{{ bookmark_time|datetimeformat }}</td>
+                                <td colspan="11"></td>
+                            </tr>
+                        </tfoot>
                     {% endif %}
-                    <td>{{ doc.revid|shorten_id }}</td>
-                    <td>{{ doc.mtime|datetimeformat }}</td>
-                    <td class="moin-integer">{{ doc.size }}</td>
-                    <td>
-                        <div class="moin-hist-rev">
-                            <input type="radio" name="rev1" value="{{ doc.revid }}" />
-                            <input type="radio" name="rev2" value="{{ doc.revid }}" />
-                        </div>
-                    </td>
-                    <td class="moin-wordbreak">{{ utils.editor_info(doc) }}</td>
-                    <td class="moin-wordbreak">{{ doc.contenttype }}</td>
-                    <td class="moin-wordbreak">{{ doc.comment }}</td>
-                    <td><a href="{{ url_for('frontend.show_item', item_name=fqname, rev=doc.revid) }}">{{ _('show') }}</a></td>
-                    <td><a href="{{ url_for('frontend.show_item_meta', item_name=fqname, rev=doc.revid) }}">{{ _('meta') }}</a></td>
-                    <td><a href="{{ url_for('frontend.download_item', item_name=fqname, rev=doc.revid) }}">{{ _('download') }}</a></td>
-                    <td><a href="{{ url_for('frontend.highlight_item', item_name=fqname, rev=doc.revid) }}">{{ _('highlight') }}</a></td>
-                    {% if user.may.write(fqname) -%}
-                        <td><a href="{{ url_for('frontend.revert_item', item_name=fqname, rev=doc.revid) }}">{{ _('revert') }}</a></td>
-                    {%- endif %}
-                    {% if user.may.destroy(fqname) -%}
-                        <td><a href="{{ url_for('frontend.destroy_item', item_name=fqname, rev=doc.revid) }}">{{ _('destroy') }}</a></td>
-                    {%- endif %}
-                </tr>
-                {% endfor %}
-            </tbody>
-            {% if bookmark_time %}
-            <tfoot>
-                <tr>
-                    <td colspan="2">Bookmark is set to</td>
-                    <td>{{ bookmark_time|datetimeformat }}</td>
-                    <td colspan="11"></td>
-                </tr>
-            </tfoot>
-            {% endif %}
-        </table>
-        </div>
+                </table>
+            </div>
         </form>
     {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/index.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/index.html	Sun Aug 24 08:39:32 2014 -0700
@@ -10,50 +10,50 @@
 {% block action_bars_inner %}
     <ul>
         {% if dirs or files %}
-        <li class="action-bar">
-        <div class="moin-select-all">
-            <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
-        </div>
-        </li>
+            <li class="action-bar">
+                <div class="moin-select-all">
+                    <span class="moin-select-allitem allitem-toselect" title="{{ _("Select All") }}">{{ _("Select All") }}</span>
+                </div>
+            </li>
         {% endif %}
         <li class="action-bar">
-        <div class="moin-select-actions">
-            <div>
-                <span class="show-action">Actions</span>
+            <div class="moin-select-actions">
+                <div>
+                    <span class="show-action">Actions</span>
+                </div>
+                <ul>
+                    <li id="moin-create-newitem">{{ _("New item") }}</li>
+                    {% if dirs or files %}
+                        <li id="moin-download-trigger">{{ _("Download") }}</li>
+                        <li class="moin-action-tab"
+                            id="moin-delete-trigger"
+                            data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
+                            {{ _("Delete") }}
+                        </li>
+                        <li class="moin-action-tab"
+                            id="moin-destroy-trigger"
+                            data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
+                            {{ _("Destroy") }}
+                        </li>
+                    {% endif %}
+                </ul>
             </div>
-            <ul>
-                <li id="moin-create-newitem">{{ _("New item") }}</li>
-                {% if dirs or files %}
-                <li id="moin-download-trigger">{{ _("Download") }}</li>
-                <li class="moin-action-tab"
-                    id="moin-delete-trigger"
-                    data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}">
-                    {{ _("Delete") }}
-                </li>
-                <li class="moin-action-tab"
-                    id="moin-destroy-trigger"
-                    data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}">
-                    {{ _("Destroy") }}
-                </li>
-                {% endif %}
-            </ul>
-        </div>
         </li>
         <li class="action-bar">
-        <div class="moin-contenttypes-wrapper">
-            <div class="ct-hide">{{ _("Filter by content type") }}</div>
-            {% set unknown_items_label = _("items having unknown mime types") %}
-            {{ gen.form.open(form, method="get", action=url_for('frontend.index', item_name=item_name)) }}
-            <ul>
-                <li>
-                    <a href="#" class="filter-toggle">&raquo; {{ _("Toggle") }}</a>
-                    <a href="#" class="filter-more">&raquo; {{ _("More") }}</a>
-                </li>
-                {{ forms.render(form['contenttype']) }}
-            </ul>
-            {{ forms.render_submit(form) }}
-            {{ gen.form.close() }}
-        </div>
+            <div class="moin-contenttypes-wrapper">
+                <div class="ct-hide">{{ _("Filter by content type") }}</div>
+                {% set unknown_items_label = _("items having unknown mime types") %}
+                {{ gen.form.open(form, method="get", action=url_for('frontend.index', item_name=item_name)) }}
+                    <ul>
+                        <li>
+                            <a href="#" class="filter-toggle">&raquo; {{ _("Toggle") }}</a>
+                            <a href="#" class="filter-more">&raquo; {{ _("More") }}</a>
+                        </li>
+                        {{ forms.render(form['contenttype']) }}
+                    </ul>
+                    {{ forms.render_submit(form) }}
+                {{ gen.form.close() }}
+            </div>
         </li>
     </ul>
 {% endblock %}
@@ -114,25 +114,25 @@
     <div class="moin-index-message"><span></span></div>
     {{ self.action_bars() }}
     <div>
-    {% if item_name: %}
-        <h1>{{ title }}</h1>
-        <div class="moin-index-path">
-            <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
-            <span class="moin-path-separator">{{ ("/") }}</span>
-            {% for i in range(0, item_names|count) %}
-                {% set fullname = item_names[:i+1]|join('/') %}
-                {% set relname = item_names[i] %}
-                {% if relname.startswith('@') %}
-                    {{ relname }}
-                {% else %}
-                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
-                {% endif %}
+        {% if item_name: %}
+            <h1>{{ title }}</h1>
+            <div class="moin-index-path">
+                <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
                 <span class="moin-path-separator">{{ ("/") }}</span>
-            {% endfor %}
-        </div>
-    {% else %}
-        <h1>{{ title }}</h1>
-    {% endif %}
+                {% for i in range(0, item_names|count) %}
+                    {% set fullname = item_names[:i+1]|join('/') %}
+                    {% set relname = item_names[i] %}
+                    {% if relname.startswith('@') %}
+                        {{ relname }}
+                    {% else %}
+                        <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
+                    {% endif %}
+                    <span class="moin-path-separator">{{ ("/") }}</span>
+                {% endfor %}
+            </div>
+        {% else %}
+            <h1>{{ title }}</h1>
+        {% endif %}
     </div>
     <div class='moin-clr'></div>
     <div id="moin-new-index" class="moin-item-index">
@@ -143,38 +143,38 @@
     </div>
     <div class="moin-index-separator"></div>
     {% if files or dirs %}
-    <div id="moin-initials">
-        {% if not startswith %}
-            <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
-        {% else %}
-            <a href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
-        {% endif %}
-        {% for initial in initials %}
-            {% if startswith == initial %}
-                <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+        <div id="moin-initials">
+            {% if not startswith %}
+                <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
             {% else %}
-                <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                <a href="{{ url_for('frontend.index', item_name=item_name) }}">{{ _("All") }}</a>
             {% endif %}
-        {% endfor %}
-    </div>
-    {% if dirs %}
-        <div class="moin-item-index">
-            <p>{{ _("These items have subitems that match your filter:") }}</p>
-            {% for e in dirs %}
-                {{ render_dir_entry(e) }}
+            {% for initial in initials %}
+                {% if startswith == initial %}
+                    <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                {% else %}
+                    <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                {% endif %}
             {% endfor %}
         </div>
-        <div class="moin-clr"></div>
-        <hr />
-    {% endif %}
-    {% if files %}
-        <div class="moin-item-index">
-            {% for e in files %}
-                {{ render_file_entry(e) }}
-            {% endfor %}
-        </div>
-        <div class="moin-clr"></div>
-    {% endif %}
+        {% if dirs %}
+            <div class="moin-item-index">
+                <p>{{ _("These items have subitems that match your filter:") }}</p>
+                {% for e in dirs %}
+                    {{ render_dir_entry(e) }}
+                {% endfor %}
+            </div>
+            <div class="moin-clr"></div>
+            <hr />
+        {% endif %}
+        {% if files %}
+            <div class="moin-item-index">
+                {% for e in files %}
+                    {{ render_file_entry(e) }}
+                {% endfor %}
+            </div>
+            <div class="moin-clr"></div>
+        {% endif %}
     {% endif %}
     <div id="popup">
         <div id="popup-for-action" class="popup-container">
@@ -212,15 +212,15 @@
     </div>
 
     <div id="moin-upload-cont">
-    {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
-    {{ forms.render_file_uploader(submit_url) }}
+        {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
+        {{ forms.render_file_uploader(submit_url) }}
     </div>
     <span class="moin-drag">{{ _("(Drag and drop multiple files to this white area to upload them.)") }}</span>
     <div id="lightbox">&nbsp;</div>
 {% endblock %}
 
 {% block body_scripts %}
-{{ super() }}
+    {{ super() }}
     <script src="{{ url_for('static', filename='js/index_action.js') }}"></script>
     <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
     {{ forms.file_uploader_scripts() }}
--- a/MoinMoin/templates/itemviews.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/itemviews.html	Sun Aug 24 08:39:32 2014 -0700
@@ -73,7 +73,7 @@
 
         {% if endpoint == 'special.transclusions' -%}
             <li class="moin-transclusions-button" style="display:none;">
-            <a href="#" title="{{ title }}">{{ label }}</a>
+                <a href="#" title="{{ title }}">{{ label }}</a>
             </li>
         {%- endif %}
             {%- if endpoint == 'special.supplementation' and fqname %}
--- a/MoinMoin/templates/layout.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/layout.html	Sun Aug 24 08:39:32 2014 -0700
@@ -12,174 +12,174 @@
 
 {% block layout %}
 
-<div id="moin-main-wrapper">
-
-{{ before_header }}
-
-<div id="moin-header">
-{% block header %}
-    {% if search_form %}
-        {{ header_search(search_form) }}
-    {% endif %}
-
-    {% if logo %}
-    <div id="moin-logo">
-        <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping.get('', cfg.default_root)) }}">{{ logo }}</a>
-    </div>
-    {% endif %}
+    <div id="moin-main-wrapper">
 
-    <div id="moin-username">
-        {% if user.valid -%}
-            {% set avatar = user.avatar(20) %}
-            {% if avatar %}
-                <img id="moin-avatar" src="{{ avatar }}" />
-            {%- endif %}
-            {% if user.name -%}
-                {% set wiki_href, display_name, title, exists = theme_supp.userhome() %}
-                <a href="{{ wiki_href }}" {% if not exists %}class="moin-nonexistent"{% endif %} rel="nofollow" title="{{ title }}">
-                    {{ display_name }}
-                </a>
-                {% if 'frontend.usersettings' not in cfg.endpoints_excluded -%}
-                    <span class="sep"> | </span>
-                    <a href="{{ url_for('frontend.usersettings') }}" class="moin-usersettings" rel="nofollow">{{ _('Settings') }}</a>
+        {{ before_header }}
+
+        <div id="moin-header">
+        {% block header %}
+            {% if search_form %}
+                {{ header_search(search_form) }}
+            {% endif %}
+
+            {% if logo %}
+                <div id="moin-logo">
+                    <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping.get('', cfg.default_root)) }}">{{ logo }}</a>
+                </div>
+            {% endif %}
+
+            <div id="moin-username">
+                {% if user.valid -%}
+                    {% set avatar = user.avatar(20) %}
+                    {% if avatar %}
+                        <img id="moin-avatar" src="{{ avatar }}" />
+                    {%- endif %}
+                    {% if user.name -%}
+                        {% set wiki_href, display_name, title, exists = theme_supp.userhome() %}
+                        <a href="{{ wiki_href }}" {% if not exists %}class="moin-nonexistent"{% endif %} rel="nofollow" title="{{ title }}">
+                            {{ display_name }}
+                        </a>
+                        {% if 'frontend.usersettings' not in cfg.endpoints_excluded -%}
+                            <span class="sep"> | </span>
+                            <a href="{{ url_for('frontend.usersettings') }}" class="moin-usersettings" rel="nofollow">{{ _('Settings') }}</a>
+                        {%- endif %}
+                    {%- endif %}
+                    {% if user.auth_method in cfg.auth_can_logout %}
+                        <span class="sep"> | </span>
+                        <a href="{{ url_for('frontend.logout', logout_submit=1) }}" class="moin-logout" rel="nofollow">
+                            {{ _('Logout') }}
+                        </a>
+                    {% endif %}
+                {% else %}
+                    {% set login_url = theme_supp.login_url() %}
+                    {% if login_url %}
+                        <a href="{{ login_url }}" class="moin-login" rel="nofollow">{{ _('Login') }}</a>
+                    {% endif %}
                 {%- endif %}
-            {%- endif %}
-            {% if user.auth_method in cfg.auth_can_logout %}
-                <span class="sep"> | </span>
-                <a href="{{ url_for('frontend.logout', logout_submit=1) }}" class="moin-logout" rel="nofollow">
-                    {{ _('Logout') }}
-                </a>
-            {% endif %}
-        {% else %}
-            {% set login_url = theme_supp.login_url() %}
-            {% if login_url %}
-                <a href="{{ login_url }}" class="moin-login" rel="nofollow">{{ _('Login') }}</a>
-            {% endif %}
-        {%- endif %}
-    </div>
+            </div>
 
 
-    <div id="moin-locationline">
-        {% if cfg.show_interwiki -%}
-        <span id="moin-interwiki">
-            <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping['']) }}" rel="nofollow">
-                {% if cfg.interwikiname %}{{ cfg.interwikiname }}{% else %}Self{% endif %}
-            </a>
-            <span class="sep">: </span>
-        </span>
-        {%- endif %}
-        <div id="moin-pagelocation">
-            <div class="moin-pagepath">
-            {% block pagepath %}
-            {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(fqname) -%}
-                {% if loop.first %}
-                    <ul class="moin-bcs-item">
-                        <li>
-                            <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>{{ segment_name|shorten_fqname }}</a>
+            <div id="moin-locationline">
+                {% if cfg.show_interwiki -%}
+                    <span id="moin-interwiki">
+                        <a href="{{ url_for('frontend.show_item', item_name=cfg.root_mapping['']) }}" rel="nofollow">
+                            {% if cfg.interwikiname %}{{ cfg.interwikiname }}{% else %}Self{% endif %}
+                        </a>
+                        <span class="sep">: </span>
+                    </span>
+                {%- endif %}
+                <div id="moin-pagelocation">
+                    <div class="moin-pagepath">
+                        {% block pagepath %}
+                            {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(fqname) -%}
+                                {% if loop.first %}
+                                    <ul class="moin-bcs-item">
+                                        <li>
+                                            <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>{{ segment_name|shorten_fqname }}</a>
+                                        </li>
+                                    </ul>
+                                    <span class="sep">/</span>
+                                {% elif not loop.last %}
+                                    <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>{{ segment_name|shorten_fqname }}</a>
+                                    <span class="sep">/</span>
+                                {%- endif %}
+                                {% if loop.last %}
+                                    {% if title_name %}
+                                        {{ title_name }}
+                                    {% else %}
+                                        <ul class="moin-bcs-item">
+                                            <li><a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
+                                                {{ segment_name|shorten_fqname }}</a>
+                                                <ul class="moin-bcs-subitems">
+                                                    {% for fq_name in theme_supp.get_fqnames(segment_name) -%}
+                                                        <li><a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">{{ fq_name|shorten_fqname(length=25) }}</a></li>
+                                                    {%- endfor %}
+                                                </ul>
+                                            </li>
+                                        </ul>
+                                    {%- endif %}
+                                {%- endif %}
+                            {%- endfor %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
+
+            {% set trail_items = theme_supp.path_breadcrumbs() %}
+            {% if trail_items %}
+                <div id="moin-pagetrail">
+                    {% for wiki_name, fqname, item_href, exists, err in trail_items %}
+                        {%- if wiki_name -%}
+                            <a href="{{ item_href }}"{{ " " }}
+                               title="{{ wiki_name }}"
+                               class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
+                               {{ fqname|shorten_fqname }}
+                            </a>
+                        {%- else -%}
+                            <a href="{{ url_for('frontend.show_item', item_name=fqname) }}"{{ " " }}
+                               {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
+                               {{ fqname|shorten_fqname }}
+                            </a>
+                        {%- endif %}
+                        {% if not loop.last %}<span class="sep"> &raquo; </span>{% endif %}
+                    {% endfor %}
+                </div>
+            {% endif %}
+
+            {% set navibar_items = theme_supp.navibar(fqname) %}
+            {% if navibar_items %}
+                <ul id="moin-navibar" class="panel">
+                    {% for cls, url, text, title in navibar_items %}
+                        <li class="{{ cls }}">
+                            <a href="{{ url }}" {% if title %}title="{{ title }} : {{ url|safe }}"{% else %}"{{ url|safe }}"{% endif %}>{{ text }}</a>
                         </li>
-                    </ul>
-                    <span class="sep">/</span>
-                {% elif not loop.last %}
-                    <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>{{ segment_name|shorten_fqname }}</a>
-                    <span class="sep">/</span>
-                {%- endif %}
-                {% if loop.last %}
-                    {% if title_name %}
-                        {{ title_name }}
-                    {% else %}
-                        <ul class="moin-bcs-item">
-                            <li><a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                                {{ segment_name|shorten_fqname }}</a>
-                                <ul class="moin-bcs-subitems">
-                                    {% for fq_name in theme_supp.get_fqnames(segment_name) -%}
-                                        <li><a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">{{ fq_name|shorten_fqname(length=25) }}</a></li>
-                                    {%- endfor %}
-                                </ul>
-                            </li>
-                        </ul>
-                     {%- endif %}
-                {%- endif %}
-            {%- endfor %}
+                    {% endfor %}
+                </ul>
+            {% endif %}
+
+            <div id="moin-pageline">
+                <hr style="display:none;" />
+            </div>
+
+            {% block header_itemviews %}{% endblock %}
+
             {% endblock %}
-            </div>
         </div>
+
+        {{ after_header }}
+
+        <div id="moin-page" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
+
+            {% block item -%}
+                {# If you want itemviews in your template, extend from show.html, not from here. #}
+                <div id="moin-content">
+                    <div id="moin-flash">  {# client side javascript may add messages here #}
+                        {% for category, msg in get_flashed_messages(with_categories=true) %}
+                            <p class="moin-flash moin-flash-{{ category }}">{{ msg }}</p>
+                        {% endfor %}
+                    </div>
+                    {% block content %}
+                        {# All content templates should have implement this block. #}
+                    {% endblock %}
+                </div>
+            {%- endblock %}
+        </div>
+
+        {{ before_footer }}
+
+        <div id="moin-footer">
+            {% block footer %}
+                {% block footer_itemviews %}{% endblock %}
+                {% block footer_hr %}<hr/>{% endblock %}
+                {{ creditlogos }}
+                {% block footer_meta %}{% endblock %}
+                {% if license_info %}<p id="moin-wikilicense">{{ license_info }}</p>{% endif %}
+                {{ credits }}
+            {% endblock %}
+        </div>
+
+        {{ after_footer }}
+
     </div>
 
-    {% set trail_items = theme_supp.path_breadcrumbs() %}
-    {% if trail_items %}
-        <div id="moin-pagetrail">
-        {% for wiki_name, fqname, item_href, exists, err in trail_items %}
-            {%- if wiki_name -%}
-                <a href="{{ item_href }}"{{ " " }}
-                   title="{{ wiki_name }}"
-                   class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
-                   {{ fqname|shorten_fqname }}
-                </a>
-            {%- else -%}
-                <a href="{{ url_for('frontend.show_item', item_name=fqname) }}"{{ " " }}
-                   {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
-                   {{ fqname|shorten_fqname }}
-                </a>
-            {%- endif %}
-            {% if not loop.last %}<span class="sep"> &raquo; </span>{% endif %}
-        {% endfor %}
-        </div>
-    {% endif %}
-
-    {% set navibar_items = theme_supp.navibar(fqname) %}
-    {% if navibar_items %}
-        <ul id="moin-navibar" class="panel">
-        {% for cls, url, text, title in navibar_items %}
-            <li class="{{ cls }}">
-                <a href="{{ url }}" {% if title %}title="{{ title }} : {{ url|safe }}"{% else %}"{{ url|safe }}"{% endif %}>{{ text }}</a>
-            </li>
-        {% endfor %}
-        </ul>
-    {% endif %}
-
-    <div id="moin-pageline">
-        <hr style="display:none;" />
-    </div>
-
-    {% block header_itemviews %}{% endblock %}
-
 {% endblock %}
-</div>
-
-{{ after_header }}
-
-<div id="moin-page" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
-
-    {% block item -%}
-        {# If you want itemviews in your template, extend from show.html, not from here. #}
-        <div id="moin-content">
-            <div id="moin-flash">  {# client side javascript may add messages here #}
-            {% for category, msg in get_flashed_messages(with_categories=true) %}
-            <p class="moin-flash moin-flash-{{ category }}">{{ msg }}</p>
-            {% endfor %}
-            </div>
-        {% block content %}
-            {# All content templates should have implement this block. #}
-        {% endblock %}
-        </div>
-    {%- endblock %}
-</div>
-
-{{ before_footer }}
-
-<div id="moin-footer">
-{% block footer %}
-    {% block footer_itemviews %}{% endblock %}
-    {% block footer_hr %}<hr/>{% endblock %}
-    {{ creditlogos }}
-    {% block footer_meta %}{% endblock %}
-    {% if license_info %}<p id="moin-wikilicense">{{ license_info }}</p>{% endif %}
-    {{ credits }}
-{% endblock %}
-</div>
-
-{{ after_footer }}
-
-</div>
-
-{% endblock %}
--- a/MoinMoin/templates/link_list_item_panel.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/link_list_item_panel.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,14 +1,14 @@
 {% extends theme("show.html") %}
 {% block content %}
-{% if headline %}
-<h1>{{ headline }}</h1>
-{% endif %}
-{% if fq_names %}
-Total: {{ fq_names|count }}
-<ul>
-    {% for fq_name in fq_names|sort(attribute='value') %}
-        <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
-    {% endfor %}
-</ul>
-{% endif %}
+    {% if headline %}
+        <h1>{{ headline }}</h1>
+    {% endif %}
+    {% if fq_names %}
+        Total: {{ fq_names|count }}
+        <ul>
+            {% for fq_name in fq_names|sort(attribute='value') %}
+                <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/login.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/login.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,37 +2,37 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<div class="moin-form">
-{{ forms.render_errors(form) }}
+    <div class="moin-form">
+        {{ forms.render_errors(form) }}
 
-{% if 'username' in login_inputs or 'password' in login_inputs %}
-<h2>{{ _('Moin login') }}</h2>
-{{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
-<dl>
-  {% if 'username' in login_inputs %}
-  {{ forms.render(form['username']) }}
-  {% endif %}
-  {% if 'password' in login_inputs %}
-  {{ forms.render(form['password']) }}
-  {% endif %}
-</dl>
-{{ forms.render(form['submit']) }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-{% endif %}
+        {% if 'username' in login_inputs or 'password' in login_inputs %}
+            <h2>{{ _('Moin login') }}</h2>
+            {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
+                <dl>
+                    {% if 'username' in login_inputs %}
+                        {{ forms.render(form['username']) }}
+                    {% endif %}
+                    {% if 'password' in login_inputs %}
+                        {{ forms.render(form['password']) }}
+                    {% endif %}
+                </dl>
+                {{ forms.render(form['submit']) }}
+                {{ forms.render_submit(form) }}
+            {{ gen.form.close() }}
+        {% endif %}
 
-{% if 'openid' in login_inputs %}
-<br>
-<h2>{{ _('OpenID login') }}</h2>
+        {% if 'openid' in login_inputs %}
+            <br>
+            <h2>{{ _('OpenID login') }}</h2>
 
-{{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
-<dl>
-  {{ forms.render(form['openid']) }}
-</dl>
-{{ forms.render(form['submit']) }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-{% endif %}
+            {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
+                <dl>
+                    {{ forms.render(form['openid']) }}
+                </dl>
+                {{ forms.render(form['submit']) }}
+                {{ forms.render_submit(form) }}
+            {{ gen.form.close() }}
+        {% endif %}
 
-</div>
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/lookup.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/lookup.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,52 +3,52 @@
 {% import "forms.html" as forms %}
 {% block content %}
     {% if results is not defined %}
-    <h1>{{ _("Lookup") }}</h1>
-    {{ gen.form.open(lookup_form, id='moin-lookup-form', method='get', action=url_for('frontend.lookup')) }}
-        {{ forms.render_errors(lookup_form) }}
-        <dl>
-            {% for e in [
-                'name',
-                'name_exact',
-                'itemid',
-                'revid',
-                'userid',
-                'language',
-                'itemlinks',
-                'itemtransclusions',
-                'refs',
-                'tags',
-                'history',
-                ] %}
-                {{ forms.render(lookup_form[e]) }}
-            {% endfor %}
-        </dl>
-        {{ forms.render_submit(lookup_form) }}
-    {{ gen.form.close() }}
+        <h1>{{ _("Lookup") }}</h1>
+        {{ gen.form.open(lookup_form, id='moin-lookup-form', method='get', action=url_for('frontend.lookup')) }}
+            {{ forms.render_errors(lookup_form) }}
+            <dl>
+                {% for e in [
+                    'name',
+                    'name_exact',
+                    'itemid',
+                    'revid',
+                    'userid',
+                    'language',
+                    'itemlinks',
+                    'itemtransclusions',
+                    'refs',
+                    'tags',
+                    'history',
+                    ] %}
+                    {{ forms.render(lookup_form[e]) }}
+                {% endfor %}
+            </dl>
+            {{ forms.render_submit(lookup_form) }}
+        {{ gen.form.close() }}
     {% else %}
-    {% if not results %}
-    <h1>{{ _("No results") }}</h1>
-    {% else %}
-    <h1>{{ _("More than one result") }}</h1>
-    <div class="lookupresults">
-        <table>
-            {% for result in results %}
-                {% if result['wikiname'] == cfg.interwikiname %}
-                    <tr>
-                        <td class="moin-wordbreak">{{ loop.index }}
-                        <a href="{{ url_for_item(item_name=result.name, wiki_name='Self', rev=result.revid) }}"><b>{{ result.name }}</b></a>
-                        </td>
-                    </tr>
-                {% else %}
-                    <tr>
-                        <td class="moin-wordbreak">{{ loop.index }}
-                        <a class="moin-interwiki" href="{{ url_for_item(item_name=result.name, wiki_name=result.wikiname, rev=result.revid) }}"><b>{{ "%s:%s" % (result.wikiname, result.name) }}</b></a>
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endfor %}
-        </table>
-    </div>
-    {% endif %}
+        {% if not results %}
+            <h1>{{ _("No results") }}</h1>
+        {% else %}
+            <h1>{{ _("More than one result") }}</h1>
+            <div class="lookupresults">
+                <table>
+                    {% for result in results %}
+                        {% if result['wikiname'] == cfg.interwikiname %}
+                            <tr>
+                                <td class="moin-wordbreak">{{ loop.index }}
+                                    <a href="{{ url_for_item(item_name=result.name, wiki_name='Self', rev=result.revid) }}"><b>{{ result.name }}</b></a>
+                                </td>
+                            </tr>
+                        {% else %}
+                            <tr>
+                                <td class="moin-wordbreak">{{ loop.index }}
+                                    <a class="moin-interwiki" href="{{ url_for_item(item_name=result.name, wiki_name=result.wikiname, rev=result.revid) }}"><b>{{ "%s:%s" % (result.wikiname, result.name) }}</b></a>
+                                </td>
+                            </tr>
+                        {% endif %}
+                    {% endfor %}
+                </table>
+            </div>
+        {% endif %}
     {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/lostpass.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/lostpass.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,16 +2,16 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h1>{{ _("Lost Password") }}</h1>
-<div class="moin-form">
-{{ _("Please note that you only need to fill out one form field.") }}
-{{ gen.form.open(form, method="post", action=url_for('frontend.lostpass')) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['username']) }}
-    {{ forms.render(form['email']) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+    <h1>{{ _("Lost Password") }}</h1>
+    <div class="moin-form">
+        {{ _("Please note that you only need to fill out one form field.") }}
+        {{ gen.form.open(form, method="post", action=url_for('frontend.lostpass')) }}
+            {{ forms.render_errors(form) }}
+            <dl>
+                {{ forms.render(form['username']) }}
+                {{ forms.render(form['email']) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/mail/content_diff.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/mail/content_diff.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,30 +1,30 @@
 {% macro content_diff(diff) %}
-<table border="0" cellpadding="0" cellspacing="0" style="margin:0; padding:1em;
-        width:100%; font-family:monospace; background-color:#F9F9F9;">
-{% for line in diff -%}
-{% if line[:2] == "+ " -%}
-    <tr style="color:#00B000; height:1.2em;">
-{% elif line[:2] == "- " -%}
-    <tr style="color:#991111; height:1.2em;">
-{% elif line[:2] == "@@" -%}
-    <tr style="color:#440088; height:1.2em;">
-{% else -%}
-    <tr style="color:#000000; height:1.2em;">
-{%- endif %}
-    {% if line[:2] == "+ " %}
-        <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ line[0] }}</td>
-        <td style="font-family:monospace;"><ins style="text-decoration:none;">{{ line[2:] }}</ins></td>
-    {% elif line[:2] == "- " -%}
-        <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ line[0] }}</td>
-        <td style="font-family:monospace;"><del style="text-decoration:none;">{{ line[2:] }}</del></td>
-    {% elif line[:2] == "@@" -%}
-        <td style="font-family:monospace; width:1.2em;"></td>
-        <td style="font-family:monospace;">{{ line }}</td>
-    {% else -%}
-        <td style="font-family:monospace; width:1.2em;"></td>
-        <td style="font-family:monospace;">{{ line[2:] }}</td>
-    {%- endif %}
-    </tr>
-{%- endfor %}
-</table>
+    <table border="0" cellpadding="0" cellspacing="0" style="margin:0; padding:1em;
+            width:100%; font-family:monospace; background-color:#F9F9F9;">
+        {% for line in diff -%}
+            {% if line[:2] == "+ " -%}
+                <tr style="color:#00B000; height:1.2em;">
+            {% elif line[:2] == "- " -%}
+                <tr style="color:#991111; height:1.2em;">
+            {% elif line[:2] == "@@" -%}
+                <tr style="color:#440088; height:1.2em;">
+            {% else -%}
+                <tr style="color:#000000; height:1.2em;">
+            {%- endif %}
+            {% if line[:2] == "+ " %}
+                <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ line[0] }}</td>
+                <td style="font-family:monospace;"><ins style="text-decoration:none;">{{ line[2:] }}</ins></td>
+            {% elif line[:2] == "- " -%}
+                <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ line[0] }}</td>
+                <td style="font-family:monospace;"><del style="text-decoration:none;">{{ line[2:] }}</del></td>
+            {% elif line[:2] == "@@" -%}
+                <td style="font-family:monospace; width:1.2em;"></td>
+                <td style="font-family:monospace;">{{ line }}</td>
+            {% else -%}
+                <td style="font-family:monospace; width:1.2em;"></td>
+                <td style="font-family:monospace;">{{ line[2:] }}</td>
+            {%- endif %}
+            </tr>
+        {%- endfor %}
+    </table>
 {% endmacro %}
--- a/MoinMoin/templates/mail/html_base.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/mail/html_base.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,27 +2,27 @@
 {# For more information visit: http://htmlemailboilerplate.com/ #}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>{% block title %}{% endblock %}</title>
-    <style type="text/css">
-        #outlook a {padding:0;}
-        #backgroundTable {margin:0; padding:0; width:100% !important; line-height:100% !important;}
-        .ExternalClass {width:100%;}
-        .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font,
-        .ExternalClass td, .ExternalClass div {line-height:100%;}
-        p {margin:1em 0;}
-        h1, h2, h3, h4, h5, h6 {color:black !important;}
-        table td {border-collapse:collapse; padding:0;}
-    </style>
-</head>
-<body style="width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;">
-<table border="0" cellpadding="0" cellspacing="0" width="100%" id="backgroundTable">
-    <tr>
-        <td>
-            {% block content %}{% endblock %}
-        </td>
-    </tr>
-</table>
-</body>
+    <head>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+        <title>{% block title %}{% endblock %}</title>
+        <style type="text/css">
+            #outlook a {padding:0;}
+            #backgroundTable {margin:0; padding:0; width:100% !important; line-height:100% !important;}
+            .ExternalClass {width:100%;}
+            .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font,
+            .ExternalClass td, .ExternalClass div {line-height:100%;}
+            p {margin:1em 0;}
+            h1, h2, h3, h4, h5, h6 {color:black !important;}
+            table td {border-collapse:collapse; padding:0;}
+        </style>
+    </head>
+    <body style="width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" id="backgroundTable">
+            <tr>
+                <td>
+                    {% block content %}{% endblock %}
+                </td>
+            </tr>
+        </table>
+    </body>
 </html>
--- a/MoinMoin/templates/mail/meta_diff.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/mail/meta_diff.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,29 +1,29 @@
 {% macro meta_diff(diff) %}
-<table border="0" cellpadding="0" cellspacing="0" style="margin:0; padding:10px;
-        width:100%; font-family:monospace; background-color:#F9F9F9">
-{% for change in diff -%}
-{% if change[0] == "insert" -%}
-    <tr style="color:#00B000; height:1.2em;">
-    {% set marker = '+' -%}
-{% elif change[0] == "delete" -%}
-    <tr style="color:#991111; height:1.2em;">
-    {% set marker = '-' -%}
-{%- endif %}
-        <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ marker }}</td>
-        <td style="font-family:monospace;">
-        {% if change[0] == "insert" -%}
-            <ins style="text-decoration:none;">
-                {{ change[1] | join(".") }}{% if change[1] -%}:{%- endif %}
-                {{ change[2] }}
-            </ins>
-        {% elif change[0] == "delete" -%}
-            <del style="text-decoration:none;">
-                {{ change[1] | join(".") }}{% if change[1] -%}:{%- endif %}
-                {{ change[2] }}
-            </del>
-        {% endif %}
-        </td>
-    </tr>
-{%- endfor %}
-</table>
+    <table border="0" cellpadding="0" cellspacing="0" style="margin:0; padding:10px;
+            width:100%; font-family:monospace; background-color:#F9F9F9">
+        {% for change in diff -%}
+            {% if change[0] == "insert" -%}
+                <tr style="color:#00B000; height:1.2em;">
+                {% set marker = '+' -%}
+            {% elif change[0] == "delete" -%}
+                <tr style="color:#991111; height:1.2em;">
+                {% set marker = '-' -%}
+            {%- endif %}
+                <td style="font-family:monospace; width:1.2em; vertical-align:top;">{{ marker }}</td>
+                <td style="font-family:monospace;">
+                {% if change[0] == "insert" -%}
+                    <ins style="text-decoration:none;">
+                        {{ change[1] | join(".") }}{% if change[1] -%}:{%- endif %}
+                        {{ change[2] }}
+                    </ins>
+                {% elif change[0] == "delete" -%}
+                    <del style="text-decoration:none;">
+                        {{ change[1] | join(".") }}{% if change[1] -%}:{%- endif %}
+                        {{ change[2] }}
+                    </del>
+                {% endif %}
+                </td>
+            </tr>
+        {%- endfor %}
+    </table>
 {% endmacro %}
--- a/MoinMoin/templates/mail/notification_main.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/mail/notification_main.html	Sun Aug 24 08:39:32 2014 -0700
@@ -23,23 +23,23 @@
         </p>
     </div>
     {% if comment -%}
-    <h3 style="margin:0 1.3em 0.5em;">{{ _("Comment") }}</h3>
-    <p>{{ comment }}</p>
+        <h3 style="margin:0 1.3em 0.5em;">{{ _("Comment") }}</h3>
+        <p>{{ comment }}</p>
     {%- endif %}
     {% if content_diff_ -%}
-    <h3 style="margin:1em 1.3em 0.5em;">{{ _("Content") }}</h3>
-    {{ content_diff(content_diff_) }}
+        <h3 style="margin:1em 1.3em 0.5em;">{{ _("Content") }}</h3>
+        {{ content_diff(content_diff_) }}
     {%- endif %}
     {% if meta_diff_ -%}
-    <h3 style="margin:1em 1.3em 0.5em;">{{ _("Metadata") }}</h3>
-    {{ meta_diff(meta_diff_) }}
+        <h3 style="margin:1em 1.3em 0.5em;">{{ _("Metadata") }}</h3>
+        {{ meta_diff(meta_diff_) }}
     {%- endif %}
     <div style="font-size:0.7em; margin-top:2em;">
         <p style="text-align:center; color:#A6A6A6; margin-bottom:0;">
             {{ _("You are receiving this because you have subscribed to a wiki
-        item on %(wiki_name)s for change notifications.", wiki_name=wiki_name) }}</p>
+            item on %(wiki_name)s for change notifications.", wiki_name=wiki_name) }}</p>
         <p style="text-align:center; margin-top:0;"><strong><a
-                href="{{ unsubscribe_url }}"
+            href="{{ unsubscribe_url }}"
             style="text-decoration:none; color:#3CA7DD;">{{ _("Unsubscribe from
             this item notifications") }}</a></strong></p>
     </div>
--- a/MoinMoin/templates/meta.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/meta.html	Sun Aug 24 08:39:32 2014 -0700
@@ -8,13 +8,13 @@
 {% endblock %}
 
 {% block content_data %}
-<h1>
-    {{ title }}
-    {% if show_revision %}({{ _("Revision") }} {{ rev.revid | shorten_id }}){% endif %}
-</h1>
-{% if meta %}
-<div id="moin-content-meta">
-    {{ utils.meta_info(meta) }}
-</div>
-{% endif %}
+    <h1>
+        {{ title }}
+        {% if show_revision %}({{ _("Revision") }} {{ rev.revid | shorten_id }}){% endif %}
+    </h1>
+    {% if meta %}
+        <div id="moin-content-meta">
+            {{ utils.meta_info(meta) }}
+        </div>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/templates/modify.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify.html	Sun Aug 24 08:39:32 2014 -0700
@@ -29,41 +29,41 @@
 
 
 {% block content %}
-<h1>{{ title }}</h1>
-<div id="moin-modify" class="moin-form">
-    {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
-    {{ forms.render_errors(form) }}
-    {#
-       Workaround:
-       For *Draw content, hide submit button and form['comment'], since *Draw
-       POSTs originate from their respective applets.
-    #}
-    {% if not form['content_form'].is_draw %}
-        {{ forms.render_submit(form, id='moin-save-text-button') }}
-        <dl>
-            {{ forms.render_textcha(gen, form) }}
-            {{ forms.render(form['comment']) }}
-        </dl>
-    {% endif %}
-    {{ data_editor(form['content_form'], item_name) }}
-    {% if form['content_form'].help %}
-        <pre id="moin-editor-help">{{ form['content_form'].help }}</pre>
-    {% endif %}
-    {{ meta_editor(form['meta_form']) }}
-    <dl>
-        {{ forms.render(form['extra_meta_text']) }}
-    </dl>
-    {#
-    {{ gen.textarea(form['meta_text'], lang='en', dir='ltr', rows=rows_meta, cols=cols) }}
-    <br />
-    {{ forms.render_errors(form['meta_text']) }}
-    #}
-    {{ gen.form.close() }}
-</div>
+    <h1>{{ title }}</h1>
+    <div id="moin-modify" class="moin-form">
+        {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
+            {{ forms.render_errors(form) }}
+            {#
+               Workaround:
+               For *Draw content, hide submit button and form['comment'], since *Draw
+               POSTs originate from their respective applets.
+            #}
+            {% if not form['content_form'].is_draw %}
+                {{ forms.render_submit(form, id='moin-save-text-button') }}
+                <dl>
+                    {{ forms.render_textcha(gen, form) }}
+                    {{ forms.render(form['comment']) }}
+                </dl>
+            {% endif %}
+            {{ data_editor(form['content_form'], item_name) }}
+            {% if form['content_form'].help %}
+                <pre id="moin-editor-help">{{ form['content_form'].help }}</pre>
+            {% endif %}
+            {{ meta_editor(form['meta_form']) }}
+            <dl>
+                {{ forms.render(form['extra_meta_text']) }}
+            </dl>
+            {#
+            {{ gen.textarea(form['meta_text'], lang='en', dir='ltr', rows=rows_meta, cols=cols) }}
+            <br />
+            {{ forms.render_errors(form['meta_text']) }}
+            #}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
 
 {% block options_for_javascript %}
-{%- if user.scroll_page_after_edit -%}
-    <br id="moin-scroll-page-after-edit" />
-{%- endif %}
+    {%- if user.scroll_page_after_edit -%}
+        <br id="moin-scroll-page-after-edit" />
+    {%- endif %}
 {% endblock %}
--- a/MoinMoin/templates/modify_anywikidraw.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_anywikidraw.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,21 +1,21 @@
 {% macro data_editor(form, item_name) %}
-<p>
-<applet code="org.anywikidraw.moinmoin.MoinMoinDrawingApplet.class" codebase="."
-        archive="{{ url_for('serve.files', name='anywikidraw', filename='AnyWikiDrawForMoinMoin.jar') }}"
-        width="800" height="620">
-<param name="DrawingName" value="drawing.svg" />
-{% if form.drawing_exists %}
-<param name="DrawingURL" value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.svg') }}" />
-{% endif %}
-<param name="PageURL" value="{{ url_for('frontend.show_item', item_name=item_name) }}" />
-<param name="UploadURL" value="{{ url_for('frontend.modify_item', item_name=item_name, contenttype='application/x-anywikidraw') }}" />
-<param name="Locale" value="en" />
-<param name="codebase_lookup" value="false" />
-<param name="classloader_cache" value="false" />
-<param name="boxborder" value="false" />
-<param name="centerimage" value="true" />
-<strong>{{ _("NOTE:") }}</strong> {{ _("You need a Java enabled browser to edit the drawing.") }}
-</applet>
-</p>
-<br />
+    <p>
+        <applet code="org.anywikidraw.moinmoin.MoinMoinDrawingApplet.class" codebase="."
+                archive="{{ url_for('serve.files', name='anywikidraw', filename='AnyWikiDrawForMoinMoin.jar') }}"
+                width="800" height="620">
+            <param name="DrawingName" value="drawing.svg" />
+            {% if form.drawing_exists %}
+                <param name="DrawingURL" value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.svg') }}" />
+            {% endif %}
+            <param name="PageURL" value="{{ url_for('frontend.show_item', item_name=item_name) }}" />
+            <param name="UploadURL" value="{{ url_for('frontend.modify_item', item_name=item_name, contenttype='application/x-anywikidraw') }}" />
+            <param name="Locale" value="en" />
+            <param name="codebase_lookup" value="false" />
+            <param name="classloader_cache" value="false" />
+            <param name="boxborder" value="false" />
+            <param name="centerimage" value="true" />
+            <strong>{{ _("NOTE:") }}</strong> {{ _("You need a Java enabled browser to edit the drawing.") }}
+        </applet>
+    </p>
+    <br />
 {% endmacro %}
--- a/MoinMoin/templates/modify_select_contenttype.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_select_contenttype.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,22 +1,22 @@
 {% extends theme("show.html") %}
 {% block content %}
-<h1>{{ _("Create new item?") }}</h1>
-<p>
-{# XXX should show itemtype's display name #}
-{{ _("Please select the contenttype of the new %(itemtype)s item.", itemtype=itemtype) }}
-</p>
-<table id="moin-create-table" class="zebra">
-    {% for group in group_names %}
-    <tr>
-        <th>{{ group }}</th>
-    </tr>
-    <tr>
-        <td> |&nbsp;
-        {% for e in groups[group] %}
-            <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=Type(e.content_type, parameters=e.default_contenttype_params)|string) }}">{{ e.display_name }}</a> &nbsp;|&nbsp;
+    <h1>{{ _("Create new item?") }}</h1>
+    <p>
+        {# XXX should show itemtype's display name #}
+        {{ _("Please select the contenttype of the new %(itemtype)s item.", itemtype=itemtype) }}
+    </p>
+    <table id="moin-create-table" class="zebra">
+        {% for group in group_names %}
+            <tr>
+                <th>{{ group }}</th>
+            </tr>
+            <tr>
+                <td> |&nbsp;
+                    {% for e in groups[group] %}
+                        <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=Type(e.content_type, parameters=e.default_contenttype_params)|string) }}">{{ e.display_name }}</a> &nbsp;|&nbsp;
+                    {% endfor %}
+                </td>
+            </tr>
         {% endfor %}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
+    </table>
 {% endblock %}
--- a/MoinMoin/templates/modify_select_itemtype.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_select_itemtype.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,16 +1,16 @@
 {% extends theme("show.html") %}
 {% block content %}
-<h1>{{ _("Item not found, create it now?") }}</h1>
-<p>
-{{ _("Item '%(fqname)s' does not exist (yet), but you can try creating it now. Please select the type of the item you want to create.", fqname=fqname) }}
-</p>
-<table class="zebra">
-    {% for e in itemtypes %}
-    <tr>
-        <td>
-            <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=e.itemtype) }}">{{ e.display_name }}</a> - {{ e.description }}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
+    <h1>{{ _("Item not found, create it now?") }}</h1>
+    <p>
+        {{ _("Item '%(fqname)s' does not exist (yet), but you can try creating it now. Please select the type of the item you want to create.", fqname=fqname) }}
+    </p>
+    <table class="zebra">
+        {% for e in itemtypes %}
+            <tr>
+                <td>
+                    <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=e.itemtype) }}">{{ e.display_name }}</a> - {{ e.description }}
+                </td>
+            </tr>
+        {% endfor %}
+    </table>
 {% endblock %}
--- a/MoinMoin/templates/modify_select_template.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_select_template.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,15 +1,15 @@
 {% extends theme("show.html") %}
 {% block content %}
-<h1>{{ _("Create new item?") }}</h1>
-<p>
-{{ _("You can either <a href='%(modifyhref)s'>create the item from scratch</a> or select a template.", modifyhref=url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=contenttype, template='') ) }}
-</p>
-<h2>{{ _("Available template items") }}</h2>
-<ul>
-    {% for template in templates %}
-    <li>
-    <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=contenttype, template=template) }}">{{ template }}</a>
-    </li>
-    {% endfor %}
-</ul>
+    <h1>{{ _("Create new item?") }}</h1>
+    <p>
+        {{ _("You can either <a href='%(modifyhref)s'>create the item from scratch</a> or select a template.", modifyhref=url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=contenttype, template='') ) }}
+    </p>
+    <h2>{{ _("Available template items") }}</h2>
+    <ul>
+        {% for template in templates %}
+            <li>
+                <a href="{{ url_for('frontend.modify_item', item_name=fqname, itemtype=itemtype, contenttype=contenttype, template=template) }}">{{ template }}</a>
+            </li>
+        {% endfor %}
+    </ul>
 {% endblock %}
--- a/MoinMoin/templates/modify_svg-edit.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_svg-edit.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,7 +1,7 @@
 {% macro data_editor(form, item_name) %}
-<p>
-<object data="{{ url_for('serve.files', name='svgedit_moin', filename='editor/svg-editor.html') }}?paramurl={{ url_for('frontend.get_item', item_name=item_name, member='drawing.svg') }}" width="100%" height="600">
-</object>
-</p>
-<br />
+    <p>
+        <object data="{{ url_for('serve.files', name='svgedit_moin', filename='editor/svg-editor.html') }}?paramurl={{ url_for('frontend.get_item', item_name=item_name, member='drawing.svg') }}" width="100%" height="600">
+        </object>
+    </p>
+    <br />
 {% endmacro %}
--- a/MoinMoin/templates/modify_text.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_text.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,7 +1,7 @@
 {% from "modify_binary.html" import data_editor as base_editor %}
 
 {% macro data_editor(form, item_name) %}
-{{ base_editor(form) }}
-{{ gen.textarea(form['data_text'], rows=form.rows|string, cols=form.cols|string, **kwargs) }}
-<br />
+    {{ base_editor(form) }}
+    {{ gen.textarea(form['data_text'], rows=form.rows|string, cols=form.cols|string, **kwargs) }}
+    <br />
 {% endmacro %}
--- a/MoinMoin/templates/modify_text_html.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_text_html.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,10 +1,10 @@
 {% from 'modify_text.html' import data_editor as base_editor %}
 
 {% macro extra_head() %}
-<script type="text/javascript" src="{{ url_for('serve.files', name='ckeditor', filename='ckeditor.js') }}"></script>
-<link rel="stylesheet" href="{{ url_for('serve.files', name='ckeditor', filename='contents.css') }}" />
+    <script type="text/javascript" src="{{ url_for('serve.files', name='ckeditor', filename='ckeditor.js') }}"></script>
+    <link rel="stylesheet" href="{{ url_for('serve.files', name='ckeditor', filename='contents.css') }}" />
 {% endmacro %}
 
 {% macro data_editor(form, item_name) %}
-{{ gen.textarea(form['data_text'], class='ckeditor', rows=form.rows|string, cols=form.cols|string) }}
+    {{ gen.textarea(form['data_text'], class='ckeditor', rows=form.rows|string, cols=form.cols|string) }}
 {% endmacro %}
--- a/MoinMoin/templates/modify_twikidraw.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/modify_twikidraw.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,16 +1,16 @@
 {% macro data_editor(form, item_name) %}
-<p>
-<applet code="CH.ifa.draw.twiki.TWikiDraw.class"
-        archive="{{ url_for('serve.files', name='twikidraw_moin', filename='twikidraw_moin.jar') }}"
-        width="800" height="620">
-        <param name="drawpath" value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.draw') }}" />
-        <param name="pngpath"  value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.png') }}" />
-<param name="savepath" value="{{ url_for('frontend.modify_item', item_name=item_name, contenttype='application/x-twikidraw') }}" />
-<param name="basename" value="drawing" />
-<param name="viewpath" value="{{ url_for('frontend.show_item', item_name=item_name) }}" />
-<param name="helppath" value="" />
-<strong>{{ _("NOTE:") }}</strong> {{ _("You need a Java enabled browser to edit the drawing.") }}
-</applet>
-</p>
-<br />
+    <p>
+        <applet code="CH.ifa.draw.twiki.TWikiDraw.class"
+                archive="{{ url_for('serve.files', name='twikidraw_moin', filename='twikidraw_moin.jar') }}"
+                width="800" height="620">
+            <param name="drawpath" value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.draw') }}" />
+            <param name="pngpath"  value="{{ url_for('frontend.get_item', item_name=item_name, member='drawing.png') }}" />
+            <param name="savepath" value="{{ url_for('frontend.modify_item', item_name=item_name, contenttype='application/x-twikidraw') }}" />
+            <param name="basename" value="drawing" />
+            <param name="viewpath" value="{{ url_for('frontend.show_item', item_name=item_name) }}" />
+            <param name="helppath" value="" />
+            <strong>{{ _("NOTE:") }}</strong> {{ _("You need a Java enabled browser to edit the drawing.") }}
+        </applet>
+    </p>
+    <br />
 {% endmacro %}
--- a/MoinMoin/templates/openid_register.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/openid_register.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,22 +2,22 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h1>{{ _("Create Account") }}</h1>
-<div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-
-    <dt>{{ gen.label(form['openid']) }}</dt>
-    <dd>{{ gen.input(form['openid'], type='text', readonly='1') }}</dd>
+    <h1>{{ _("Create Account") }}</h1>
+    <div class="moin-form">
+        {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
+            {{ forms.render_errors(form) }}
+            <dl>
 
-    {{ forms.render(form['username']) }}
-    {{ forms.render(form['password1']) }}
-    {{ forms.render(form['password2']) }}
-    {{ forms.render(form['email']) }}
-    {{ forms.render_textcha(gen, form) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+                <dt>{{ gen.label(form['openid']) }}</dt>
+                <dd>{{ gen.input(form['openid'], type='text', readonly='1') }}</dd>
+
+                {{ forms.render(form['username']) }}
+                {{ forms.render(form['password1']) }}
+                {{ forms.render(form['password2']) }}
+                {{ forms.render(form['email']) }}
+                {{ forms.render_textcha(gen, form) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/recoverpass.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/recoverpass.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,15 +2,15 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h1>{{ _("Recover Password") }}</h1>
-{{ gen.form.open(form, method="post", action=url_for('frontend.recoverpass')) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['token']) }}
-    {{ forms.render(form['username']) }}
-    {{ forms.render(form['password1']) }}
-    {{ forms.render(form['password2']) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    <h1>{{ _("Recover Password") }}</h1>
+    {{ gen.form.open(form, method="post", action=url_for('frontend.recoverpass')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['token']) }}
+            {{ forms.render(form['username']) }}
+            {{ forms.render(form['password1']) }}
+            {{ forms.render(form['password2']) }}
+        </dl>
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endblock %}
--- a/MoinMoin/templates/refs.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/refs.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,17 +1,17 @@
 {% extends theme("show.html") %}
 {% block content %}
-<h1>{{ _('Outgoing Item References') }}</h1>
-<ul>
-    {% for fq_name in refs|sort(attribute='value') %}
-    <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
+    <h1>{{ _('Outgoing Item References') }}</h1>
+    <ul>
+        {% for fq_name in refs|sort(attribute='value') %}
+            <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
 
-    {% endfor %}
-</ul>
-<h1>{{ _('Incoming Item References') }}</h1>
-<ul>
-    {% for fq_name in backrefs|sort(attribute='value') %}
-    <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
+        {% endfor %}
+    </ul>
+    <h1>{{ _('Incoming Item References') }}</h1>
+    <ul>
+        {% for fq_name in backrefs|sort(attribute='value') %}
+            <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
 
-    {% endfor %}
-</ul>
+        {% endfor %}
+    </ul>
 {% endblock %}
--- a/MoinMoin/templates/register.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/register.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,19 +2,19 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h1>{{ _("Create Account") }}</h1>
-<div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['username']) }}
-    {{ forms.render(form['password1']) }}
-    {{ forms.render(form['password2']) }}
-    {{ forms.render(form['email']) }}
-    {{ forms.render(form['openid']) }}
-    {{ forms.render_textcha(gen, form) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+    <h1>{{ _("Create Account") }}</h1>
+    <div class="moin-form">
+        {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
+            {{ forms.render_errors(form) }}
+            <dl>
+                {{ forms.render(form['username']) }}
+                {{ forms.render(form['password1']) }}
+                {{ forms.render(form['password2']) }}
+                {{ forms.render(form['email']) }}
+                {{ forms.render(form['openid']) }}
+                {{ forms.render_textcha(gen, form) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/rename.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/rename.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,16 +3,16 @@
 
 {% set title = _("Rename '%(item_name)s'", item_name=item.fqname.value) %}
 {% block content %}
-<h1>{{ title }}</h1>
-<div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=fqname)) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['target']) }}
-    {{ forms.render(form['comment']) }}
-    {{ forms.render_textcha(gen, form) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+    <h1>{{ title }}</h1>
+    <div class="moin-form">
+        {{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=fqname)) }}
+            {{ forms.render_errors(form) }}
+            <dl>
+                {{ forms.render(form['target']) }}
+                {{ forms.render(form['comment']) }}
+                {{ forms.render_textcha(gen, form) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/revert.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/revert.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,15 +1,15 @@
 {% import "forms.html" as forms %}
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Revert '%(item_name)s' (rev %(rev_id)s, names '%(new_names)s') ", item_name=fqname | shorten_item_name, rev_id=rev_id | shorten_id, new_names=item.meta['name'] | join('|')) }}</h1>
-<div class="moin-form">
-{{ gen.form.open(form, method="post", action=url_for('frontend.revert_item', item_name=item.fqname, rev=rev_id)) }}
-  {{ forms.render_errors(form) }}
-  <dl>
-    {{ forms.render(form['comment']) }}
-    {{ forms.render_textcha(gen, form) }}
-  </dl>
-  {{ forms.render_submit(form) }}
-{{ gen.form.close() }}
-</div>
+    <h1>{{ _("Revert '%(item_name)s' (rev %(rev_id)s, names '%(new_names)s') ", item_name=fqname | shorten_item_name, rev_id=rev_id | shorten_id, new_names=item.meta['name'] | join('|')) }}</h1>
+    <div class="moin-form">
+        {{ gen.form.open(form, method="post", action=url_for('frontend.revert_item', item_name=item.fqname, rev=rev_id)) }}
+            {{ forms.render_errors(form) }}
+            <dl>
+                {{ forms.render(form['comment']) }}
+                {{ forms.render_textcha(gen, form) }}
+            </dl>
+            {{ forms.render_submit(form) }}
+        {{ gen.form.close() }}
+    </div>
 {% endblock %}
--- a/MoinMoin/templates/search.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/search.html	Sun Aug 24 08:39:32 2014 -0700
@@ -13,8 +13,8 @@
     <h1>{{_("Search")}}</h1>
     {{ gen.form.open(medium_search_form, id='moin-long-searchform', method='get', action=url_for('frontend.search', item_name=item_name)) }}
         <p>
-        {{ forms.render(medium_search_form['q']) }}
-        {{ forms.render_submit(medium_search_form) }}
+            {{ forms.render(medium_search_form['q']) }}
+            {{ forms.render_submit(medium_search_form) }}
         </p>
         <div class="moin-search-option-bar"><h4 style="display:inline-block">Search Options</h4><span class="icon-chevron-down"></span></div>
         <div class="moin-searchoptions hidden">
@@ -57,7 +57,7 @@
             </table>
         </div>
         <p>
-        {{ forms.render_errors(medium_search_form) }}
+            {{ forms.render_errors(medium_search_form) }}
         </p>
     {{ gen.form.close() }}
     <div id="finalresults">
--- a/MoinMoin/templates/show.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/show.html	Sun Aug 24 08:39:32 2014 -0700
@@ -6,7 +6,7 @@
     <link rel="alternate" title="{{ item_name }} changes" href="{{ url_for('feed.atom', item_name=item_name) }}" type="application/atom+xml" />
     {# universal edit button support #}
     {%- if user.may.write(item_name) and 'frontend.modify_item' not in cfg.endpoints_excluded -%}
-    <link rel="alternate" type="application/wiki" title="{{ _('Modify') }}" href="{{ url_for('frontend.modify_item', item_name=item_name) }}" />
+        <link rel="alternate" type="application/wiki" title="{{ _('Modify') }}" href="{{ url_for('frontend.modify_item', item_name=item_name) }}" />
     {%- endif %}
 {% endblock %}
 
@@ -19,11 +19,11 @@
 {% macro rev_navigation(view='frontend.show_item') %}
     <ul id="moin-rev-navigation">
         <li class="moin-rev-navigation-older">
-        {% if rev.revid != 'current' -%}
-            <a href="{{ url_for(view, rev=rev.revno-1, item_name=item_name) }}">&lt;-- {{ _('older') }}</a>
-        {%- else -%}
-            <span class="moin-disabled">{{ _('no older revision') }}</span>
-        {%- endif %}
+            {% if rev.revid != 'current' -%}
+                <a href="{{ url_for(view, rev=rev.revno-1, item_name=item_name) }}">&lt;-- {{ _('older') }}</a>
+            {%- else -%}
+                <span class="moin-disabled">{{ _('no older revision') }}</span>
+            {%- endif %}
         </li>
         <li class="moin-rev-navigation-current">rev {{ rev.revid }}</li>
         <li class="moin-rev-navigation-newer">
@@ -48,19 +48,19 @@
     {% endif %}
 
     {% block headline %}
-    {# <h1>{{ rev.item.name }} {% if show_revision %}(Revision {{ rev.revid }}){% endif %}</h1> #}
-    {% if item.meta['summary'] %}
-        <div id="moin-summary">
-            {{ _('Summary: %(summary)s', summary=item.meta['summary']) }}
-        </div>
-    {% endif %}
+        {# <h1>{{ rev.item.name }} {% if show_revision %}(Revision {{ rev.revid }}){% endif %}</h1> #}
+        {% if item.meta['summary'] %}
+            <div id="moin-summary">
+                {{ _('Summary: %(summary)s', summary=item.meta['summary']) }}
+            </div>
+        {% endif %}
     {% endblock %}
     {% block content_data %}
-    {% if data_rendered %}
-    <div id="moin-content-data">
-        {{ data_rendered }}
-    </div>
-    {% endif %}
+        {% if data_rendered %}
+            <div id="moin-content-data">
+                {{ data_rendered }}
+            </div>
+        {% endif %}
     {% endblock %}
 {% endblock %}
 
@@ -72,24 +72,24 @@
 
 {% block footer_meta %}
     {% if rev %}
-    <p id="moin-pageinfo" lang="{{ theme_supp.ui_lang }}" dir="{{ theme_supp.ui_dir }}">
-        {% if cfg.show_interwiki %}{{ cfg.interwikiname }}:{% endif %}{{ item_name }} (rev {{rev.revid | shorten_id}}),
-        {{ _("modified") }} {{ rev.meta['mtime']|datetimeformat }}
-        {{ _("by") }} {{ utils.editor_info(rev.meta) }}{% if rev.tags %},
-        {{ _("tagged") }}
-        {% for tag in rev.tags -%}
-        <a href="{{ url_for('frontend.tagged_items', tag=tag) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
-        {%- endfor -%}
-    {%- endif -%}.
-    </p>
+        <p id="moin-pageinfo" lang="{{ theme_supp.ui_lang }}" dir="{{ theme_supp.ui_dir }}">
+            {% if cfg.show_interwiki %}{{ cfg.interwikiname }}:{% endif %}{{ item_name }} (rev {{rev.revid | shorten_id}}),
+                {{ _("modified") }} {{ rev.meta['mtime']|datetimeformat }}
+                {{ _("by") }} {{ utils.editor_info(rev.meta) }}{% if rev.tags %},
+                {{ _("tagged") }}
+                {% for tag in rev.tags -%}
+                    <a href="{{ url_for('frontend.tagged_items', tag=tag) }}">{{ tag }}</a>{% if not loop.last %}, {% endif %}
+                {%- endfor -%}
+            {%- endif -%}.
+        </p>
     {% endif %}
 {% endblock %}
 
 {% block options_for_javascript %}
-{%- if item_name and user.edit_on_doubleclick and user.may.write(item_name) -%}
-    <br id="moin-edit-on-doubleclick" />
-{%- endif %}
-{%- if user.show_comments -%}
-    <br id="moin-show-comments" />
-{%- endif %}
+    {%- if item_name and user.edit_on_doubleclick and user.may.write(item_name) -%}
+        <br id="moin-edit-on-doubleclick" />
+    {%- endif %}
+    {%- if user.show_comments -%}
+        <br id="moin-show-comments" />
+    {%- endif %}
 {% endblock %}
--- a/MoinMoin/templates/show_nonexistent.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/show_nonexistent.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,7 +1,7 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Item not found") }}</h1>
-<p>
-{{ _("Item '%(name)s' does not exist.", name=item_name) }}
-</p>
+    <h1>{{ _("Item not found") }}</h1>
+    <p>
+        {{ _("Item '%(name)s' does not exist.", name=item_name) }}
+    </p>
 {% endblock %}
--- a/MoinMoin/templates/sitemap.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/sitemap.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,16 +3,16 @@
 {% set title = _("SiteMap of '%(item_name)s'", item_name=item_name) %}
 
 {% block content %}
-<h1>{{ title }}</h1>
-{% for entry in sitemap recursive %}
-    {% if isinstance(entry, list) %}
-        <ul>
-            {{ loop(entry) }}
-        </ul>
-    {% else %}
-        <li>
-        <a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=entry) }}" data-fqname="{{entry}}">{{ entry.value }}</a>
-        </li>
-    {% endif %}
-{% endfor %}
+    <h1>{{ title }}</h1>
+    {% for entry in sitemap recursive %}
+        {% if isinstance(entry, list) %}
+            <ul>
+                {{ loop(entry) }}
+            </ul>
+        {% else %}
+            <li>
+                <a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=entry) }}" data-fqname="{{entry}}">{{ entry.value }}</a>
+            </li>
+        {% endif %}
+    {% endfor %}
 {% endblock %}
--- a/MoinMoin/templates/snippets.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/snippets.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,7 +2,7 @@
 
 {# Logo in the header #}
 {% macro logo() -%}
-<img src="{{ url_for('static', filename='logos/moinmoin.png') }}" id="moin-img-logo" alt="Logo">
+    <img src="{{ url_for('static', filename='logos/moinmoin.png') }}" id="moin-img-logo" alt="Logo">
 {%- endmacro %}
 
 {# Additional HTML tags inside <head> #}
@@ -31,36 +31,36 @@
 
 {# Helper macro to create image links #}
 {% macro creditlogo(link, logo, alt, title) %}
-<a href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
+    <a href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
 {% endmacro %}
 
 {# Image links in the footer #}
 {% macro creditlogos(start='<ul id="moin-creditlogos"><li>'|safe, end='</li></ul>'|safe, sep='</li><li>'|safe) %}
-{{ start }}
-{{ creditlogo('http://moinmo.in/', url_for('static', filename='logos/moinmoin_powered.png'),
-   'MoinMoin powered', 'This site uses the MoinMoin Wiki software.') }}
-{{ sep }}
-{{ creditlogo('http://moinmo.in/Python', url_for('static', filename='logos/python_powered.png'),
-   'Python powered', 'MoinMoin is written in Python.') }}
-{{ end }}
+    {{ start }}
+    {{ creditlogo('http://moinmo.in/', url_for('static', filename='logos/moinmoin_powered.png'),
+       'MoinMoin powered', 'This site uses the MoinMoin Wiki software.') }}
+    {{ sep }}
+    {{ creditlogo('http://moinmo.in/Python', url_for('static', filename='logos/python_powered.png'),
+       'Python powered', 'MoinMoin is written in Python.') }}
+    {{ end }}
 {% endmacro %}
 
 {# Helper macro to generate text links #}
 {% macro credit(link, text, title) -%}
-<a href="{{ link }}" title="{{ title }}">{{ text }}</a>
+    <a href="{{ link }}" title="{{ title }}">{{ text }}</a>
 {%- endmacro %}
 
 {# Text links in the footer #}
 {% macro credits(start='<p id="moin-credits">'|safe, end='</p>'|safe, sep='<span>&bull;</span>'|safe) %}
-{{ start }}
-{{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
-{{ sep }}
-{{ credit('http://moinmo.in/Python', 'Python Powered', 'MoinMoin is written in Python.') }}
-{{ sep }}
-{{ credit('http://moinmo.in/GPL', 'GPL licensed', 'MoinMoin is GPL licensed.') }}
-{{ sep }}
-{{ credit('http://validator.w3.org/check?uri=referer', 'Valid HTML 5', 'Click here to validate this page.') }}
-{{ end }}
+    {{ start }}
+    {{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
+    {{ sep }}
+    {{ credit('http://moinmo.in/Python', 'Python Powered', 'MoinMoin is written in Python.') }}
+    {{ sep }}
+    {{ credit('http://moinmo.in/GPL', 'GPL licensed', 'MoinMoin is GPL licensed.') }}
+    {{ sep }}
+    {{ credit('http://validator.w3.org/check?uri=referer', 'Valid HTML 5', 'Click here to validate this page.') }}
+    {{ end }}
 {% endmacro %}
 
 {# Additional Stylesheets (after theme css, before user css #}
--- a/MoinMoin/templates/ticket/base.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/ticket/base.html	Sun Aug 24 08:39:32 2014 -0700
@@ -104,30 +104,30 @@
 {% endblock %}
 
 {% block content %}
-<h1>
-    {% block title_text %}
-    {% endblock %}
-    {% if closed %}
-        {# TODO style .moin-ticket-closed #}
-        <span class="moin-ticket-closed">{{ _("(Closed)") }}</span>
-    {% endif %}
-</h1>
-<div class="moin-form" id="moin-ticket-form">
-    {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
+    <h1>
+        {% block title_text %}
+        {% endblock %}
+        {% if closed %}
+            {# TODO style .moin-ticket-closed #}
+            <span class="moin-ticket-closed">{{ _("(Closed)") }}</span>
+        {% endif %}
+    </h1>
+    <div class="moin-form" id="moin-ticket-form">
+        {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
 
-    <div id="moin-content-data" class="moin-ticket-comments">
-        {% if data_rendered %}
-            {{ data_rendered }}
-        {% endif %}
+            <div id="moin-content-data" class="moin-ticket-comments">
+                {% if data_rendered %}
+                    {{ data_rendered }}
+                {% endif %}
 
-        {% block form_controls %}
-        {% endblock %}
+                {% block form_controls %}
+                {% endblock %}
+            </div>
+            {% block ticket_metadata %}
+            {% endblock %}
+
+        {{ gen.form.close() }}
     </div>
-    {% block ticket_metadata %}
-    {% endblock %}
-
-    {{ gen.form.close() }}
-</div>
 {% endblock %}
 
 {% block footer_itemviews %}
--- a/MoinMoin/templates/ticket/submit.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/ticket/submit.html	Sun Aug 24 08:39:32 2014 -0700
@@ -19,8 +19,8 @@
     <div class="moin-ticket-metadata">
         <h2>{{ _("Provide metadata") }}</h2>
         <dl>
-        {{ forms.render_errors(form) }}
-        {{ render_meta() }}
+            {{ forms.render_errors(form) }}
+            {{ render_meta() }}
         </dl>
         <div class="moin-ticket-tags">
             {{ _("Suggested Tags: ") }}
@@ -29,7 +29,7 @@
             {% endfor %}
         </div>
         <dl>
-        {{ render_selectlists() }}
+            {{ render_selectlists() }}
         </dl>
     </div>
     <div class="moin-ticket-submit">
--- a/MoinMoin/templates/tickets.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/tickets.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,134 +3,134 @@
 {% set title = _("Tickets") %}
 
 {% block content %}
-<h1>{{_("Tickets")}}</h1>
-
-{% set status_values = ['all', 'open', 'closed']  %}
-{{_("Filter:")}}
-{% for status_value in status_values %}
-    <form action="{{ url_for('frontend.tickets', selected_tags=list(), time_sorting=time_sorting if time_sorting) }}" method="post" class='moin-ticketsearch-form'>
-        <input type="hidden" name="q" value="" >
-        &nbsp;<input type="hidden" name="status" value="{{ status_value }}">
-        <input type="submit" value="{{ status_value.capitalize() }}" title="{{ _('Show %(status)s tickets', status=status_value) }}" class="{{ 'ticket-query-button active' if status == status_value  else 'ticket-query-button'}}">
-    </form>
-{% endfor %}
-
-<div class="tickets-sort-button dropdown">
-    <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
-        {% if time_sorting == 'new' %}
-            {% set sortedby = 'Recently updated' %}
-        {% elif time_sorting == 'old' %}
-            {% set sortedby = 'Least recently updated' %}
-        {% endif %}
-        {{_("Sort: %(sortedby)s", sortedby=sortedby if sortedby)}}
-    <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
-        <li role="presentation">
-            <form action="{{ url_for('frontend.tickets', selected_tags=list(selected_tags), time_sorting='new') }}" method="post">
-                <input type="hidden" name="status" value="{{ status }}">
-                <input type="hidden" name="q" value="{{ query if query }}" >
-                <button type="submit">
-                    {{_("Recently updated")}}
-                </button>
-            </form>
-        </li>
-        <li role="presentation">
-            <form action="{{ url_for('frontend.tickets', selected_tags=list(selected_tags), time_sorting='old') }}" method="post">
-                <input type="hidden" name="status" value="{{ status }}">
-                <input type="hidden" name="q" value="{{ query if query }}" >
-                <button type="submit">
-                    {{_("Least Recently updated")}}
-                </button>
-            </form>
-        </li>
-    </ul>
-</div>
-
-{# This is just a workaround for creating tickets #}
-<a id="moin-ticket-create-link" href="{{ url_for('frontend.modify_item', itemtype='ticket', item_name='ticket_'+current_timestamp ) }}" >
-    <button class="btn btn-primary btn-lg btn-block">{{ _("Create ticket") }}</button>
-</a>
-
-<form action="{{ url_for('frontend.tickets',selected_tags=list(selected_tags), time_sorting=time_sorting if time_sorting) }}" method="post">
-    <input type="hidden" name="status" value="{{ status }}">
-    <input type="text" name="q" value="{{ query if query }}" id="moin-ticketsearch-query" class="form-control" placeholder="{{_('Find tickets')}}">
-</form>
+    <h1>{{_("Tickets")}}</h1>
 
-{% if results %}
-    <p>{{ _("%(result_len)d Tickets found.", result_len=results|length) }}</p>
-    <table class="table table-hover" id="ticket-list">
-        <thead>
-            <tr>
-                <th id="ticket-itemid">{{_("ID")}}</th>
-                <th id="ticket-summary">{{_("Summary")}}</th>
-                <th id="ticket-status">{{_("Status")}}</th>
-                <th id="ticket-effort" title="{{ _('Effort') }}">E</th>
-                <th id="ticket-difficulty" title="{{ _('Difficulty') }}">D</th>
-                <th id="ticket-severity" title="{{ _('Severity') }}">S</th>
-                <th id="ticket-priority" title="{{ _('Priority') }}">P</th>
-                <th id="ticket-tags">{{_("Tags")}}</th>
-            </tr>
-        </thead>
-    <tbody>
-    {% for result in results %}
-        <tr>
-            <td>
-                <a href="{{  url_for_item(result['itemid'], field='itemid', namespace=result['namespace'])}}" title="{{ _('ITEMID: %(itemid)s', itemid=result['itemid'])}}">
-                    {{result['itemid'] | shorten_id}}
-                </a>
-            <td>
-                <a href="{{  url_for_item(result['itemid'], field='itemid', namespace=result['namespace'])}}" title="{{ _('ITEMID: %(itemid)s', itemid=result['itemid'])}}">
-                    {{ result['summary'] }}
-                </a>
-            </td>
-            <td>
-                {{ _("Closed") if result['closed'] else _("Open") }}
-            </td>
-            <td>
-                {{ result.get('effort', '') }}
-            </td>
-            <td>
-                {{ result.get('difficulty', '') }}
-            </td>
-            <td>
-                {{ result.get('severity', '') }}
-            </td>
-            <td>
-                {{ result.get('priority', '') }}
-            </td>
-            <td>
-                {% for tag in result['tags'] %}
-                    {{ tag }}
+    {% set status_values = ['all', 'open', 'closed']  %}
+    {{_("Filter:")}}
+    {% for status_value in status_values %}
+        <form action="{{ url_for('frontend.tickets', selected_tags=list(), time_sorting=time_sorting if time_sorting) }}" method="post" class='moin-ticketsearch-form'>
+            <input type="hidden" name="q" value="" >
+            &nbsp;<input type="hidden" name="status" value="{{ status_value }}">
+            <input type="submit" value="{{ status_value.capitalize() }}" title="{{ _('Show %(status)s tickets', status=status_value) }}" class="{{ 'ticket-query-button active' if status == status_value  else 'ticket-query-button'}}">
+        </form>
+    {% endfor %}
+
+    <div class="tickets-sort-button dropdown">
+        <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
+            {% if time_sorting == 'new' %}
+                {% set sortedby = 'Recently updated' %}
+            {% elif time_sorting == 'old' %}
+                {% set sortedby = 'Least recently updated' %}
+            {% endif %}
+            {{_("Sort: %(sortedby)s", sortedby=sortedby if sortedby)}}
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+            <li role="presentation">
+                <form action="{{ url_for('frontend.tickets', selected_tags=list(selected_tags), time_sorting='new') }}" method="post">
+                    <input type="hidden" name="status" value="{{ status }}">
+                    <input type="hidden" name="q" value="{{ query if query }}" >
+                    <button type="submit">
+                        {{_("Recently updated")}}
+                    </button>
+                </form>
+            </li>
+            <li role="presentation">
+                <form action="{{ url_for('frontend.tickets', selected_tags=list(selected_tags), time_sorting='old') }}" method="post">
+                    <input type="hidden" name="status" value="{{ status }}">
+                    <input type="hidden" name="q" value="{{ query if query }}" >
+                    <button type="submit">
+                        {{_("Least Recently updated")}}
+                    </button>
+                </form>
+            </li>
+        </ul>
+    </div>
+
+    {# This is just a workaround for creating tickets #}
+    <a id="moin-ticket-create-link" href="{{ url_for('frontend.modify_item', itemtype='ticket', item_name='ticket_'+current_timestamp ) }}" >
+        <button class="btn btn-primary btn-lg btn-block">{{ _("Create ticket") }}</button>
+    </a>
+
+    <form action="{{ url_for('frontend.tickets',selected_tags=list(selected_tags), time_sorting=time_sorting if time_sorting) }}" method="post">
+        <input type="hidden" name="status" value="{{ status }}">
+        <input type="text" name="q" value="{{ query if query }}" id="moin-ticketsearch-query" class="form-control" placeholder="{{_('Find tickets')}}">
+    </form>
+
+    {% if results %}
+        <p>{{ _("%(result_len)d Tickets found.", result_len=results|length) }}</p>
+        <table class="table table-hover" id="ticket-list">
+            <thead>
+                <tr>
+                    <th id="ticket-itemid">{{_("ID")}}</th>
+                    <th id="ticket-summary">{{_("Summary")}}</th>
+                    <th id="ticket-status">{{_("Status")}}</th>
+                    <th id="ticket-effort" title="{{ _('Effort') }}">E</th>
+                    <th id="ticket-difficulty" title="{{ _('Difficulty') }}">D</th>
+                    <th id="ticket-severity" title="{{ _('Severity') }}">S</th>
+                    <th id="ticket-priority" title="{{ _('Priority') }}">P</th>
+                    <th id="ticket-tags">{{_("Tags")}}</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for result in results %}
+                    <tr>
+                        <td>
+                            <a href="{{  url_for_item(result['itemid'], field='itemid', namespace=result['namespace'])}}" title="{{ _('ITEMID: %(itemid)s', itemid=result['itemid'])}}">
+                                {{result['itemid'] | shorten_id}}
+                            </a>
+                        <td>
+                            <a href="{{  url_for_item(result['itemid'], field='itemid', namespace=result['namespace'])}}" title="{{ _('ITEMID: %(itemid)s', itemid=result['itemid'])}}">
+                                {{ result['summary'] }}
+                            </a>
+                        </td>
+                        <td>
+                            {{ _("Closed") if result['closed'] else _("Open") }}
+                        </td>
+                        <td>
+                            {{ result.get('effort', '') }}
+                        </td>
+                        <td>
+                            {{ result.get('difficulty', '') }}
+                        </td>
+                        <td>
+                            {{ result.get('severity', '') }}
+                        </td>
+                        <td>
+                            {{ result.get('priority', '') }}
+                        </td>
+                        <td>
+                            {% for tag in result['tags'] %}
+                                {{ tag }}
+                            {% endfor %}
+                        </td>
+                    </tr>
                 {% endfor %}
-            </td>
-        </tr>
-    {% endfor %}
-    </tbody>
-    </table>
+            </tbody>
+        </table>
 
-    <p id="ticket-table-tip">
-        {{_("Tip: Sort multiple columns simultaneously by holding down the Shift key and clicking on additional column headers!")}}
-    </p>
-{% else %}
-    {{ _("No Ticket found.") }}
-{% endif %}
+        <p id="ticket-table-tip">
+            {{_("Tip: Sort multiple columns simultaneously by holding down the Shift key and clicking on additional column headers!")}}
+        </p>
+    {% else %}
+        {{ _("No Ticket found.") }}
+    {% endif %}
 
-<h3 class="moin-ticket-tags">{{_("Tags")}}</h3>
-{% for tag in tags %}
-    {# If user clicks on the tag then it gets selected if it is not already selected #}
-    {# If that tag is already selected then it gets deselected #}
-    {% set selected_tags_value = list(selected_tags.difference([tag]) if tag in selected_tags else selected_tags.union([tag])) %}
-    <form action="{{ url_for('frontend.tickets', selected_tags=selected_tags_value, time_sorting=time_sorting if time_sorting) }}" method="post">
-        <input type="hidden" name="q" value="{{ query if query }}" >
-        <input type="hidden" name="status" value="{{ status }}">
-        <input type="submit" value="{{ tag }}" class="{{ 'ticket-tags-button btn btn-primary active' if tag in selected_tags else 'ticket-tags-button btn btn-default' }}">
-    </form>
-{% endfor %}
+    <h3 class="moin-ticket-tags">{{_("Tags")}}</h3>
+    {% for tag in tags %}
+        {# If user clicks on the tag then it gets selected if it is not already selected #}
+        {# If that tag is already selected then it gets deselected #}
+        {% set selected_tags_value = list(selected_tags.difference([tag]) if tag in selected_tags else selected_tags.union([tag])) %}
+        <form action="{{ url_for('frontend.tickets', selected_tags=selected_tags_value, time_sorting=time_sorting if time_sorting) }}" method="post">
+            <input type="hidden" name="q" value="{{ query if query }}" >
+            <input type="hidden" name="status" value="{{ status }}">
+            <input type="submit" value="{{ tag }}" class="{{ 'ticket-tags-button btn btn-primary active' if tag in selected_tags else 'ticket-tags-button btn btn-default' }}">
+        </form>
+    {% endfor %}
 
 {% endblock %}
 {% block body_scripts %}
-{{ super() }}
+    {{ super() }}
     <script src="{{ url_for('serve.files', name='jquery_tablesorter', filename='jquery.tablesorter.js') }}"></script>
     <script src="{{ url_for('static', filename='js/tickets.js') }}"></script>
 {% endblock %}
--- a/MoinMoin/templates/usersettings.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/usersettings.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,7 +2,7 @@
 {% import "usersettings_forms.html" as user_forms %}
 
 {% block content %}
-<h1>{{ _("User Settings") }}</h1>
-<div class="moin-tabs"></div> {# placeholder - javascript will append UL with clickable tabs here #}
-{{ user_forms.all_usersettings_forms(form_objs) }}
+    <h1>{{ _("User Settings") }}</h1>
+    <div class="moin-tabs"></div> {# placeholder - javascript will append UL with clickable tabs here #}
+    {{ user_forms.all_usersettings_forms(form_objs) }}
 {% endblock %}
--- a/MoinMoin/templates/usersettings_forms.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/usersettings_forms.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,129 +1,129 @@
 {% import "forms.html" as forms %}
 
 {% macro personal(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['name']) }}
-    {{ forms.render(form['display_name']) }}
-    {{ forms.render(form['openid']) }}
-    {{ forms.render(form['timezone']) }}
-    {{ forms.render(form['locale']) }}
-</dl>
-{{ forms.render_hidden('part', 'personal') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['name']) }}
+            {{ forms.render(form['display_name']) }}
+            {{ forms.render(form['openid']) }}
+            {{ forms.render(form['timezone']) }}
+            {{ forms.render(form['locale']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'personal') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 
 {% macro password(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['password_current']) }}
-    {{ forms.render(form['password1']) }}
-    {{ forms.render(form['password2']) }}
-</dl>
-{{ forms.render_hidden('part', 'password') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['password_current']) }}
+            {{ forms.render(form['password1']) }}
+            {{ forms.render(form['password2']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'password') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro notification(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{% if cfg.user_email_verification %}
-<p>{{ _("Changing your email address requires you to verify it. A link will be sent to you.") }}</p>
-{% endif %}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['email']) }}
-</dl>
-{{ forms.render_hidden('part', 'notification') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {% if cfg.user_email_verification %}
+            <p>{{ _("Changing your email address requires you to verify it. A link will be sent to you.") }}</p>
+        {% endif %}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['email']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'notification') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro ui(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['theme_name']) }}
-    {{ forms.render(form['css_url']) }}
-    {{ forms.render(form['edit_rows']) }}
-    {{ forms.render(form['results_per_page']) }}
-</dl>
-{{ forms.render_hidden('part', 'ui') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['theme_name']) }}
+            {{ forms.render(form['css_url']) }}
+            {{ forms.render(form['edit_rows']) }}
+            {{ forms.render(form['results_per_page']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'ui') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro navigation(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {# TODO: find a good way to handle quicklinks #}
-</dl>
-{{ forms.render_hidden('part', 'navigation') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {# TODO: find a good way to handle quicklinks #}
+        </dl>
+        {{ forms.render_hidden('part', 'navigation') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro options(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['mailto_author']) }}
-    {{ forms.render(form['edit_on_doubleclick']) }}
-    {{ forms.render(form['scroll_page_after_edit']) }}
-    {{ forms.render(form['show_comments']) }}
-    {{ forms.render(form['disabled']) }}
-</dl>
-{{ forms.render_hidden('part', 'options') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['mailto_author']) }}
+            {{ forms.render(form['edit_on_doubleclick']) }}
+            {{ forms.render(form['scroll_page_after_edit']) }}
+            {{ forms.render(form['show_comments']) }}
+            {{ forms.render(form['disabled']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'options') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro subscriptions(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {{ forms.render(form['subscriptions']) }}
-</dl>
-{{ forms.render_hidden('part', 'subscriptions') }}
-{{ forms.render_submit(form) }}
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {{ forms.render(form['subscriptions']) }}
+        </dl>
+        {{ forms.render_hidden('part', 'subscriptions') }}
+        {{ forms.render_submit(form) }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {# javascript functions within common.js are dependent upon the structure, classes and ids defined here #}
 {% macro all_usersettings_forms(form_objs) %}
-<div id="moin-usersettings">
-    <div id="personal" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#personal">{{ _("Personal") }}</a></h2>
-        {{ personal(form_objs.personal) }}
-    </div>
-    <div id="password" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#password">{{ _("Change Password") }}</a></h2>
-        {{ password(form_objs.password) }}
-    </div>
-    <div id="notification" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#notification">{{ _("Notifications") }}</a></h2>
-        {{ notification(form_objs.notification) }}
+    <div id="moin-usersettings">
+        <div id="personal" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#personal">{{ _("Personal") }}</a></h2>
+            {{ personal(form_objs.personal) }}
+        </div>
+        <div id="password" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#password">{{ _("Change Password") }}</a></h2>
+            {{ password(form_objs.password) }}
+        </div>
+        <div id="notification" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#notification">{{ _("Notifications") }}</a></h2>
+            {{ notification(form_objs.notification) }}
+        </div>
+        <div id="ui" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#ui">{{ _("Appearance") }}</a></h2>
+            {{ ui(form_objs.ui) }}
+        </div>
+        <div id="navigation" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#navigation">{{ _("Navigation") }}</a></h2>
+            {{ navigation(form_objs.navigation) }}
+        </div>
+        <div id="options" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#options">{{ _("Options") }}</a></h2>
+            {{ options(form_objs.options) }}
+        </div>
+        <div id="subscriptions" class="moin-tab-body moin-form">
+            <h2 class="moin-settings-head"><a href="#subscriptions">{{ _("Subscriptions") }}</a></h2>
+            {{ subscriptions(form_objs.subscriptions) }}
+        </div>
     </div>
-    <div id="ui" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#ui">{{ _("Appearance") }}</a></h2>
-        {{ ui(form_objs.ui) }}
-    </div>
-    <div id="navigation" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#navigation">{{ _("Navigation") }}</a></h2>
-        {{ navigation(form_objs.navigation) }}
-    </div>
-    <div id="options" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#options">{{ _("Options") }}</a></h2>
-        {{ options(form_objs.options) }}
-    </div>
-    <div id="subscriptions" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#subscriptions">{{ _("Subscriptions") }}</a></h2>
-        {{ subscriptions(form_objs.subscriptions) }}
-    </div>
-</div>
 {% endmacro %}
--- a/MoinMoin/templates/utils.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/templates/utils.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,61 +1,61 @@
 {% import 'forms.html' as forms %}
 
 {% macro show_editor_info(info) %}
-  {%- if info.uri -%}
-      <a href="{{ info.uri }}" class="{{ info.css }}" title="{{ info.title }}">
-  {%- elif info.email -%}
-      <a href="mailto:{{ info.email }}" class="{{ info.css }}" title="{{ info.title }}">
-  {%- else -%}
-      <span class="{{ info.css }}" title="{{ info.title }}">
-  {%- endif -%}
-  {{ info.text }}
-  {%- if info.uri or info.email -%}
-    </a>
-  {%- else -%}
-    </span>
-  {%- endif -%}
+    {%- if info.uri -%}
+        <a href="{{ info.uri }}" class="{{ info.css }}" title="{{ info.title }}">
+    {%- elif info.email -%}
+        <a href="mailto:{{ info.email }}" class="{{ info.css }}" title="{{ info.title }}">
+    {%- else -%}
+        <span class="{{ info.css }}" title="{{ info.title }}">
+    {%- endif -%}
+    {{ info.text }}
+    {%- if info.uri or info.email -%}
+        </a>
+    {%- else -%}
+        </span>
+    {%- endif -%}
 {% endmacro %}
 
 
 {% macro editor_info(meta) %}
-  {%- set info = get_editor_info(meta) -%}
-  {{ show_editor_info(info) }}
+    {%- set info = get_editor_info(meta) -%}
+    {{ show_editor_info(info) }}
 {% endmacro %}
 
 
 {% macro table(headings, rows, itemname_cols=[], url_cols=[], filesize_cols=[]) %}
-<table class="zebra table table-hover">
-<thead>
-    <tr>
-        {% for heading in headings %}
-            {% if rows and rows[0][loop.index0] is number %}
-                <th class="moin-integer">{{ heading }}</th>
-            {% else %}
-                <th>{{ heading }}</th>
-            {% endif %}
-        {% endfor %}
-    </tr>
-</thead>
-<tbody>
-{% for row in rows %}
-    <tr>
-        {% for col in row %}
-            {% if loop.index in filesize_cols %}
-                <td>{{ col|filesizeformat }}</td>
-            {% elif col is number %}
-                <td class="moin-integer">{{ col }}</td>
-            {% elif loop.index in itemname_cols %}
-                <td><a href="{{ url_for('frontend.show_item', item_name=col) }}">{{ col }}</a></td>
-            {% elif loop.index in url_cols %}
-                <td><a href="{{ col }}">{{ col }}</a></td>
-            {%- else -%}
-                <td>{{ col }}</td>
-            {% endif %}
-        {% endfor %}
-    </tr>
-{% endfor %}
-</tbody>
-</table>
+    <table class="zebra table table-hover">
+        <thead>
+            <tr>
+                {% for heading in headings %}
+                    {% if rows and rows[0][loop.index0] is number %}
+                        <th class="moin-integer">{{ heading }}</th>
+                    {% else %}
+                        <th>{{ heading }}</th>
+                    {% endif %}
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for row in rows %}
+                <tr>
+                    {% for col in row %}
+                        {% if loop.index in filesize_cols %}
+                            <td>{{ col|filesizeformat }}</td>
+                        {% elif col is number %}
+                            <td class="moin-integer">{{ col }}</td>
+                        {% elif loop.index in itemname_cols %}
+                            <td><a href="{{ url_for('frontend.show_item', item_name=col) }}">{{ col }}</a></td>
+                        {% elif loop.index in url_cols %}
+                            <td><a href="{{ col }}">{{ col }}</a></td>
+                        {%- else -%}
+                            <td>{{ col }}</td>
+                        {% endif %}
+                    {% endfor %}
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
 {% endmacro %}
 
 {% macro _render_subitem_navigation_tree(index, newtab, parentcaller) %}
@@ -105,7 +105,7 @@
 {% endmacro %}
 
 {% macro meta_info(meta) %}
-<!-- Bootstrap classes list-group and list-group-item used to display the metadata info in an unordered list -->
+    <!-- Bootstrap classes list-group and list-group-item used to display the metadata info in an unordered list -->
     <ul class="list-group">
         <li class="list-group-item">Action: {{ meta['action'] }}</li>
         <li class="list-group-item">Address: {{ meta['address'] }}</li>
@@ -113,55 +113,55 @@
         <li class="list-group-item">Content Type: {{ meta['contenttype']|shorten_ctype }} [{{ meta['contenttype'] }}]</li>
         <li class="list-group-item">Data ID: {{ meta['dataid'] }}</li>
         <li class="list-group-item">External Links:
-        {% if meta['externallinks'] %}
-            {% for item in meta['externallinks'] -%}
-                <a href="{{ item|safe }}">{{ item }}</a>
-                {%- if not loop.last -%},{% endif %}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['externallinks'] %}
+                {% for item in meta['externallinks'] -%}
+                    <a href="{{ item|safe }}">{{ item }}</a>
+                    {%- if not loop.last -%},{% endif %}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Item ID: {{ meta['itemid'] }}</li>
         <li class="list-group-item">Item Links:
-        {% if meta['itemlinks'] %}
-            {% for item in meta['itemlinks'] -%}
-                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
-                {%- if not loop.last -%},{% endif %}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['itemlinks'] %}
+                {% for item in meta['itemlinks'] -%}
+                    <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
+                    {%- if not loop.last -%},{% endif %}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Item Transclusions:
-        {% if meta['itemtransclusions'] %}
-            {% for item in meta['itemtransclusions'] -%}
-                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
-                {%- if not loop.last -%},{% endif %}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['itemtransclusions'] %}
+                {% for item in meta['itemtransclusions'] -%}
+                    <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
+                    {%- if not loop.last -%},{% endif %}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Item Type: {{ meta['itemtype'] }}</li>
         <li class="list-group-item">Modified Time: {{ meta['mtime']|datetimeformat }}</li>
         <li class="list-group-item">Name:
-        {% if meta['name'] %}
-            {% for name in meta['name'] %}
-                {{ name }}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['name'] %}
+                {% for name in meta['name'] %}
+                    {{ name }}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Old Name:
-        {% if meta['name_old'] %}
-            {% for name in meta['name_old'] %}
-                {{ name }}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['name_old'] %}
+                {% for name in meta['name_old'] %}
+                    {{ name }}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Namespace: '{{ meta['namespace'] }}'</li>
         <li class="list-group-item">Revision ID: {{ meta['revid'] }}</li>
@@ -169,13 +169,13 @@
         <li class="list-group-item">Size: {{ meta['size']|filesizeformat }}</li>
         <li class="list-group-item">Summary: '{{ meta['summary'] }}'</li>
         <li class="list-group-item">Tags:
-        {% if meta['tags'] %}
-            {% for tag in meta['tags'] %}
-                {{ tag }}
-            {% endfor %}
-        {% else %}
-            (None)
-        {% endif %}
+            {% if meta['tags'] %}
+                {% for tag in meta['tags'] %}
+                    {{ tag }}
+                {% endfor %}
+            {% else %}
+                (None)
+            {% endif %}
         </li>
         <li class="list-group-item">Wiki Name: {{ meta['wikiname'] }}</li>
     </ul>
--- a/MoinMoin/themes/basic/templates/delete.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/delete.html	Sun Aug 24 08:39:32 2014 -0700
@@ -4,21 +4,21 @@
 {% set title = _("Delete '%(item_name)s'", item_name=item.name) %}
 
 {% block content %}
-<h2>{{ title }}</h2>
-<div class="row">
-    <div class="col-lg-5">
-        {{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=item.name)) }}
-        {{ forms.render_errors(form) }}
+    <h2>{{ title }}</h2>
+    <div class="row">
+        <div class="col-lg-5">
+            {{ gen.form.open(form, method="post", action=url_for('frontend.delete_item', item_name=item.name)) }}
+                {{ forms.render_errors(form) }}
 
-        <div class="form-group">
-            {{ forms.render_textcha(gen, form) }}
-            {{ gen.input(form['comment'], type="text", class="form-control") }}
-        </div>
+                <div class="form-group">
+                    {{ forms.render_textcha(gen, form) }}
+                    {{ gen.input(form['comment'], type="text", class="form-control") }}
+                </div>
 
-        <div class="form-group">
-            {{ forms.render_submit(form, class='btn btn-primary') }}
+                <div class="form-group">
+                    {{ forms.render_submit(form, class='btn btn-primary') }}
+                </div>
+            {{ gen.form.close() }}
         </div>
-        {{ gen.form.close() }}
     </div>
-</div>
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/destroy.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/destroy.html	Sun Aug 24 08:39:32 2014 -0700
@@ -4,43 +4,43 @@
 {% set title = _("DESTROY COMPLETE ITEM '%(item_name)s'", item_name=item.name) %}
 
 {% block content %}
-{% if rev_id == None %}
-  <h2>{{ title }}</h2>
-  <div class="row">
-    <div class="col-lg-5">
-
-      {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=item.name)) }}
-      {{ forms.render_errors(form) }}
-
-      <div class="form-group">
-          {{ forms.render_textcha(gen, form) }}
-          {{ gen.input(form['comment'], type="text", class="form-control") }}
-      </div>
+    {% if rev_id == None %}
+        <h2>{{ title }}</h2>
+        <div class="row">
+            <div class="col-lg-5">
 
-      <div class="form-group">
-        {{ forms.render_submit(form, class='btn btn-primary') }}
-      </div>
-      {{ gen.form.close() }}
-    </div>
-  </div>
-{% else %}
-  <h2>{{ _("DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)", item_name=item.name, rev_id=rev_id | shorten_id) }}</h2>
-  <div class="row">
-    <div class="col-lg-5">
-      {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=item.name, rev=rev_id)) }}
-      {{ forms.render_errors(form) }}
+                {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=item.name)) }}
+                    {{ forms.render_errors(form) }}
 
-      <div class="form-group">
-        {{ gen.label(form['comment']) }}
-        {{ gen.textarea(form['comment'], rows='1', class='form-control') }}
-      </div>
-      {{ forms.render_textcha(gen, form) }}
+                    <div class="form-group">
+                        {{ forms.render_textcha(gen, form) }}
+                        {{ gen.input(form['comment'], type="text", class="form-control") }}
+                    </div>
 
-      <div class="form-group">
-        {{ forms.render_submit(form, class='btn btn-primary') }}
-      </div>
-      {{ gen.form.close() }}
-    </div>
-  </div>
-{% endif %}
+                    <div class="form-group">
+                        {{ forms.render_submit(form, class='btn btn-primary') }}
+                    </div>
+                {{ gen.form.close() }}
+            </div>
+        </div>
+    {% else %}
+        <h2>{{ _("DESTROY REVISION '%(item_name)s' (rev %(rev_id)s)", item_name=item.name, rev_id=rev_id | shorten_id) }}</h2>
+        <div class="row">
+            <div class="col-lg-5">
+                {{ gen.form.open(form, method="post", action=url_for('frontend.destroy_item', item_name=item.name, rev=rev_id)) }}
+                    {{ forms.render_errors(form) }}
+
+                    <div class="form-group">
+                        {{ gen.label(form['comment']) }}
+                        {{ gen.textarea(form['comment'], rows='1', class='form-control') }}
+                    </div>
+                    {{ forms.render_textcha(gen, form) }}
+
+                    <div class="form-group">
+                        {{ forms.render_submit(form, class='btn btn-primary') }}
+                    </div>
+                {{ gen.form.close() }}
+            </div>
+        </div>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/diff.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/diff.html	Sun Aug 24 08:39:32 2014 -0700
@@ -6,11 +6,11 @@
 {% endblock %}
 
 {% block content %}
-{% block headline %}
-<i class="icon-chevron-sign-left">
-    <a href="{{ url_for('frontend.history', item_name=item_name) }}"> {{ _("Back") }} </a>
-</i>
-<h2>{{ _("Diff for '%(item_name)s'", item_name=newrev.item.name) }}</h2>
+    {% block headline %}
+        <i class="icon-chevron-sign-left">
+            <a href="{{ url_for('frontend.history', item_name=item_name) }}"> {{ _("Back") }} </a>
+        </i>
+        <h2>{{ _("Diff for '%(item_name)s'", item_name=newrev.item.name) }}</h2>
+    {% endblock %}
+    {{ diff_html }}
 {% endblock %}
-{{ diff_html }}
-{% endblock %}
--- a/MoinMoin/themes/basic/templates/highlight.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/highlight.html	Sun Aug 24 08:39:32 2014 -0700
@@ -3,8 +3,8 @@
 {% set title = _("Syntax highlighting of '%(name)s'", name=item_name) %}
 
 {% block content %}
-{% block headline %}
-<h1>{{ title }} </h1>
+    {% block headline %}
+        <h1>{{ title }} </h1>
+    {% endblock %}
+    {{ data_text }}
 {% endblock %}
-{{ data_text }}
-{% endblock %}
--- a/MoinMoin/themes/basic/templates/history.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/history.html	Sun Aug 24 08:39:32 2014 -0700
@@ -5,108 +5,108 @@
 {% set title = _("History of '%(item_name)s'", item_name=item_name) %}
 
 {% block views %}
-{{ itemviews }}
+    {{ itemviews }}
 {% endblock %}
 
 {% block content %}
     {% set (history, next_offset, previous_offset) = history_page %}
     {% if history %}
-    <div>
-        {% if previous_offset >= 0 %}
-            <a href="{{ url_for('frontend.history', item_name=item_name, offset=previous_offset) }}" title="{{ _("Previous") }}">&laquo;</a>
-        {% endif %}
-        {% if next_offset %}
-            <a href="{{ url_for('frontend.history', item_name=item_name, offset=next_offset) }}" title="{{ _("Next") }}">&raquo;</a>
-        {% endif %}
-    </div>
-    <h1>{{ title }}</h1>
-    <form action="{{ url_for('frontend.diff', item_name=item_name) }}" method="GET">
         <div>
-        <table class="table table-hover table-condensed">
-            <thead>
-                <tr>
-                    <th>{{ _("Name") }}</th>
-                    <th>{{ _("Rev.") }}</th>
-                    <th>{{ _("Timestamp") }}</th>
-                    <th id="moin-button-diff"><button class="btn btn-sm btn-primary">Diff</button></th>
-                    <th>{{ _("Editor") }}</th>
-                    <th>{{ _("Comment") }}</th>
-                    <th></th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for doc in history %}
-                <tr>
-                    <td>{{ doc.name|join(' | ') }}</td>
-                    <td title="{{ _("Size") }}: {{ doc.size }} &#10;{{ doc.contenttype|shorten_ctype }}: {{ doc.contenttype }}" >
-                        {{ doc.revid | shorten_id }}
-                    </td>
-                    <td>{{ doc.mtime|datetimeformat }}</td>
-                    <td>
-                        <div class="moin-hist-rev">
-                            <input type="radio" name="rev1" value="{{ doc.revid }}" />
-                            <input type="radio" name="rev2" value="{{ doc.revid }}" />
-                        </div>
-                    </td>
-                    <td>{{ utils.editor_info(doc) }}</td>
-                    <td>{{ doc.comment }}</td>
-                    <td>
-            <div class="btn-group dropup menu">
-                        <button class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" type="button">
-                            <span class="caret"></span>
-                        </button>
-                <ul class="dropdown-menu pull-right submenu">
-                    <li>
-                        <a href="{{ url_for('frontend.show_item', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('show') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url_for('frontend.show_item_meta', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('meta') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url_for('frontend.download_item', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('download') }}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{{ url_for('frontend.highlight_item', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('highlight') }}
-                        </a>
-                    </li>
-                    {% if user.may.write(item_name) -%}
-                    <li>
-                        <a href="{{ url_for('frontend.revert_item', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('revert') }}
-                        </a>
-                    </li>
-                    {%- endif %}
-                    {% if user.may.destroy(item_name) -%}
-                    <li>
-                        <a href="{{ url_for('frontend.destroy_item', item_name=doc.name[0], rev=doc.revid) }}">
-                            {{ _('destroy') }}
-                        </a>
-                    </li>
-                    {%- endif %}
-                </ul>
-                </div>
-            </td>
-            </tr>
-                {% endfor %}
-            </tbody>
-            {% if bookmark_time %}
-            <tfoot>
-                <tr>
-                    <td colspan="2">Bookmark is set to</td>
-                    <td>{{ bookmark_time|datetimeformat }}</td>
-                    <td colspan="11"></td>
-                </tr>
-            </tfoot>
+            {% if previous_offset >= 0 %}
+                <a href="{{ url_for('frontend.history', item_name=item_name, offset=previous_offset) }}" title="{{ _("Previous") }}">&laquo;</a>
             {% endif %}
-        </table>
+            {% if next_offset %}
+                <a href="{{ url_for('frontend.history', item_name=item_name, offset=next_offset) }}" title="{{ _("Next") }}">&raquo;</a>
+            {% endif %}
         </div>
-    </form>
+        <h1>{{ title }}</h1>
+        <form action="{{ url_for('frontend.diff', item_name=item_name) }}" method="GET">
+            <div>
+                <table class="table table-hover table-condensed">
+                    <thead>
+                        <tr>
+                            <th>{{ _("Name") }}</th>
+                            <th>{{ _("Rev.") }}</th>
+                            <th>{{ _("Timestamp") }}</th>
+                            <th id="moin-button-diff"><button class="btn btn-sm btn-primary">Diff</button></th>
+                            <th>{{ _("Editor") }}</th>
+                            <th>{{ _("Comment") }}</th>
+                            <th></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for doc in history %}
+                            <tr>
+                                <td>{{ doc.name|join(' | ') }}</td>
+                                <td title="{{ _("Size") }}: {{ doc.size }} &#10;{{ doc.contenttype|shorten_ctype }}: {{ doc.contenttype }}" >
+                                    {{ doc.revid | shorten_id }}
+                                </td>
+                                <td>{{ doc.mtime|datetimeformat }}</td>
+                                <td>
+                                    <div class="moin-hist-rev">
+                                        <input type="radio" name="rev1" value="{{ doc.revid }}" />
+                                        <input type="radio" name="rev2" value="{{ doc.revid }}" />
+                                    </div>
+                                </td>
+                                <td>{{ utils.editor_info(doc) }}</td>
+                                <td>{{ doc.comment }}</td>
+                                <td>
+                                    <div class="btn-group dropup menu">
+                                        <button class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" type="button">
+                                            <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu pull-right submenu">
+                                            <li>
+                                                <a href="{{ url_for('frontend.show_item', item_name=doc.name[0], rev=doc.revid) }}">
+                                                    {{ _('show') }}
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="{{ url_for('frontend.show_item_meta', item_name=doc.name[0], rev=doc.revid) }}">
+                                                    {{ _('meta') }}
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="{{ url_for('frontend.download_item', item_name=doc.name[0], rev=doc.revid) }}">
+                                                    {{ _('download') }}
+                                                </a>
+                                            </li>
+                                            <li>
+                                                <a href="{{ url_for('frontend.highlight_item', item_name=doc.name[0], rev=doc.revid) }}">
+                                                    {{ _('highlight') }}
+                                                </a>
+                                            </li>
+                                            {% if user.may.write(item_name) -%}
+                                                <li>
+                                                    <a href="{{ url_for('frontend.revert_item', item_name=doc.name[0], rev=doc.revid) }}">
+                                                        {{ _('revert') }}
+                                                    </a>
+                                                </li>
+                                            {%- endif %}
+                                            {% if user.may.destroy(item_name) -%}
+                                                <li>
+                                                    <a href="{{ url_for('frontend.destroy_item', item_name=doc.name[0], rev=doc.revid) }}">
+                                                        {{ _('destroy') }}
+                                                    </a>
+                                                </li>
+                                            {%- endif %}
+                                        </ul>
+                                    </div>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                    {% if bookmark_time %}
+                        <tfoot>
+                            <tr>
+                                <td colspan="2">Bookmark is set to</td>
+                                <td>{{ bookmark_time|datetimeformat }}</td>
+                                <td colspan="11"></td>
+                            </tr>
+                        </tfoot>
+                    {% endif %}
+                </table>
+            </div>
+        </form>
     {% endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/index.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/index.html	Sun Aug 24 08:39:32 2014 -0700
@@ -28,22 +28,22 @@
                            {{ _("New Item") }}</a>
                     </li>
                     {% if dirs or files %}
-                    <li><a id="moin-download-trigger" href="#">
-                           <span class="icon-download-alt"></span>
-                           {{ _("Download") }}</a>
-                    </li>
-                    <li><a class="moin-action-tab"
-                           id="moin-delete-trigger"
-                           data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}" href="#">
-                           <span class="icon-minus-sign"></span>
-                           {{ _("Delete") }}</a>
-                    </li>
-                    <li><a class="moin-action-tab"
-                           id="moin-destroy-trigger"
-                           data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}" href="#">
-                           <span class="icon-remove-sign"></span>
-                           {{ _("Destroy") }}</a>
-                    </li>
+                        <li><a id="moin-download-trigger" href="#">
+                               <span class="icon-download-alt"></span>
+                               {{ _("Download") }}</a>
+                        </li>
+                        <li><a class="moin-action-tab"
+                               id="moin-delete-trigger"
+                               data-actionurl="{{ url_for('frontend.ajaxdelete', item_name=item_name) }}" href="#">
+                               <span class="icon-minus-sign"></span>
+                               {{ _("Delete") }}</a>
+                        </li>
+                        <li><a class="moin-action-tab"
+                               id="moin-destroy-trigger"
+                               data-actionurl="{{ url_for('frontend.ajaxdestroy', item_name=item_name) }}" href="#">
+                               <span class="icon-remove-sign"></span>
+                               {{ _("Destroy") }}</a>
+                        </li>
                    {% endif %}
                 </ul>
             </div>
@@ -56,20 +56,20 @@
         </div>
         {% set unknown_items_label = _("items having unknown mime types") %}
         {{ gen.form.open(form, method="get", action=url_for('frontend.index', item_name=item_name)) }}
-        <ul>
-            <li class="filters">
-                <a href="#" class="filter-toggle">
-                    <span class="icon-refresh" style="display:inline;"></span>
-                    {{ _("Toggle") }}
-                </a>
-                <a href="#" class="filter-more">
-                    <span class="icon-plus" style="display:inline;"></span>
-                    {{ _("More") }}
-                </a>
-            </li>
-            {{ forms.render(form['contenttype']) }}
-        </ul>
-        {{ forms.render_submit(form) }}
+            <ul>
+                <li class="filters">
+                    <a href="#" class="filter-toggle">
+                        <span class="icon-refresh" style="display:inline;"></span>
+                        {{ _("Toggle") }}
+                    </a>
+                    <a href="#" class="filter-more">
+                        <span class="icon-plus" style="display:inline;"></span>
+                        {{ _("More") }}
+                    </a>
+                </li>
+                {{ forms.render(form['contenttype']) }}
+            </ul>
+            {{ forms.render_submit(form) }}
         {{ gen.form.close() }}
     </div>
 {% endblock %}
@@ -128,116 +128,116 @@
     <div class="moin-index-message"><span></span></div>
     {{ self.action_bars() }}
     <div>
-    {% if item_name: %}
-        <h1>{{ title }}</h1>
-        <div class="moin-index-path">
-            <span class="icon icon-folder-close"></span>
-            <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
-            <span class="moin-path-separator">{{ ("/") }}</span>
-            {% for i in range(0, item_names|count) %}
-                {% set fullname = item_names[:i+1]|join('/') %}
-                {% set relname = item_names[i] %}
-                <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
+        {% if item_name: %}
+            <h1>{{ title }}</h1>
+            <div class="moin-index-path">
+                <span class="icon icon-folder-close"></span>
+                <a href="{{ url_for('frontend.index') }}" title="{{ _("Global Index") }}">{{ ("..") }}</a>
                 <span class="moin-path-separator">{{ ("/") }}</span>
-            {% endfor %}
-        </div>
-    {% else %}
-        <h1>{{ title }}</h1>
-    {% endif %}
+                {% for i in range(0, item_names|count) %}
+                    {% set fullname = item_names[:i+1]|join('/') %}
+                    {% set relname = item_names[i] %}
+                    <a href="{{ url_for('frontend.index', item_name=fullname) }}" title="{{ relname }}">{{ relname }}</a>
+                    <span class="moin-path-separator">{{ ("/") }}</span>
+                {% endfor %}
+            </div>
+        {% else %}
+            <h1>{{ title }}</h1>
+        {% endif %}
     </div>
     <div class='moin-clr'></div>
-    <div id="moin-new-index" class="moin-item-index">
-        <h3 style="display: none;">{{ _("Recently uploaded items") }}</h3>
-        <div class="file_download_template" style="display: none;">
-            <a></a>
-        </div>
-    </div>
-    <div class="moin-index-separator"></div>
-    {% if files or dirs %}
-    <div id="moin-initials">
-        {% if not startswith %}
-            <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">
-                <span class="icon-th"></span>
-                {{ _("Show All") }}
-            </a>
-        {% else %}
-            <a href="{{ url_for('frontend.index', item_name=item_name) }}">
-                <span class="icon-th"></span>
-                {{ _("Show All") }}
-            </a>
-        {% endif %}
-        {% for initial in initials %}
-            {% if startswith == initial %}
-                <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
-            {% else %}
-                <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
-            {% endif %}
-        {% endfor %}
-    </div>
-    {% if dirs %}
-        <div class="moin-item-index">
-            <p>{{ _("These items have subitems that match your filter:") }}</p>
-            {% for e in dirs %}
-                {{ render_dir_entry(e) }}
-            {% endfor %}
-        </div>
-        <div class="moin-clr"></div>
-        <hr />
-    {% endif %}
-    {% if files %}
-        <div class="moin-item-index">
-            {% for e in files %}
-                {{ render_file_entry(e) }}
-            {% endfor %}
-        </div>
-        <div class="moin-clr"></div>
-    {% endif %}
-    {% endif %}
-    <div id="popup">
-        <div id="popup-for-action" class="popup-container">
-            <div class="popup-header">
-                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
-                <span>{{ _("Please provide comment for this action") }}</span>
-            </div>
-            <div class="popup-body">
-                <input type="text" class="popup-comment" placeholder="{{ _("Enter your comment") }}"/>
-                <input type="hidden" class="popup-action" value=""/>
-                <br/>
-                <input type="button" class="popup-submit" value="{{ _("Submit") }}"/>
-                <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
+        <div id="moin-new-index" class="moin-item-index">
+            <h3 style="display: none;">{{ _("Recently uploaded items") }}</h3>
+            <div class="file_download_template" style="display: none;">
+                <a></a>
             </div>
         </div>
-        <div id="popup-for-newitem" class="popup-container">
-            <div class="popup-header">
-                <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
-                <span>{{ _("Create new item") }}</span>
+    <div class="moin-index-separator"></div>
+        {% if files or dirs %}
+            <div id="moin-initials">
+                {% if not startswith %}
+                    <a class="selected" href="{{ url_for('frontend.index', item_name=item_name) }}">
+                        <span class="icon-th"></span>
+                        {{ _("Show All") }}
+                    </a>
+                {% else %}
+                    <a href="{{ url_for('frontend.index', item_name=item_name) }}">
+                        <span class="icon-th"></span>
+                        {{ _("Show All") }}
+                    </a>
+                {% endif %}
+                {% for initial in initials %}
+                    {% if startswith == initial %}
+                        <a class="selected" href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                    {% else %}
+                        <a href="{{ url_for('frontend.index', item_name=item_name, startswith=initial) }}">{{ initial }}</a>
+                    {% endif %}
+                {% endfor %}
             </div>
-            <div class="popup-body">
-                <form action={{ url_for('.ajaxmodify') }} method="post">
-                    <label for="moin-newitem">{{ _("Item name") }}</label>
-                    {% if item_name %}
-                        <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
-                    {% else %}
-                        <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
-                    {% endif %}
+            {% if dirs %}
+                <div class="moin-item-index">
+                    <p>{{ _("These items have subitems that match your filter:") }}</p>
+                        {% for e in dirs %}
+                            {{ render_dir_entry(e) }}
+                        {% endfor %}
+                </div>
+                <div class="moin-clr"></div>
+                <hr />
+            {% endif %}
+            {% if files %}
+                <div class="moin-item-index">
+                    {% for e in files %}
+                        {{ render_file_entry(e) }}
+                    {% endfor %}
+                </div>
+                <div class="moin-clr"></div>
+            {% endif %}
+        {% endif %}
+        <div id="popup">
+            <div id="popup-for-action" class="popup-container">
+                <div class="popup-header">
+                    <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
+                    <span>{{ _("Please provide comment for this action") }}</span>
+                </div>
+                <div class="popup-body">
+                    <input type="text" class="popup-comment" placeholder="{{ _("Enter your comment") }}"/>
+                    <input type="hidden" class="popup-action" value=""/>
                     <br/>
-                    <input type="submit" value="{{ _("Create") }}"/>
+                    <input type="button" class="popup-submit" value="{{ _("Submit") }}"/>
                     <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
-                </form>
+                </div>
+            </div>
+            <div id="popup-for-newitem" class="popup-container">
+                <div class="popup-header">
+                    <input type="button" class="popup-closer popup-cancel" value="{{ _("X") }}" title="{{ _("Close") }}"/>
+                    <span>{{ _("Create new item") }}</span>
+                </div>
+                <div class="popup-body">
+                    <form action={{ url_for('.ajaxmodify') }} method="post">
+                        <label for="moin-newitem">{{ _("Item name") }}</label>
+                        {% if item_name %}
+                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" value="{{ item_name }}/" required="required"/>
+                        {% else %}
+                            <input type="text" id="moin-newitem" name="newitem" placeholder="{{ _("Enter item name here") }}" required="required"/>
+                        {% endif %}
+                        <br/>
+                        <input type="submit" value="{{ _("Create") }}"/>
+                        <input type="button" class="popup-cancel" value="{{ _("Cancel") }}"/>
+                    </form>
+                </div>
             </div>
         </div>
-    </div>
 
     <div id="moin-upload-cont">
-    {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
-    {{ forms.render_file_uploader(submit_url) }}
+        {% set submit_url = url_for('.jfu_server', item_name=item_name) %}
+        {{ forms.render_file_uploader(submit_url) }}
     </div>
     <span class="moin-drag">{{ _("(Drag and drop multiple files to this white area to upload them.)") }}</span>
     <div id="lightbox">&nbsp;</div>
 {% endblock %}
 
 {% block body_scripts %}
-{{ super() }}
+    {{ super() }}
     <script src="{{ url_for('static', filename='js/index_action.js') }}"></script>
     <script src="{{ url_for('static', filename='js/jfu.js') }}"></script>
     {{ forms.file_uploader_scripts() }}
--- a/MoinMoin/themes/basic/templates/itemviews.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/itemviews.html	Sun Aug 24 08:39:32 2014 -0700
@@ -5,19 +5,19 @@
 
 {% block views %}
     {% if navtabs %}
-    <div class="row">
-      <div class="col-lg-12">
-        <ul class="moin-nav nav-tabs moin-shadow">
-          {% for endpoint, href, maincls, iconcls, linkcls, title, label in navtabs %}
-            <li {% if maincls %}class="{{ maincls }}"{% endif %}>
-                <a {% if linkcls %}class="{{ linkcls }}"{% endif %} href="{{ href }}" title="{{ title }}" rel="nofollow">
-                  <span class="{{ iconcls }}"></span>
-                    {{ label }}
-                </a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <ul class="moin-nav nav-tabs moin-shadow">
+                    {% for endpoint, href, maincls, iconcls, linkcls, title, label in navtabs %}
+                        <li {% if maincls %}class="{{ maincls }}"{% endif %}>
+                            <a {% if linkcls %}class="{{ linkcls }}"{% endif %} href="{{ href }}" title="{{ title }}" rel="nofollow">
+                                <span class="{{ iconcls }}"></span>
+                                {{ label }}
+                            </a>
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
     {% endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/layout.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Sun Aug 24 08:39:32 2014 -0700
@@ -24,13 +24,13 @@
     <a href="{{ href }}"
         {% if not exists %} class="moin-nonexistent {% if mainclass %}{{ mainclass }} {% endif %}"
         {% else %}
-        {% if mainclass %}
-            class="{{ mainclass }}{% if current_url == href %} active{% endif %}"
-        {% elif current_url == href %}
-            class="active"
-        {% elif current_path == href %}
-            class="active"
-        {% endif %}
+            {% if mainclass %}
+                class="{{ mainclass }}{% if current_url == href %} active{% endif %}"
+            {% elif current_url == href %}
+                class="active"
+            {% elif current_path == href %}
+                class="active"
+            {% endif %}
         {% endif %}
         rel="nofollow"
         {% if title %} title="{{ title }}" {% endif %}>
@@ -44,9 +44,9 @@
         <div class="row moin-header">
             <div class="col-lg-2 moin-logo">
                 {% if logo %}
-                <a href="{{ url_for('frontend.show_item', item_name=cfg.item_root) }}">
-                    <img class="img-circle" src="{{ '/static/logos/moinmoin.png' }}" alt="Site Logo"/>
-                </a>
+                    <a href="{{ url_for('frontend.show_item', item_name=cfg.item_root) }}">
+                        <img class="img-circle" src="{{ '/static/logos/moinmoin.png' }}" alt="Site Logo"/>
+                    </a>
                 {% endif %}
             </div>
             <div class="col-lg-10">
@@ -74,7 +74,7 @@
                                         <ul class="nav navbar-nav moin-pull-right">
 
                                             {% if user.valid -%}
-                                            {% set avatar = user.avatar(20) %}
+                                                {% set avatar = user.avatar(20) %}
                                                 {% if avatar %}
                                                     <li><img id="moin-avatar" src="{{ avatar }}" /></li>
                                                 {%- endif %}
@@ -128,71 +128,71 @@
                 <div class="row">
                     <div class="col-lg-12">
                         <ul class="moin-breadcrumb">
-                        {% set trail_items = theme_supp.path_breadcrumbs() %}
-                        {% if trail_items %}
-                            {% for wiki_name, fqname, item_href, exists, err in trail_items %}
-                            {% if not loop.last %}
-                                <li>
-                                    {%- if wiki_name -%}
-                                        <a href="{{ item_href }}"{{ " " }}
-                                            title="{{ wiki_name }}"
-                                            class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
-                                            {{ fqname|shorten_fqname }}
-                                        </a>
-                                        <i class="icon-double-angle-right icon-fixed-width"></i>
-                                    {%- else -%}
-                                        <a href="{{ url_for('frontend.show_item', item_name=fqname) }}"{{ " " }}
-                                            {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
-                                            {{ fqname|shorten_fqname }}
-                                        </a>
-                                        <i class="icon-double-angle-right icon-fixed-width"></i>
-                                    {%- endif %}
-                                    <ul class="moin-bcs-subitems">
-                                        {% for fq_name in theme_supp.get_fqnames(fqname) -%}
-                                            <li>
-                                                <a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">
-                                                    {{ fq_name|shorten_fqname(length=25) }}
+                            {% set trail_items = theme_supp.path_breadcrumbs() %}
+                            {% if trail_items %}
+                                {% for wiki_name, fqname, item_href, exists, err in trail_items %}
+                                    {% if not loop.last %}
+                                        <li>
+                                            {%- if wiki_name -%}
+                                                <a href="{{ item_href }}"{{ " " }}
+                                                    title="{{ wiki_name }}"
+                                                    class="{% if err %}moin-badinterwiki{% else %}moin-interwiki{% endif %}">
+                                                    {{ fqname|shorten_fqname }}
                                                 </a>
-                                            </li>
-                                        {%- endfor %}
-                                    </ul>
-                                </li>
-                            {% else %}
-                                <li>
-                                    <h4 class="moin-location-breadcrumb">
-                                    {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(fqname) -%}
-                                        {% if loop.first %}
-                                            <small>~ /</small>
-                                        {% elif not loop.last %}
-                                            <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                                                {{ segment_name|shorten_fqname }}
-                                            </a>
-                                        <small>/</small>
-                                        {%- endif %}
-                                        {% if loop.last %}
-                                            {% if title_name %}
-                                                {{ title_name }}
-                                            {% else %}
-                                                <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
-                                                    {{ segment_name|shorten_fqname }}
-                                            </a>
+                                                <i class="icon-double-angle-right icon-fixed-width"></i>
+                                            {%- else -%}
+                                                <a href="{{ url_for('frontend.show_item', item_name=fqname) }}"{{ " " }}
+                                                    {% if not exists -%}class="moin-nonexistent"{%- endif -%}>
+                                                    {{ fqname|shorten_fqname }}
+                                                </a>
+                                                <i class="icon-double-angle-right icon-fixed-width"></i>
                                             {%- endif %}
-                                        {%- endif %}
-                                    {% endfor %}
-                                    </h4>
-                                    <ul class="moin-bcs-subitems">
-                                        {% for fq_name in theme_supp.get_fqnames(fqname) -%}
-                                            <li>
-                                                <a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">
-                                                    {{ fq_name|shorten_fqname(length=25) }}
-                                                </a>
-                                            </li>
-                                        {%- endfor %}
-                                    </ul>
-                                </li>
+                                            <ul class="moin-bcs-subitems">
+                                                {% for fq_name in theme_supp.get_fqnames(fqname) -%}
+                                                    <li>
+                                                        <a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">
+                                                            {{ fq_name|shorten_fqname(length=25) }}
+                                                        </a>
+                                                    </li>
+                                                {%- endfor %}
+                                            </ul>
+                                        </li>
+                                    {% else %}
+                                        <li>
+                                            <h4 class="moin-location-breadcrumb">
+                                                {% for segment_name, segment_path, exists in theme_supp.location_breadcrumbs(fqname) -%}
+                                                    {% if loop.first %}
+                                                        <small>~ /</small>
+                                                    {% elif not loop.last %}
+                                                        <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
+                                                            {{ segment_name|shorten_fqname }}
+                                                        </a>
+                                                        <small>/</small>
+                                                    {%- endif %}
+                                                    {% if loop.last %}
+                                                        {% if title_name %}
+                                                            {{ title_name }}
+                                                        {% else %}
+                                                            <a href="{{ url_for('frontend.show_item', item_name=segment_path) }}" {% if not exists %}class="moin-nonexistent"{% endif %}>
+                                                                {{ segment_name|shorten_fqname }}
+                                                            </a>
+                                                        {%- endif %}
+                                                    {%- endif %}
+                                                {% endfor %}
+                                            </h4>
+                                            <ul class="moin-bcs-subitems">
+                                                {% for fq_name in theme_supp.get_fqnames(fqname) -%}
+                                                    <li>
+                                                        <a href="{{ url_for('frontend.show_item', item_name=fq_name) }}">
+                                                            {{ fq_name|shorten_fqname(length=25) }}
+                                                        </a>
+                                                    </li>
+                                                {%- endfor %}
+                                            </ul>
+                                        </li>
+                                    {% endif %}
+                                {% endfor %}
                             {% endif %}
-                            {% endfor %}
-                        {% endif %}
 
                         </ul><!-- complete list of breadcrumbs -->
                     </div>
@@ -209,19 +209,19 @@
                             {% set quicklinks = 'false' %}
                             {% if navibar_items %}
 
-                            <div class="list-group-item moin-list-heading"> {{ _("Site Navigation") }} </div>
-                            {% for cls, url, text, title in navibar_items if cls != 'userlink' %}
-                                <a class="list-group-item {{ cls }}
-                                    {% if url in [current_url, current_path, current_url_showview] %} active{% endif %}" href="{{ url }}"
-                                    {% if title %}title="{{ title }}"{% endif %}>
-                                    {{ text|shorten_item_name }}
-                                </a>
-                            {% endfor %}
+                                <div class="list-group-item moin-list-heading"> {{ _("Site Navigation") }} </div>
+                                {% for cls, url, text, title in navibar_items if cls != 'userlink' %}
+                                    <a class="list-group-item {{ cls }}
+                                        {% if url in [current_url, current_path, current_url_showview] %} active{% endif %}" href="{{ url }}"
+                                        {% if title %}title="{{ title }}"{% endif %}>
+                                        {{ text|shorten_item_name }}
+                                    </a>
+                                {% endfor %}
 
-                            {% if item_navigation %}
-                            <div class="list-group-item moin-list-heading"> {{ _("Supplementation") }} </div>
-                            {{ local_panel_main(item_navigation) }}
-                            {% endif %}
+                                {% if item_navigation %}
+                                    <div class="list-group-item moin-list-heading"> {{ _("Supplementation") }} </div>
+                                    {{ local_panel_main(item_navigation) }}
+                                {% endif %}
 
                             {% endif %}
 
@@ -254,10 +254,10 @@
                         {# id -> moin-flash is used to add special alerts for ex. for changes to User Settings via JS, see common.js #}
                         <div id="moin-flash">
                             {% for category, msg in get_flashed_messages(with_categories=true) %}
-                            <div class="moin-flash moin-flash-{{ category }}">
-                                {{ msg }}
-                                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-                            </div>
+                                <div class="moin-flash moin-flash-{{ category }}">
+                                    {{ msg }}
+                                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                                </div>
                             {% endfor %}
                         </div>
                     </div>
@@ -267,31 +267,31 @@
 
                 {% endblock %}
 
-            <div class="row">
-                {% set width = "col-lg-12" %}
+                <div class="row">
+                    {% set width = "col-lg-12" %}
 
-                <div class="{{width}}">
-                    {% set content_id = self.local_panel and 'moin-content' or 'moin-content-no-panel' %}
-                    <div id="{{ content_id }}" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
-                        {% block content %}
-                            {# All content templates should implement this block. #}
-                        {% endblock %}
-                    </div>
-                </div><!--/span-->
-            </div><!--/row-->
+                    <div class="{{width}}">
+                        {% set content_id = self.local_panel and 'moin-content' or 'moin-content-no-panel' %}
+                        <div id="{{ content_id }}" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
+                            {% block content %}
+                                {# All content templates should implement this block. #}
+                            {% endblock %}
+                        </div>
+                    </div><!--/span-->
+                </div><!--/row-->
 
             </div><!--/span-->
         </div> <!--/row sidebar, tabs, content - main-->
 
         {% block footer %}
-        <div class="row moin-footer">
-            <div class="col-lg-12">
-                <div class="navbar"> <!--footer-->
-                    {{ footer_logos }}
-                    {{ credits }}
+            <div class="row moin-footer">
+                <div class="col-lg-12">
+                    <div class="navbar"> <!--footer-->
+                        {{ footer_logos }}
+                        {{ credits }}
+                    </div>
                 </div>
-            </div>
-        </div> <!--/row for footer-->
+            </div> <!--/row for footer-->
         {% endblock %}
     </div><!--/container-->
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/login.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/login.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,49 +2,49 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h2>{{ _('Moin Login') }}</h2>
-<div class="row">
-    <div class="col-lg-4">
-        {{ forms.render_errors(form) }}
-
-        {% if 'username' in login_inputs or 'password' in login_inputs %}
-            {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
+    <h2>{{ _('Moin Login') }}</h2>
+    <div class="row">
+        <div class="col-lg-4">
+            {{ forms.render_errors(form) }}
 
-            {% if 'username' in login_inputs %}
-                <div class="form-group">
-                    {{ gen.label(form['username']) }}
-                    {{ gen.input(form['username'], type="text", class="form-control") }}
-                </div>
-            {% endif %}
-            {% if 'password' in login_inputs %}
-                <div class="form-group">
-                    {{ gen.label(form['password']) }}
-                    {{ gen.input(form['password'], type="password", class="form-control") }}
-                </div>
+            {% if 'username' in login_inputs or 'password' in login_inputs %}
+                {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
+
+                    {% if 'username' in login_inputs %}
+                        <div class="form-group">
+                            {{ gen.label(form['username']) }}
+                            {{ gen.input(form['username'], type="text", class="form-control") }}
+                        </div>
+                    {% endif %}
+                    {% if 'password' in login_inputs %}
+                        <div class="form-group">
+                            {{ gen.label(form['password']) }}
+                            {{ gen.input(form['password'], type="password", class="form-control") }}
+                        </div>
+                    {% endif %}
+
+                    {{ forms.render(form['submit']) }}
+
+                    <div class="form-group">
+                        {{ forms.render_submit(form, class='btn btn-primary') }}
+                    </div>
+                {{ gen.form.close() }}
             {% endif %}
 
-            {{ forms.render(form['submit']) }}
-
-            <div class="form-group">
-                {{ forms.render_submit(form, class='btn btn-primary') }}
-            </div>
-            {{ gen.form.close() }}
-        {% endif %}
-
-        {% if 'openid' in login_inputs %}
-            <h2>{{ _('OpenID Login') }}</h2>
+            {% if 'openid' in login_inputs %}
+                <h2>{{ _('OpenID Login') }}</h2>
 
-            {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
-
-            {{ forms.render(form['openid']) }}
+                {{ gen.form.open(form, method="post", action=url_for('frontend.login')) }}
 
-            {{ forms.render(form['submit']) }}
-            <div class="form-group">
-                {{ forms.render_submit(form, class='btn btn-primary') }}
-            </div>
-            {{ gen.form.close() }}
-        {% endif %}
+                    {{ forms.render(form['openid']) }}
 
+                    {{ forms.render(form['submit']) }}
+                    <div class="form-group">
+                        {{ forms.render_submit(form, class='btn btn-primary') }}
+                    </div>
+                {{ gen.form.close() }}
+            {% endif %}
+
+        </div>
     </div>
-</div>
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/meta.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/meta.html	Sun Aug 24 08:39:32 2014 -0700
@@ -13,13 +13,13 @@
 {% endblock %}
 
 {% block content %}
-<h1>
-    {{ title }}
-    {% if show_revision %}({{ _("Revision") }} {{ rev.revid | shorten_id }}){% endif %}
-</h1>
-{% if meta %}
-<div id="moin-content-meta">
-    {{ utils.meta_info(meta) }}
-</div>
-{% endif %}
+    <h1>
+        {{ title }}
+        {% if show_revision %}({{ _("Revision") }} {{ rev.revid | shorten_id }}){% endif %}
+    </h1>
+    {% if meta %}
+        <div id="moin-content-meta">
+            {{ utils.meta_info(meta) }}
+        </div>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/modify.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/modify.html	Sun Aug 24 08:39:32 2014 -0700
@@ -20,80 +20,80 @@
 {% endblock %}
 
 {% block views %}
-{{ itemviews }}
+    {{ itemviews }}
 {% endblock %}
 
 {% block content %}
-<h1>{{ title }}</h1>
-<div id="moin-modify" class="moin-form">
-    {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
-    {{ forms.render_errors(form) }}
-    {{ forms.render_errors(form['meta_form']['acl']) }}
-    {#
-       Workaround:
-       For *Draw content, hide submit button and form['comment'], since *Draw
-       POSTs originate from their respective applets.
-    #}
-    <ul class="moin-nav nav-tabs moin-shadow">
-        <li class="active"><a href="#editor" data-toggle="tab">Edit Content</a></li>
-        <li><a href="#meta" data-toggle="tab">Edit Meta</a></li>
-        {% if user.may.admin(fqname) %}
-            <li><a href="#acl" data-toggle="tab">Edit ACL</a></li>
-        {% endif %}
-        <li><a href="#help" data-toggle="tab">Help</a></li>
-    </ul>
-    <div class="tab-content">
-        <div class="tab-pane active" id="editor">
-            {{ data_editor(form['content_form'], item_name) }}
-        </div>
-        <div class="tab-pane active" id="meta">
-            <div class="row">
-                <div class="col-lg-6">
-                    {{ basic_meta_editor(form['meta_form']) }}
+    <h1>{{ title }}</h1>
+    <div id="moin-modify" class="moin-form">
+        {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
+            {{ forms.render_errors(form) }}
+            {{ forms.render_errors(form['meta_form']['acl']) }}
+            {#
+               Workaround:
+               For *Draw content, hide submit button and form['comment'], since *Draw
+               POSTs originate from their respective applets.
+            #}
+            <ul class="moin-nav nav-tabs moin-shadow">
+                <li class="active"><a href="#editor" data-toggle="tab">Edit Content</a></li>
+                <li><a href="#meta" data-toggle="tab">Edit Meta</a></li>
+                {% if user.may.admin(fqname) %}
+                    <li><a href="#acl" data-toggle="tab">Edit ACL</a></li>
+                {% endif %}
+                <li><a href="#help" data-toggle="tab">Help</a></li>
+            </ul>
+            <div class="tab-content">
+                <div class="tab-pane active" id="editor">
+                    {{ data_editor(form['content_form'], item_name) }}
                 </div>
-                {% set field = form['extra_meta_text'] %}
-                <div class="col-lg-6">
-                    <div class="form-group">
-                        {{ gen.label(field) }}
-                        {{ gen.textarea(field, rows=field.properties.rows|string, cols=field.properties.cols|string, class='form-control') }}
-                    </div>
-                </div>
-            </div>
-        </div>
-        {% if user.may.admin(fqname) %}
-            <div class="tab-pane active" id="acl">
-                <div class="row">
-                    {% set field = form['meta_form']['acl'] %}
-                    <div class="col-lg-6">
-                        <div class="form-group">
-                            {{ gen.label(field) }}
-                            {{ gen.textarea(field, rows='1', class='form-control') }}
+                <div class="tab-pane active" id="meta">
+                    <div class="row">
+                        <div class="col-lg-6">
+                            {{ basic_meta_editor(form['meta_form']) }}
+                        </div>
+                        {% set field = form['extra_meta_text'] %}
+                        <div class="col-lg-6">
+                            <div class="form-group">
+                                {{ gen.label(field) }}
+                                {{ gen.textarea(field, rows=field.properties.rows|string, cols=field.properties.cols|string, class='form-control') }}
+                            </div>
                         </div>
                     </div>
                 </div>
+                {% if user.may.admin(fqname) %}
+                    <div class="tab-pane active" id="acl">
+                        <div class="row">
+                            {% set field = form['meta_form']['acl'] %}
+                            <div class="col-lg-6">
+                                <div class="form-group">
+                                    {{ gen.label(field) }}
+                                    {{ gen.textarea(field, rows='1', class='form-control') }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+                <div class="tab-pane active" id="help">
+                    {% if form['content_form'].help %}
+                        <pre id="moin-editor-help">{{ form['content_form'].help }}</pre>
+                    {% endif %}
+                </div>
             </div>
-        {% endif %}
-        <div class="tab-pane active" id="help">
-            {% if form['content_form'].help %}
-                <pre id="moin-editor-help">{{ form['content_form'].help }}</pre>
+            {#
+            {{ gen.textarea(form['meta_text'], lang='en', dir='ltr', rows=rows_meta, cols=cols) }}
+            <br />
+            {{ forms.render_errors(form['meta_text']) }}
+            #}
+            {% if not form['content_form'].is_draw %}
+                <div class="form-group">
+                    {{ forms.render_textcha(gen, form) }}
+                    {{ gen.input(form['comment'], type="text", class="form-control") }}
+                </div>
+                <div class="form-group">
+                    {{ forms.render_submit(form, value='Save', class='btn btn-primary', id='moin-save-text-button') }}
+                </div>
             {% endif %}
-        </div>
+
+        {{ gen.form.close() }}
     </div>
-    {#
-    {{ gen.textarea(form['meta_text'], lang='en', dir='ltr', rows=rows_meta, cols=cols) }}
-    <br />
-    {{ forms.render_errors(form['meta_text']) }}
-    #}
-    {% if not form['content_form'].is_draw %}
-    <div class="form-group">
-        {{ forms.render_textcha(gen, form) }}
-        {{ gen.input(form['comment'], type="text", class="form-control") }}
-    </div>
-    <div class="form-group">
-        {{ forms.render_submit(form, value='Save', class='btn btn-primary', id='moin-save-text-button') }}
-    </div>
-    {% endif %}
-
-    {{ gen.form.close() }}
-</div>
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/modify_binary.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/modify_binary.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,5 +2,5 @@
 
 {% macro basic_data_editor(form, item_name, class) %}
     {{ forms.render(form['data_file']) }}
-<br />
+    <br />
 {% endmacro %}
--- a/MoinMoin/themes/basic/templates/modify_text.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/modify_text.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,7 +1,7 @@
 {% from "modify_binary.html" import data_editor as base_editor %}
 
 {% macro basic_data_editor(form, item_name) %}
-{{ gen.textarea(form['data_text'], rows=form.rows|string, cols=form.cols|string, **kwargs) }}
-{{ base_editor(form) }}
-<br />
+    {{ gen.textarea(form['data_text'], rows=form.rows|string, cols=form.cols|string, **kwargs) }}
+    {{ base_editor(form) }}
+    <br />
 {% endmacro %}
--- a/MoinMoin/themes/basic/templates/register.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/register.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,40 +2,40 @@
 {% import "forms.html" as forms %}
 
 {% block content %}
-<h2>{{ _('Create Account') }}</h2>
-<div class="row">
-  <div class="col-lg-4">
-
-    {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
-
-    {% if form.errors %}
-      <div class="moin-flash moin-flash-error">
-      {% for error in form.errors %}
-        {{ error }}
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-      {% endfor %}
-      </div>
-    {% endif %}
+    <h2>{{ _('Create Account') }}</h2>
+    <div class="row">
+        <div class="col-lg-4">
 
-    {% for field, fieldtype in [
-        ('username', 'text'),
-        ('password1', 'password'),
-        ('password2', 'password'),
-        ('email', 'text'),
-        ('openid', 'text'),
-        ] %}
-          <div class="form-group">
-              {{ gen.label(form[field]) }}
-              {{ gen.input(form[field], type=fieldtype, class="form-control") }}
-          </div>
-      {% endfor %}
-      {{ forms.render_textcha(gen, form) }}
+            {{ gen.form.open(form, method="post", action=url_for('frontend.register')) }}
 
-    <div class="form-group">
-        {{ forms.render_submit(form, class='btn btn-primary') }}
-    </div>
+                {% if form.errors %}
+                    <div class="moin-flash moin-flash-error">
+                        {% for error in form.errors %}
+                            {{ error }}
+                            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+                        {% endfor %}
+                    </div>
+                {% endif %}
 
-    {{ gen.form.close() }}
-  </div>
-</div>
+                {% for field, fieldtype in [
+                        ('username', 'text'),
+                        ('password1', 'password'),
+                        ('password2', 'password'),
+                        ('email', 'text'),
+                        ('openid', 'text'),
+                        ] %}
+                    <div class="form-group">
+                        {{ gen.label(form[field]) }}
+                        {{ gen.input(form[field], type=fieldtype, class="form-control") }}
+                    </div>
+                {% endfor %}
+                {{ forms.render_textcha(gen, form) }}
+
+                <div class="form-group">
+                    {{ forms.render_submit(form, class='btn btn-primary') }}
+                </div>
+
+            {{ gen.form.close() }}
+        </div>
+    </div>
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/rename.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/rename.html	Sun Aug 24 08:39:32 2014 -0700
@@ -4,25 +4,25 @@
 {% set title = _("Rename '%(item_name)s'", item_name=item.name) %}
 
 {% block content %}
-<h2>{{ title }}</h2>
-<div class="row">
-    <div class="col-lg-5">
-        {{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=item.name)) }}
-        {{ forms.render_errors(form) }}
-        <div class="form-group">
-            {{ gen.label(form['target']) }}
-            {{ gen.input(form['target'], type="text", class="form-control") }}
-        </div>
+    <h2>{{ title }}</h2>
+    <div class="row">
+        <div class="col-lg-5">
+            {{ gen.form.open(form, method="post", action=url_for('frontend.rename_item', item_name=item.name)) }}
+                {{ forms.render_errors(form) }}
+                <div class="form-group">
+                    {{ gen.label(form['target']) }}
+                    {{ gen.input(form['target'], type="text", class="form-control") }}
+                </div>
 
-        <div class="form-group">
-            {{ forms.render_textcha(gen, form) }}
-            {{ gen.input(form['comment'], type="text", class="form-control") }}
-        </div>
+                <div class="form-group">
+                    {{ forms.render_textcha(gen, form) }}
+                    {{ gen.input(form['comment'], type="text", class="form-control") }}
+                </div>
 
-        <div class="form-group">
-            {{ forms.render_submit(form, class='btn btn-primary') }}
+                <div class="form-group">
+                    {{ forms.render_submit(form, class='btn btn-primary') }}
+                </div>
+            {{ gen.form.close() }}
         </div>
-        {{ gen.form.close() }}
     </div>
-</div>
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/show.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Sun Aug 24 08:39:32 2014 -0700
@@ -11,9 +11,9 @@
 
     {% block content_data %}
         {% if data_rendered %}
-        <div id="moin-content-data">
-            {{ data_rendered }}
-        </div>
+            <div id="moin-content-data">
+                {{ data_rendered }}
+            </div>
         {% endif %}
     {% endblock %}
 
@@ -76,10 +76,10 @@
 {% endblock %}
 
 {% block options_for_javascript %}
-{%- if item_name and user.edit_on_doubleclick and user.may.write(item_name) -%}
-    <br id="moin-edit-on-doubleclick" />
-{%- endif %}
-{%- if user.show_comments -%}
-    <br id="moin-show-comments" />
-{%- endif %}
+    {%- if item_name and user.edit_on_doubleclick and user.may.write(item_name) -%}
+        <br id="moin-edit-on-doubleclick" />
+    {%- endif %}
+    {%- if user.show_comments -%}
+        <br id="moin-show-comments" />
+    {%- endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/snippets.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/snippets.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,44 +1,44 @@
 {# Logo in the header #}
 {% macro logo() -%}
-<img src="{{ url_for('static', filename='logos/moinmoin.png') }}" id="moin-img-logo" alt="Logo">
+    <img src="{{ url_for('static', filename='logos/moinmoin.png') }}" id="moin-img-logo" alt="Logo">
 {%- endmacro %}
 
 
 {# Helper macro to create image links #}
 {% macro creditlogo(link, logo, alt, title) %}
-<a class="navbar-brand moin-footer-logo" href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
+    <a class="navbar-brand moin-footer-logo" href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
 {% endmacro %}
 
 
 {# Image links in the footer #}
 {% macro creditlogos(start='<div class="navbar-header">'|safe, end='</div>'|safe, sep=''|safe) %}
-{{ start }}
-{{ creditlogo('http://moinmo.in/', url_for('static', filename='logos/moinmoin-small.png'),
-   'MoinMoin powered', 'This site uses the MoinMoin Wiki software.') }}
-{{ end }}
+    {{ start }}
+    {{ creditlogo('http://moinmo.in/', url_for('static', filename='logos/moinmoin-small.png'),
+       'MoinMoin powered', 'This site uses the MoinMoin Wiki software.') }}
+    {{ end }}
 {% endmacro %}
 
 
 {# Helper macro to generate text links #}
 {% macro credit(link, text, title) -%}
-<a href="{{ link }}" title="{{ title }}">{{ text }}</a>
+    <a href="{{ link }}" title="{{ title }}">{{ text }}</a>
 {%- endmacro %}
 
 
 {# Text links in the footer #}
 {% macro credits(start='<ul class="nav navbar-nav pull-right moin-footer-credits"> <li>'|safe, end='</li> </ul>'|safe, sep='</li> <li>'|safe) %}
-{{ start }}
-{{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
-{{ sep }}
-{{ credit('http://moinmo.in/Python', 'Python Powered', 'MoinMoin is written in Python.') }}
-{{ sep }}
-{{ credit('http://moinmo.in/GPL', 'GPL licensed', 'MoinMoin is GPL licensed.') }}
-{{ sep }}
-{{ credit('http://validator.w3.org/check?uri=referer', 'Valid HTML 5', 'Click here to validate this page.') }}
-{{ end }}
+    {{ start }}
+    {{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
+    {{ sep }}
+    {{ credit('http://moinmo.in/Python', 'Python Powered', 'MoinMoin is written in Python.') }}
+    {{ sep }}
+    {{ credit('http://moinmo.in/GPL', 'GPL licensed', 'MoinMoin is GPL licensed.') }}
+    {{ sep }}
+    {{ credit('http://validator.w3.org/check?uri=referer', 'Valid HTML 5', 'Click here to validate this page.') }}
+    {{ end }}
 {% endmacro %}
 
 {# Additional JavaScript #}
 {% macro add_scripts() -%}
-<script src="{{ url_for('frontend.template', filename='basic.js') }}"></script>
+    <script src="{{ url_for('frontend.template', filename='basic.js') }}"></script>
 {% endmacro %}
--- a/MoinMoin/themes/basic/templates/usersettings.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/usersettings.html	Sun Aug 24 08:39:32 2014 -0700
@@ -2,15 +2,15 @@
 {% import theme("usersettings_forms.html") as user_forms %}
 
 {% block content %}
-<h2>{{ _("User Settings") }}</h2>
-<ul class="moin-nav nav-tabs moin-shadow">
-    <li class="active"><a href="#personal" data-toggle="tab">{{ _("Personal") }}</a></li>
-    <li><a href="#password" data-toggle="tab">{{ _("Change Password") }}</a></li>
-    <li><a href="#notification" data-toggle="tab">{{ _("Notifications") }}</a></li>
-    <li><a href="#ui" data-toggle="tab">{{ _("Appearance") }}</a></li>
-    <li><a href="#navigation" data-toggle="tab">{{ _("Navigation") }}</a></li>
-    <li><a href="#options" data-toggle="tab">{{ _("Options") }}</a></li>
-    <li><a href="#subscriptions" data-toggle="tab">{{ _("Subscriptions") }}</a></li>
-</ul>
-{{ user_forms.all_usersettings_forms(form_objs) }}
+    <h2>{{ _("User Settings") }}</h2>
+    <ul class="moin-nav nav-tabs moin-shadow">
+        <li class="active"><a href="#personal" data-toggle="tab">{{ _("Personal") }}</a></li>
+        <li><a href="#password" data-toggle="tab">{{ _("Change Password") }}</a></li>
+        <li><a href="#notification" data-toggle="tab">{{ _("Notifications") }}</a></li>
+        <li><a href="#ui" data-toggle="tab">{{ _("Appearance") }}</a></li>
+        <li><a href="#navigation" data-toggle="tab">{{ _("Navigation") }}</a></li>
+        <li><a href="#options" data-toggle="tab">{{ _("Options") }}</a></li>
+        <li><a href="#subscriptions" data-toggle="tab">{{ _("Subscriptions") }}</a></li>
+    </ul>
+    {{ user_forms.all_usersettings_forms(form_objs) }}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/usersettings_forms.html	Wed Aug 20 14:24:38 2014 -0700
+++ b/MoinMoin/themes/basic/templates/usersettings_forms.html	Sun Aug 24 08:39:32 2014 -0700
@@ -1,202 +1,202 @@
 {% import "forms.html" as forms %}
 
 {% macro personal(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings'), role="form") }}
-{{ forms.render_errors(form) }}
-    {% for e in [
-        'name',
-        'display_name',
-        'openid',
-        ] %}
-        <div class="form-group">
-            {{ gen.label(form[e]) }}
-            {{ gen.input(form[e], type="text", class="form-control") }}
-        </div>
-    {% endfor %}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings'), role="form") }}
+        {{ forms.render_errors(form) }}
+            {% for e in [
+                    'name',
+                    'display_name',
+                    'openid',
+                    ] %}
+                <div class="form-group">
+                    {{ gen.label(form[e]) }}
+                    {{ gen.input(form[e], type="text", class="form-control") }}
+                </div>
+            {% endfor %}
 
-    {% for e in [
-        'timezone',
-        'locale',
-        ] %}
+            {% for e in [
+                    'timezone',
+                    'locale',
+                    ] %}
+                <div class="form-group">
+                    <dl>
+                        <dt>
+                            {{ gen.label(form[e]) }}
+                        </dt>
+                        <dd>
+                            {{ gen.select.open(form[e], class="btn") }}
+                                {% for value, label in form[e].properties['choice_specs'] %}
+                                    {{ gen.option(form[e], value=value, contents=label or value) }}
+                                {% endfor %}
+                            {{ gen.select.close() }}
+                        </dd>
+                    </dl>
+                </div>
+            {% endfor %}
+        {{ forms.render_hidden('part', 'personal') }}
         <div class="form-group">
-            <dl>
-                <dt>
-                    {{ gen.label(form[e]) }}
-                </dt>
-                <dd>
-                    {{ gen.select.open(form[e], class="btn") }}
-                    {% for value, label in form[e].properties['choice_specs'] %}
-                      {{ gen.option(form[e], value=value, contents=label or value) }}
-                    {% endfor %}
-                    {{ gen.select.close() }}
-                </dd>
-            </dl>
+            {{ forms.render_submit(form, class='btn btn-primary') }}
         </div>
-    {% endfor %}
-{{ forms.render_hidden('part', 'personal') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 
 {% macro password(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-    {% for e in [
-        'password_current',
-        'password1',
-        'password2',
-        ] %}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+            {% for e in [
+                    'password_current',
+                    'password1',
+                    'password2',
+                    ] %}
+                <div class="form-group">
+                    {{ gen.label(form[e]) }}
+                    {{ gen.input(form[e], type="password", class="form-control") }}
+                </div>
+            {% endfor %}
+        {{ forms.render_hidden('part', 'password') }}
         <div class="form-group">
-            {{ gen.label(form[e]) }}
-            {{ gen.input(form[e], type="password", class="form-control") }}
+            {{ forms.render_submit(form, class='btn btn-primary') }}
         </div>
-    {% endfor %}
-{{ forms.render_hidden('part', 'password') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro notification(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{% if cfg.user_email_verification %}
-<p>{{ _("Changing your email address requires you to verify it. A link will be sent to you.") }}</p>
-{% endif %}
-{{ forms.render_errors(form) }}
-<div class="form-group">
-    {{ gen.label(form['email']) }}
-    <div class="input-group">
-        {{ gen.input(form['email'], type="email", class="form-control") }}
-        <span class="input-group-addon"><i class="icon-envelope"></i></span>
-    </div>
-</div>
-{{ forms.render_hidden('part', 'notification') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {% if cfg.user_email_verification %}
+            <p>{{ _("Changing your email address requires you to verify it. A link will be sent to you.") }}</p>
+        {% endif %}
+        {{ forms.render_errors(form) }}
+        <div class="form-group">
+            {{ gen.label(form['email']) }}
+            <div class="input-group">
+                {{ gen.input(form['email'], type="email", class="form-control") }}
+                <span class="input-group-addon"><i class="icon-envelope"></i></span>
+            </div>
+        </div>
+        {{ forms.render_hidden('part', 'notification') }}
+        <div class="form-group">
+            {{ forms.render_submit(form, class='btn btn-primary') }}
+        </div>
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro ui(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-    <div class="form-group">
-        <dl>
-            <dt>
-                {{ gen.label(form['theme_name']) }}
-            </dt>
-            <dd>
-                {{ gen.select.open(form['theme_name'], class="btn") }}
-                {% for value, label in form['theme_name'].properties['choice_specs'] %}
-                  {{ gen.option(form['theme_name'], value=value, contents=label or value) }}
-                {% endfor %}
-                {{ gen.select.close() }}
-            </dd>
-        </dl>
-    </div>
-    {% for e in [
-        'css_url',
-        'edit_rows',
-        'results_per_page'
-        ] %}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+            <div class="form-group">
+                <dl>
+                    <dt>
+                        {{ gen.label(form['theme_name']) }}
+                    </dt>
+                    <dd>
+                        {{ gen.select.open(form['theme_name'], class="btn") }}
+                            {% for value, label in form['theme_name'].properties['choice_specs'] %}
+                                {{ gen.option(form['theme_name'], value=value, contents=label or value) }}
+                            {% endfor %}
+                        {{ gen.select.close() }}
+                    </dd>
+                </dl>
+            </div>
+            {% for e in [
+                    'css_url',
+                    'edit_rows',
+                    'results_per_page'
+                    ] %}
+                <div class="form-group">
+                    {{ gen.label(form[e]) }}
+                    {{ gen.input(form[e], type="text", class="form-control") }}
+                </div>
+            {% endfor %}
+        {{ forms.render_hidden('part', 'ui') }}
         <div class="form-group">
-            {{ gen.label(form[e]) }}
-            {{ gen.input(form[e], type="text", class="form-control") }}
+            {{ forms.render_submit(form, class='btn btn-primary') }}
         </div>
-    {% endfor %}
-{{ forms.render_hidden('part', 'ui') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro navigation(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<dl>
-    {# TODO: find a good way to handle quicklinks #}
-</dl>
-{{ forms.render_hidden('part', 'navigation') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <dl>
+            {# TODO: find a good way to handle quicklinks #}
+        </dl>
+        {{ forms.render_hidden('part', 'navigation') }}
+        <div class="form-group">
+            {{ forms.render_submit(form, class='btn btn-primary') }}
+        </div>
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro options(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-    {% for e in [
-        'mailto_author',
-        'edit_on_doubleclick',
-        'scroll_page_after_edit',
-        'show_comments',
-        'disabled'
-        ] %}
-        <div class="checkbox">
-            <label>
-                {{ gen.input(form[e], type="checkbox") }}
-                {{ form[e].label }}
-            </label>
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+            {% for e in [
+                    'mailto_author',
+                    'edit_on_doubleclick',
+                    'scroll_page_after_edit',
+                    'show_comments',
+                    'disabled'
+                    ] %}
+                <div class="checkbox">
+                    <label>
+                        {{ gen.input(form[e], type="checkbox") }}
+                        {{ form[e].label }}
+                    </label>
+                </div>
+            {% endfor %}
+        {{ forms.render_hidden('part', 'options') }}
+        <div class="form-group">
+            {{ forms.render_submit(form, class='btn btn-primary') }}
         </div>
-    {% endfor %}
-{{ forms.render_hidden('part', 'options') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {% macro subscriptions(form) %}
-{{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
-{{ forms.render_errors(form) }}
-<div class="form-group">
-    {{ gen.label(form['subscriptions']) }}
-    <div class="input-group">
-        {{ gen.textarea(form['subscriptions'], cols="60", rows="10", class="form-control") }}
-    </div>
-</div>
-{{ forms.render_hidden('part', 'subscriptions') }}
-<div class="form-group">
-    {{ forms.render_submit(form, class='btn btn-primary') }}
-</div>
-{{ gen.form.close() }}
+    {{ gen.form.open(form, method="post", action=url_for('frontend.usersettings')) }}
+        {{ forms.render_errors(form) }}
+        <div class="form-group">
+            {{ gen.label(form['subscriptions']) }}
+            <div class="input-group">
+                {{ gen.textarea(form['subscriptions'], cols="60", rows="10", class="form-control") }}
+            </div>
+        </div>
+        {{ forms.render_hidden('part', 'subscriptions') }}
+        <div class="form-group">
+            {{ forms.render_submit(form, class='btn btn-primary') }}
+        </div>
+    {{ gen.form.close() }}
 {% endmacro %}
 
 {# javascript functions within basic.js are dependent upon the structure, classes and ids defined here #}
 {% macro all_usersettings_forms(form_objs) %}
-<div id="moin-usersettings">
-    <div class="row">
-        <div class="col-lg-4">
-            <div class="tab-content">
-                <div id="personal" class="tab-pane active">
-                    {{ personal(form_objs.personal) }}
-                </div>
-                <div id="password" class="tab-pane active">
-                    {{ password(form_objs.password) }}
-                </div>
-                <div id="notification" class="tab-pane active">
-                    {{ notification(form_objs.notification) }}
-                </div>
-                <div id="ui" class="tab-pane active">
-                    {{ ui(form_objs.ui) }}
-                </div>
-                <div id="navigation" class="tab-pane active">
-                    {{ navigation(form_objs.navigation) }}
-                </div>
-                <div id="options" class="tab-pane active">
-                    {{ options(form_objs.options) }}
-                </div>
-                <div id="subscriptions" class="tab-pane active">
-                    {{ subscriptions(form_objs.subscriptions) }}
+    <div id="moin-usersettings">
+        <div class="row">
+            <div class="col-lg-4">
+                <div class="tab-content">
+                    <div id="personal" class="tab-pane active">
+                        {{ personal(form_objs.personal) }}
+                    </div>
+                    <div id="password" class="tab-pane active">
+                        {{ password(form_objs.password) }}
+                    </div>
+                    <div id="notification" class="tab-pane active">
+                        {{ notification(form_objs.notification) }}
+                    </div>
+                    <div id="ui" class="tab-pane active">
+                        {{ ui(form_objs.ui) }}
+                    </div>
+                    <div id="navigation" class="tab-pane active">
+                        {{ navigation(form_objs.navigation) }}
+                    </div>
+                    <div id="options" class="tab-pane active">
+                        {{ options(form_objs.options) }}
+                    </div>
+                    <div id="subscriptions" class="tab-pane active">
+                        {{ subscriptions(form_objs.subscriptions) }}
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 {% endmacro %}