changeset 360:748054b11929

Fixing multiple heads
author Michael Mayorov <marchael@kb.csu.ru>
date Mon, 11 Jul 2011 13:16:53 +0000
parents c41fdeb81880 (current diff) ff38aed82112 (diff)
children 6111e4d47e04
files MoinMoin/app.py MoinMoin/apps/admin/templates/highlighterhelp.html MoinMoin/apps/admin/templates/index.html MoinMoin/apps/admin/templates/interwikihelp.html MoinMoin/apps/admin/templates/itemsize.html MoinMoin/apps/admin/templates/sysitems_upgrade.html MoinMoin/apps/admin/templates/userbrowser.html MoinMoin/apps/admin/templates/wikiconfig.html MoinMoin/apps/admin/templates/wikiconfighelp.html MoinMoin/apps/frontend/views.py MoinMoin/apps/misc/templates/sitemap.xml MoinMoin/apps/misc/templates/urls_names.txt MoinMoin/items/__init__.py MoinMoin/templates/base.html MoinMoin/templates/index2.html quickinstall quickinstall.bat setup.py wikiconfig.py
diffstat 20 files changed, 174 insertions(+), 174 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/highlighterhelp.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,7 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Available Highlighters") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/index.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,23 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Documentation") }}</h1>
+<ul>
+    <li><a href="{{ url_for('serve.files', name='docs', filename='index.html') }}">{{ _("Documentation (local)") }}</a></li>
+</ul>
+<h1>{{ _("Admin Menu") }}</h1>
+<ul>
+    <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("User Browser") }}</a></li>
+    <li><a href="{{ url_for('admin.sysitems_upgrade') }}">{{ _("Upgrade system items") }}</a></li>
+    <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
+    <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Show Wiki Configuration Help") }}</a></li>
+</ul>
+<h1>{{ _("User Menu") }}</h1>
+<ul>
+    <li><a href="{{ url_for('frontend.wanted_items') }}">{{ _("Wanted Items") }}</a></li>
+    <li><a href="{{ url_for('frontend.orphaned_items') }}">{{ _("Orphaned Items") }}</a></li>
+    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item sizes (latest revision)") }}</a></li>
+    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("Known InterWiki names") }}</a></li>
+    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Available Highlighters") }}</a></li>
+</ul>
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/interwikihelp.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,7 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Known InterWiki names") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/itemsize.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,7 @@
+{% import "utils.html" as utils %}
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Item sizes (latest revision)") }}</h1>
+{{ utils.table(headings, rows) }}
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/sysitems_upgrade.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,14 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("System items upgrade") }}</h1>
+<p>
+{{ _("You can upgrade your system items by uploading an xml file with new items below.") }}
+</p>
+<form action="{{ url_for('admin.sysitems_upgrade') }}" method="POST" enctype="multipart/form-data">
+<fieldset>
+    <label for="xmlfile">System items XML file:</label><input type="file" id="xmlfile" name="xmlfile" />
+    <input type="submit" name="submit" value="{{ _("Upgrade system items") }}" />
+</fieldset>
+</form>
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/userbrowser.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,35 @@
+{% extends theme("layout.html") %}
+{% block content %}
+    <table>
+    <tr>
+        <th>{{ _("User name") }}</th>
+        <th>{{ _("Member of Groups") }}</th>
+        <th>{{ _("Email address") }}</th>
+        <th>{{ _("Actions") }}</th>
+    </tr>
+    {% for u in user_accounts %}
+    <tr>
+        <td><a href="{{ url_for('frontend.show_item', item_name=u.name) }}">{{ u.name }}</a>{{ u.disabled and " (%s)" % _("disabled") or ""}}</td>
+        <td>{{ u.groups|join(',') }}</td>
+        <td>
+            {% if u.email %}
+            <a href="mailto:{{ u.email|e }}" class="mailto">{{ u.email|e }}</a>
+            {% endif %}
+        </td>
+        <td>
+            <form action="{{ url_for('admin.userprofile', user_name=u.name) }}" method="GET">
+                <input type="hidden" name="key" value="disabled" />
+                <input type="hidden" name="val" value="{{ u.disabled and "0" or "1" }}" />
+                <input type="submit" name="userprofile" value="{{ u.disabled and _("Enable user") or _("Disable user") }}" />
+            </form>
+            <form action="{{ url_for('admin.mail_recovery_token') }}" method="GET">
+                <input type="hidden" name="email" value="{{ u.email }}" />
+                <input type="hidden" name="account_sendmail" value="1" />
+                <input type="submit" name="recoverpass" value="{{ _("Mail account data") }}" />
+            </form>
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/wikiconfig.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,36 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("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>
+<thead>
+<tr>
+<td><strong>{{ _('Variable name') }}</strong></td>
+<td><strong>{{ _('Setting') }}</strong></td>
+</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 %}
+</tdbody>
+</table>
+{% endblock %}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/admin/templates/admin/wikiconfighelp.html	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,29 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("WikiConfig Help") }}</h1>
+{% for heading, desc, opts in groups %}
+    <h2>{{ heading }}</h2>
+    {% if desc %}
+        <p>{{ desc }}</p>
+    {% endif %}
+    <table>
+    <thead>
+    <tr>
+        <td><strong>{{ _('Variable name') }}</strong></td>
+        <td><strong>{{ _('Default') }}</strong></td>
+        <td><strong>{{ _('Description') }}</strong></td>
+    </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 %}
+{% endblock %}
+
--- a/MoinMoin/apps/admin/templates/highlighterhelp.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Available Highlighters") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/index.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Documentation") }}</h1>
-<ul>
-    <li><a href="{{ url_for('serve.files', name='docs', filename='index.html') }}">{{ _("Documentation (local)") }}</a></li>
-</ul>
-<h1>{{ _("Admin Menu") }}</h1>
-<ul>
-    <li><a href="{{ url_for('admin.userbrowser') }}">{{ _("User Browser") }}</a></li>
-    <li><a href="{{ url_for('admin.sysitems_upgrade') }}">{{ _("Upgrade system items") }}</a></li>
-    <li><a href="{{ url_for('admin.wikiconfig') }}">{{ _("Show Wiki Configuration") }}</a></li>
-    <li><a href="{{ url_for('admin.wikiconfighelp') }}">{{ _("Show Wiki Configuration Help") }}</a></li>
-</ul>
-<h1>{{ _("User Menu") }}</h1>
-<ul>
-    <li><a href="{{ url_for('frontend.wanted_items') }}">{{ _("Wanted Items") }}</a></li>
-    <li><a href="{{ url_for('frontend.orphaned_items') }}">{{ _("Orphaned Items") }}</a></li>
-    <li><a href="{{ url_for('admin.itemsize') }}">{{ _("Item sizes (latest revision)") }}</a></li>
-    <li><a href="{{ url_for('admin.interwikihelp') }}">{{ _("Known InterWiki names") }}</a></li>
-    <li><a href="{{ url_for('admin.highlighterhelp') }}">{{ _("Available Highlighters") }}</a></li>
-</ul>
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/interwikihelp.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Known InterWiki names") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/itemsize.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-{% import "utils.html" as utils %}
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Item sizes (latest revision)") }}</h1>
-{{ utils.table(headings, rows) }}
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/sysitems_upgrade.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("System items upgrade") }}</h1>
-<p>
-{{ _("You can upgrade your system items by uploading an xml file with new items below.") }}
-</p>
-<form action="{{ url_for('admin.sysitems_upgrade') }}" method="POST" enctype="multipart/form-data">
-<fieldset>
-    <label for="xmlfile">System items XML file:</label><input type="file" id="xmlfile" name="xmlfile" />
-    <input type="submit" name="submit" value="{{ _("Upgrade system items") }}" />
-</fieldset>
-</form>
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/userbrowser.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-    <table>
-    <tr>
-        <th>{{ _("User name") }}</th>
-        <th>{{ _("Member of Groups") }}</th>
-        <th>{{ _("Email address") }}</th>
-        <th>{{ _("Actions") }}</th>
-    </tr>
-    {% for u in user_accounts %}
-    <tr>
-        <td><a href="{{ url_for('frontend.show_item', item_name=u.name) }}">{{ u.name }}</a>{{ u.disabled and " (%s)" % _("disabled") or ""}}</td>
-        <td>{{ u.groups|join(',') }}</td>
-        <td>
-            {% if u.email %}
-            <a href="mailto:{{ u.email|e }}" class="mailto">{{ u.email|e }}</a>
-            {% endif %}
-        </td>
-        <td>
-            <form action="{{ url_for('admin.userprofile', user_name=u.name) }}" method="GET">
-                <input type="hidden" name="key" value="disabled" />
-                <input type="hidden" name="val" value="{{ u.disabled and "0" or "1" }}" />
-                <input type="submit" name="userprofile" value="{{ u.disabled and _("Enable user") or _("Disable user") }}" />
-            </form>
-            <form action="{{ url_for('admin.mail_recovery_token') }}" method="GET">
-                <input type="hidden" name="email" value="{{ u.email }}" />
-                <input type="hidden" name="account_sendmail" value="1" />
-                <input type="submit" name="recoverpass" value="{{ _("Mail account data") }}" />
-            </form>
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/wikiconfig.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("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>
-<thead>
-<tr>
-<td><strong>{{ _('Variable name') }}</strong></td>
-<td><strong>{{ _('Setting') }}</strong></td>
-</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 %}
-</tdbody>
-</table>
-{% endblock %}
-
--- a/MoinMoin/apps/admin/templates/wikiconfighelp.html	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("WikiConfig Help") }}</h1>
-{% for heading, desc, opts in groups %}
-    <h2>{{ heading }}</h2>
-    {% if desc %}
-        <p>{{ desc }}</p>
-    {% endif %}
-    <table>
-    <thead>
-    <tr>
-        <td><strong>{{ _('Variable name') }}</strong></td>
-        <td><strong>{{ _('Default') }}</strong></td>
-        <td><strong>{{ _('Description') }}</strong></td>
-    </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 %}
-{% endblock %}
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/misc/templates/misc/sitemap.xml	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+{% for item_name, lastmod, changefreq, priority in sitemap -%}
+<url>
+<loc>{{ url_for('frontend.show_item', item_name=item_name, _external=True)|e }}</loc>
+<lastmod>{{ lastmod }}</lastmod>
+<changefreq>{{ changefreq }}</changefreq>
+<priority>{{ priority }}</priority>
+</url>
+{%- endfor %}
+</urlset>
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/apps/misc/templates/misc/urls_names.txt	Mon Jul 11 13:16:53 2011 +0000
@@ -0,0 +1,3 @@
+{% for item_name in item_names -%}
+{{ url_for('frontend.show_item', item_name=item_name, _external=True) }} {{ item_name }}
+{% endfor %}
--- a/MoinMoin/apps/misc/templates/sitemap.xml	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{% for item_name, lastmod, changefreq, priority in sitemap -%}
-<url>
-<loc>{{ url_for('frontend.show_item', item_name=item_name, _external=True)|e }}</loc>
-<lastmod>{{ lastmod }}</lastmod>
-<changefreq>{{ changefreq }}</changefreq>
-<priority>{{ priority }}</priority>
-</url>
-{%- endfor %}
-</urlset>
-
-
--- a/MoinMoin/apps/misc/templates/urls_names.txt	Mon Jul 11 13:15:45 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-{% for item_name in item_names -%}
-{{ url_for('frontend.show_item', item_name=item_name, _external=True) }} {{ item_name }}
-{% endfor %}