changeset 1461:707c7db1b645

Automated merge with http://hg.moinmo.in/moin/2.0
author Cheer Xiao <xiaqqaix@gmail.com>
date Sun, 29 Jul 2012 18:26:20 +0800
parents 736c6b347e8e (current diff) 157d41b326b1 (diff)
children 20ff5996c3a6 bc8a2546468b
files MoinMoin/templates/modify_show_contenttype_selection.html MoinMoin/templates/modify_show_itemtype_selection.html MoinMoin/templates/modify_show_template_selection.html
diffstat 7 files changed, 57 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/items/__init__.py	Sat Jul 28 23:25:34 2012 +0200
+++ b/MoinMoin/items/__init__.py	Sun Jul 29 18:26:20 2012 +0800
@@ -563,7 +563,7 @@
         # call this if the item is still empty
         rev_ids = []
         item_templates = self.content.get_templates(self.contenttype)
-        return render_template('modify_show_template_selection.html',
+        return render_template('modify_select_template.html',
                                item_name=self.name,
                                # XXX u'default' should be a constant
                                itemtype=u'default',
@@ -580,7 +580,7 @@
         method = request.method
         if method == 'GET':
             if isinstance(self.content, NonExistentContent):
-                return render_template('modify_show_contenttype_selection.html',
+                return render_template('modify_select_contenttype.html',
                                        item_name=self.name,
                                        # XXX see comment above
                                        itemtype=u'default',
@@ -661,7 +661,7 @@
             (u'ticket', u'Ticket', 'Ticket item'),
         ]
 
-        return render_template('modify_show_itemtype_selection.html',
+        return render_template('modify_select_itemtype.html',
                                item_name=self.name,
                                itemtypes=ITEMTYPES,
                               )
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/templates/modify_select_contenttype.html	Sun Jul 29 18:26:20 2012 +0800
@@ -0,0 +1,22 @@
+{% extends theme("layout.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 class="zebra">
+    {% for gname, contenttypes in contenttype_groups %}
+    <tr>
+        <th>{{ gname }}</th>
+    </tr>
+    <tr>
+        <td>
+        {% for ctname, ctlabel in contenttypes %}
+            <a href="{{ url_for('frontend.modify_item', item_name=item_name, itemtype=itemtype, contenttype=ctname) }}">{{ ctlabel }}</a> -
+        {% endfor %}
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/templates/modify_select_itemtype.html	Sun Jul 29 18:26:20 2012 +0800
@@ -0,0 +1,16 @@
+{% extends theme("layout.html") %}
+{% block content %}
+<h1>{{ _("Create new item?") }}</h1>
+<p>
+{{ _("This item does not exist (yet), but you can try creating it now. Please select the type of the item you want to create.") }}
+</p>
+<table class="zebra">
+    {% for itname, itlabel, itdesc in itemtypes %}
+    <tr>
+        <td>
+            <a href="{{ url_for('frontend.modify_item', item_name=item_name, itemtype=itname) }}">{{ itlabel }}</a> - {{ itdesc }}
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+{% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/templates/modify_select_template.html	Sun Jul 29 18:26:20 2012 +0800
@@ -0,0 +1,16 @@
+{% extends theme("layout.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=item_name, 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=item_name, itemtype=itemtype, contenttype=contenttype, template=template) }}">{{ template }}</a>
+    </li>
+    {% endfor %}
+</ul>
+{% endblock %}
--- a/MoinMoin/templates/modify_show_contenttype_selection.html	Sat Jul 28 23:25:34 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-{% extends theme("layout.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 class="zebra">
-    {% for gname, contenttypes in contenttype_groups %}
-    <tr>
-        <th>{{ gname }}</th>
-    </tr>
-    <tr>
-        <td>
-        {% for ctname, ctlabel in contenttypes %}
-            <a href="{{ url_for('frontend.modify_item', item_name=item_name, itemtype=itemtype, contenttype=ctname) }}">{{ ctlabel }}</a> -
-        {% endfor %}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% endblock %}
--- a/MoinMoin/templates/modify_show_itemtype_selection.html	Sat Jul 28 23:25:34 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-{% extends theme("layout.html") %}
-{% block content %}
-<h1>{{ _("Create new item?") }}</h1>
-<p>
-{{ _("This item does not exist (yet), but you can try creating it now. Please select the type of the item you want to create.") }}
-</p>
-<table class="zebra">
-    {% for itname, itlabel, itdesc in itemtypes %}
-    <tr>
-        <td>
-            <a href="{{ url_for('frontend.modify_item', item_name=item_name, itemtype=itname) }}">{{ itlabel }}</a> - {{ itdesc }}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% endblock %}
--- a/MoinMoin/templates/modify_show_template_selection.html	Sat Jul 28 23:25:34 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-{% extends theme("layout.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=item_name, 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=item_name, itemtype=itemtype, contenttype=contenttype, template=template) }}">{{ template }}</a>
-    </li>
-    {% endfor %}
-</ul>
-{% endblock %}