Mercurial > moin-2.0-moinboot
changeset 2123:6b640b54adde
split ticket.html into ticket/{base,submit,modify}.html
| author | Cheer Xiao <xiaqqaix@gmail.com> |
|---|---|
| date | Sat, 22 Jun 2013 00:10:14 +0800 |
| parents | ad303592c64c |
| children | ac48e4c61b8c |
| files | MoinMoin/items/ticket.py MoinMoin/templates/ticket.html MoinMoin/templates/ticket/base.html MoinMoin/templates/ticket/modify.html MoinMoin/templates/ticket/submit.html |
| diffstat | 5 files changed, 106 insertions(+), 80 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/items/ticket.py Sat Jun 15 02:29:07 2013 +0200 +++ b/MoinMoin/items/ticket.py Sat Jun 22 00:10:14 2013 +0800 @@ -138,7 +138,8 @@ itemtype = ITEMTYPE_TICKET display_name = L_('Ticket') description = L_('Ticket item') - modify_template = 'ticket.html' + submit_template = 'ticket/submit.html' + modify_template = 'ticket/modify.html' def do_show(self, revid): if revid != CURRENT: @@ -169,7 +170,7 @@ # XXX When creating new item, suppress the "foo doesn't exist. Create it?" dummy content data_rendered = None if is_new else Markup(self.content._render_data()) - return render_template(self.modify_template, + return render_template(self.submit_template if is_new else self.modify_template, is_new=is_new, closed=closed, item_name=self.name,
--- a/MoinMoin/templates/ticket.html Sat Jun 15 02:29:07 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -{% import "forms.html" as forms %} -{% extends theme("layout.html") %} - -{% if is_new %} - {% set title = _("Creating new ticket: '%(item_name)s'", item_name=item_name) %} -{% else %} - {% set title = _("Ticket: '%(item_name)s'", item_name=item_name) %} -{% endif %} - -{% block head %} - {{ super() }} - <link media="all" rel="stylesheet" href="{{ url_for('static', filename='css/ticket.css') }}" /> -{% endblock %} - -{% block content %} -<h1> - {{ title }} - {% 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') }} - - {% if data_rendered %} - <div id="moin-content-data"> - {{ data_rendered }} - </div> - {% endif %} - - {% if is_new %} - <h2>Describe the ticket</h2> - {% else %} - <h2>Add comment</h2> - {% endif %} - <dl> - {{ forms.render(form['message']) }} - </dl> - - <h2>Edit metadata</h2> - <dl> - {{ forms.render_errors(form) }} - {% for e in [ - 'summary', - 'effort', - 'difficulty', - 'severity', - 'priority', - 'tags', - 'assigned_to', - 'superseded_by', - 'depends_on', - ] %} - {{ forms.render(form['meta'][e]) }} - {% endfor %} - </dl> - - {# see comments concerning the submit button within TicketForm in items/ticket.py #} - {% if is_new %} - {{ forms.render_submit(form) }} - {% else %} - {{ forms.render(form['submit']) }} - {% endif %} - - <h2>Back references</h2> - <dl> - {% for e in [ - 'supersedes', - 'required_by', - 'subscribers', - ] %} - {{ forms.render(form['backrefs'][e]) }} - {% endfor %} - - {{ gen.form.close() }} -</div> -{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MoinMoin/templates/ticket/base.html Sat Jun 22 00:10:14 2013 +0800 @@ -0,0 +1,58 @@ +{% import "forms.html" as forms %} +{% extends theme("layout.html") %} + +{% macro render_meta() %} + {% for e in [ + 'summary', + 'effort', + 'difficulty', + 'severity', + 'priority', + 'tags', + 'assigned_to', + 'superseded_by', + 'depends_on', + ] %} + {{ forms.render(form['meta'][e]) }} + {% endfor %} +{% endmacro %} + +{% macro render_backref() %} + {% for e in [ + 'supersedes', + 'required_by', + 'subscribers', + ] %} + {{ forms.render(form['backrefs'][e]) }} + {% endfor %} +{% endmacro %} + +{% block head %} + {{ super() }} + <link media="all" rel="stylesheet" href="{{ url_for('static', filename='css/ticket.css') }}" /> +{% 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') }} + + {% if data_rendered %} + <div id="moin-content-data"> + {{ data_rendered }} + </div> + {% endif %} + + {% block form_controls %} + {% endblock %} + + {{ gen.form.close() }} +</div> +{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MoinMoin/templates/ticket/modify.html Sat Jun 22 00:10:14 2013 +0800 @@ -0,0 +1,24 @@ +{% extends "ticket/base.html" %} + +{% block title_text %} + {{ _("Ticket: '%(item_name)s'", item_name=item_name) }} +{% endblock %} + +{% block form_controls %} + <h2>Add comment</h2> + <dl> + {{ forms.render(form['message']) }} + </dl> + + <h2>Edit metadata</h2> + <dl> + {{ forms.render_errors(form) }} + {{ render_meta() }} + </dl> + + {{ forms.render(form['submit']) }} + + <h2>Back references</h2> + <dl> + {{ render_backref() }} +{% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MoinMoin/templates/ticket/submit.html Sat Jun 22 00:10:14 2013 +0800 @@ -0,0 +1,21 @@ +{% extends "ticket/base.html" %} + +{% block title_text %} + {{ _("Creating new ticket: '%(item_name)s'", item_name=item_name) }} +{% endblock %} + +{% block form_controls %} + <h2>Describe the ticket</h2> + + <dl> + {{ forms.render(form['message']) }} + </dl> + + <h2>Provide metadata</h2> + <dl> + {{ forms.render_errors(form) }} + {{ render_meta() }} + </dl> + + {{ forms.render_submit(form) }} +{% endblock %}