From c561ebe710d6e6a43aa4afc6c2036a215378ce87 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 21 Aug 2008 09:38:06 +0800 Subject: Inital commit Signed-off-by: Jeremy Kerr --- templates/patchwork/base.html | 77 +++++++++++ templates/patchwork/bundle-public.html | 12 ++ templates/patchwork/bundle.html | 39 ++++++ templates/patchwork/filters.html | 173 +++++++++++++++++++++++ templates/patchwork/list.html | 24 ++++ templates/patchwork/login.html | 26 ++++ templates/patchwork/logout.html | 8 ++ templates/patchwork/pagination.html | 45 ++++++ templates/patchwork/patch-form.html | 87 ++++++++++++ templates/patchwork/patch-list.html | 185 +++++++++++++++++++++++++ templates/patchwork/patch.html | 214 +++++++++++++++++++++++++++++ templates/patchwork/patchlist.html | 36 +++++ templates/patchwork/profile.html | 114 +++++++++++++++ templates/patchwork/project.html | 32 +++++ templates/patchwork/projects.html | 21 +++ templates/patchwork/register-confirm.html | 13 ++ templates/patchwork/register.html | 122 ++++++++++++++++ templates/patchwork/todo-list.html | 17 +++ templates/patchwork/todo-lists.html | 29 ++++ templates/patchwork/user-link-confirm.html | 19 +++ templates/patchwork/user-link.html | 30 ++++ 21 files changed, 1323 insertions(+) create mode 100644 templates/patchwork/base.html create mode 100644 templates/patchwork/bundle-public.html create mode 100644 templates/patchwork/bundle.html create mode 100644 templates/patchwork/filters.html create mode 100644 templates/patchwork/list.html create mode 100644 templates/patchwork/login.html create mode 100644 templates/patchwork/logout.html create mode 100644 templates/patchwork/pagination.html create mode 100644 templates/patchwork/patch-form.html create mode 100644 templates/patchwork/patch-list.html create mode 100644 templates/patchwork/patch.html create mode 100644 templates/patchwork/patchlist.html create mode 100644 templates/patchwork/profile.html create mode 100644 templates/patchwork/project.html create mode 100644 templates/patchwork/projects.html create mode 100644 templates/patchwork/register-confirm.html create mode 100644 templates/patchwork/register.html create mode 100644 templates/patchwork/todo-list.html create mode 100644 templates/patchwork/todo-lists.html create mode 100644 templates/patchwork/user-link-confirm.html create mode 100644 templates/patchwork/user-link.html (limited to 'templates') diff --git a/templates/patchwork/base.html b/templates/patchwork/base.html new file mode 100644 index 0000000..c3a2206 --- /dev/null +++ b/templates/patchwork/base.html @@ -0,0 +1,77 @@ +{% load pwurl %} + + + + + {% block title %}Patchwork{% endblock %} - Patchwork + +{% block headers %}{% endblock %} + + +
+

+ Patchworkα + {% block heading %}{% endblock %}

+
+{% if user.is_authenticated %} + Logged in as + {{ user.username }} +
+ profile :: + todo + ({{ user.get_profile.n_todo_patches }})
+ logout :: + help +{% else %} + login +
+ register +
+ help +{% endif %} +
+
+
+ +{% if messages %} +
+ {% for message in messages %} +
{{ message }}
+ {% endfor %} +
+{% endif %} +
+{% block body %} +{% endblock %} +
+ + + + + + diff --git a/templates/patchwork/bundle-public.html b/templates/patchwork/bundle-public.html new file mode 100644 index 0000000..0ee57da --- /dev/null +++ b/templates/patchwork/bundle-public.html @@ -0,0 +1,12 @@ +{% extends "patchwork/base.html" %} + +{% load person %} + +{% block title %}{{project.name}}{% endblock %} +{% block heading %}Bundle: {{bundle.name}}{% endblock %} + +{% block body %} + +{% include "patchwork/patch-list.html" %} + +{% endblock %} diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html new file mode 100644 index 0000000..8fa694a --- /dev/null +++ b/templates/patchwork/bundle.html @@ -0,0 +1,39 @@ +{% extends "patchwork/base.html" %} + +{% load person %} + +{% block title %}{{project.name}}{% endblock %} +{% block heading %}bundle: {{bundle.name}}{% endblock %} + +{% block body %} + +

This bundle contains patches for the {{ bundle.project.linkname }} +project.

+ +

Download bundle as mbox

+ + +
+ + + + + + + +{{ bundleform }} + + + +
Bundle settings
+ + +
+
+ +
+ +{% include "patchwork/patch-list.html" %} + +{% endblock %} diff --git a/templates/patchwork/filters.html b/templates/patchwork/filters.html new file mode 100644 index 0000000..482bc98 --- /dev/null +++ b/templates/patchwork/filters.html @@ -0,0 +1,173 @@ + + + +
+
+ Filters: + {% if filters.applied_filters %} + {% for filter in filters.applied_filters %} + {{ filter.name }} = {{ filter.condition }} + {% if not filter.forced %} + + {% endif %} + {% if not forloop.last %}   |   {% endif %} + {% endfor %} + {% else %} + none + + {% endif %} +
+ +
+ + diff --git a/templates/patchwork/list.html b/templates/patchwork/list.html new file mode 100644 index 0000000..755c047 --- /dev/null +++ b/templates/patchwork/list.html @@ -0,0 +1,24 @@ +{% extends "patchwork/base.html" %} + +{% load person %} + +{% block title %}{{project.name}}{% endblock %} +{% block heading %}{{project.name}}{% endblock %} + +{% block body %} + +

Incoming patches

+ +{% if errors %} +

The following error{{ errors|length|pluralize:" was,s were" }} encountered +while updating patches:

+ +{% endif %} + +{% include "patchwork/patch-list.html" %} + +{% endblock %} diff --git a/templates/patchwork/login.html b/templates/patchwork/login.html new file mode 100644 index 0000000..4706dda --- /dev/null +++ b/templates/patchwork/login.html @@ -0,0 +1,26 @@ +{% extends "patchwork/base.html" %} + +{% block title %}Patchwork Login{% endblock %} +{% block heading %}Patchwork Login{% endblock %} + + +{% block body %} +
+ + + + + {% if error %} + + + + {% endif %} + {{ form }} + + + +
login
{{ error }}
+ +
+
+{% endblock %} diff --git a/templates/patchwork/logout.html b/templates/patchwork/logout.html new file mode 100644 index 0000000..737f1ce --- /dev/null +++ b/templates/patchwork/logout.html @@ -0,0 +1,8 @@ +{% extends "patchwork/base.html" %} + +{% block title %}Patchwork{% endblock %} +{% block heading %}Patchwork{% endblock %} + +{% block body %} +

Logged out

+{% endblock %} diff --git a/templates/patchwork/pagination.html b/templates/patchwork/pagination.html new file mode 100644 index 0000000..3e95126 --- /dev/null +++ b/templates/patchwork/pagination.html @@ -0,0 +1,45 @@ +{% load listurl %} + +{% ifnotequal page.paginator.num_pages 1 %} +
+{% if page.has_previous %} + + « Previous +{% else %} + « Previous +{% endif %} + +{% if page.paginator.trailing_set %} + {% for p in page.paginator.trailing_set %} + {{ p }} + {% endfor %} + ... +{% endif %} + +{% for p in page.paginator.adjacent_set %} + {% ifequal p page.number %} + {{ p }} + {% else %} + {{ p }} + {% endifequal %} +{% endfor %} + +{% if page.paginator.leading_set %} + ... + {% for p in page.paginator.leading_set %} + {{ p }} + {% endfor %} +{% endif %} + +{% if page.has_next %} + + Next » + +{% else %} + Next » +{% endif %} +
+{% endifnotequal %} diff --git a/templates/patchwork/patch-form.html b/templates/patchwork/patch-form.html new file mode 100644 index 0000000..9d2c954 --- /dev/null +++ b/templates/patchwork/patch-form.html @@ -0,0 +1,87 @@ + +
+ +
+

Properties

+ + + + + + + + + + + + +
Change state:{{ patchform.state }}
Delegate to: + {{ patchform.delegate }}
+ +
+ +
+ +
+

Actions

+ + + + + + + + + +{% if bundles %} + + + + +{% endif %} + + + + +
Ack: +
+ + +
+
Create bundle: + {% if createbundleform.name.errors %} + {{createbundleform.errors}} + {% endif %} +
+ + {{ createbundleform.name }} + +
+
Add to bundle: +
+ + + + +
+
Archive: +
+ + +
+
+ + +
+ +
+
+
+ diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html new file mode 100644 index 0000000..0a15e9c --- /dev/null +++ b/templates/patchwork/patch-list.html @@ -0,0 +1,185 @@ +{% load person %} +{% load listurl %} + +{% include "patchwork/pagination.html" %} + + + + + + +
+ {% include "patchwork/filters.html" %} +
+ +{% if page.paginator.long_page and user.is_authenticated %} +
+ ▾ +
+{% endif %} + +
+ + + + + {% if patchform or bundle %} + + + + + + + + + + +{% if page %} + {% for patch in page.object_list %} + + {% if patchform or bundle %} + + {% endif %} + + + + + + {% endfor %} +
+ {% endif %} + + + {% ifequal order.name "name" %} + Patch + {% else %} + Patch + {% endifequal %} + + {% ifequal order.name "date" %} + Date + {% else %} + Date + {% endifequal %} + + {% ifequal order.name "submitter" %} + Submiter + {% else %} + Submitter + {% endifequal %} + + {% ifequal order.name "state" %} + State + {% else %} + State + {% endifequal %} +
+ + {{ patch.name }}{{ patch.date|date:"Y-m-d" }}{{ patch.submitter|personify }}{{ patch.state }}
+ +{% include "patchwork/pagination.html" %} + +
+ +{% if patchform %} +
+

Properties

+ + + + + + + + + + + + + + + +
Change state: + {{ patchform.state }} + {{ patchform.state.errors }} +
Delegate to: + + {{ patchform.delegate }} + {{ patchform.delegate.errors }} +
Archive: + + {{ patchform.archived }} + {{ patchform.archived.errors }} +
+ +
+
+ +{% endif %} + +{% if user.is_authenticated %} +
+

Bundling

+ + + + + + + {% if bundles %} + + + + + {% endif %} + {% if bundle %} + + + + + {% endif %} +
Create bundle: + + +
Add to bundle: + + +
Remove from bundle: + + +
+
+{% endif %} + + +
+
+
+ +{% else %} + + No patches to display + +{% endif %} + + +
+ diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html new file mode 100644 index 0000000..6ca6761 --- /dev/null +++ b/templates/patchwork/patch.html @@ -0,0 +1,214 @@ +{% extends "patchwork/base.html" %} + +{% load syntax %} +{% load person %} +{% load patch %} + +{% block title %}{{patch.name}} - Patchwork{% endblock %} +{% block heading %}{{patch.name}}{%endblock%} + +{% block body %} + + + + + + + + + + + + + + + + + + + + + + + + + +{% if patch.delegate %} + + + +{% endif %} + + + + +
Submitter{{ patch.submitter|personify }}
Date{{ patch.date }}
Message ID{{ patch.msgid }}
Download + mbox | + patch +
Permalink{{ patch.get_absolute_url }} +
State + {{ patch.state.name }}{% if patch.archived %}, archived{% endif %}
Delegated to: + {{ patch.delegate.get_profile.name }}
Headersshow + +
+ +
+ +{% if patchform %} +
+

Patch Properties

+
+ + + + + + + + + + + + + + + +
Change state: + {{ patchform.state }} + {{ patchform.state.errors }} +
Delegate to: + + {{ patchform.delegate }} + {{ patchform.delegate.errors }} +
Archived: + + {{ patchform.archived }} + {{ patchform.archived.errors }} +
+ +
+
+
+{% endif %} + +{% if createbundleform %} +
+

Bundling

+ + + + + + +{% if bundles %} + + + + +{% endif %} +
Create bundle: + {% if createbundleform.non_field_errors %} +
{{createbundleform.non_field_errors}}
+ {% endif %} +
+ + {% if createbundleform.name.errors %} +
{{createbundleform.name.errors}}
+ {% endif %} + {{ createbundleform.name }} + +
+
Add to bundle: +
+ + + +
+
+ + +
+{% endif %} + +{% if actionsform %} +
+

Actions

+ + + + + +
Ack: +
+ + +
+
+ +
+ +{% endif %} +
+
+
+ + + + +

Comments

+{% for comment in patch.comments %} +
+
{{ comment.submitter|personify }} - {{comment.date}}
+
+{{ comment|commentsyntax }}
+
+
+{% endfor %} + +

Patch

+
+
+{{ patch|patchsyntax }}
+
+
+ +{% endblock %} diff --git a/templates/patchwork/patchlist.html b/templates/patchwork/patchlist.html new file mode 100644 index 0000000..1bcd2c1 --- /dev/null +++ b/templates/patchwork/patchlist.html @@ -0,0 +1,36 @@ + +{% load person %} + +{% if patches %} +
+ + + {% if patchform %} + + + + + + {% for patch in patches %} + + {% if patchform %} + + {% endif %} + + + + + + {% endfor %} +
+ {% endif %} + PatchDateSubmitterState
+ + + {{ patch.name }}{{ patch.date|date:"Y-m-d" }}{{ patch.submitter|personify }}{{ patch.state }}
+ +{% include "patchwork/patch-form.html" %} + +{% else %} +

No patches to display

+{% endif %} diff --git a/templates/patchwork/profile.html b/templates/patchwork/profile.html new file mode 100644 index 0000000..35f3d4f --- /dev/null +++ b/templates/patchwork/profile.html @@ -0,0 +1,114 @@ +{% extends "patchwork/base.html" %} + +{% block title %}User Profile: {{ user.username }}{% endblock %} +{% block heading %}User Profile: {{ user.username }}{% endblock %} + + +{% block body %} + +

+{% if user.get_profile.maintainer_projects.count %} +Maintainer of +{% for project in user.get_profile.maintainer_projects.all %} +{{ project.linkname }}{% if not forloop.last %},{% endif %}{% endfor %}. +{% endif %} + +{% if user.get_profile.contributor_projects.count %} +Contributor to +{% for project in user.get_profile.contributor_projects.all %} +{{ project.linkname }}{% if not forloop.last %},{% endif %}{% endfor %}. +{% endif %} +

+ +

Todo

+{% if user.get_profile.n_todo_patches %} +

Your todo +list contains {{ user.get_profile.n_todo_patches }} +patch{{ user.get_profile.n_todo_patches|pluralize:"es" }}.

+{% else %} +

Your todo list contains patches that have been delegated to you. You +have no items in your todo list at present.

+{% endif %} +

Bundles

+ +{% if bundles %} + + + + + +{% for bundle in bundles %} + + + + + +{% endfor %} +
Bundle namePatches + Public Link
{{ bundle.name }}{{ bundle.n_patches }} + {% if bundle.public %} + {{ bundle.public_url }} + {% endif %} +
+{% else %} +

no bundles

+{% endif %} + + +

Linked email addresses

+

The following email addresses are associated with this patchwork account. +Adding alternative addresses allows patchwork to group contributions that +you have made under different addressses.

+

Adding a new email address will send a confirmation email to that +address.

+ + + + + + + + +{% for email in linked_emails %} + {% ifnotequal email.email user.email %} + + + + {% endifnotequal %} +{% endfor %} + + + +
email +
{{ user.email }}
{{ email.email }} + {% ifnotequal user.email email.email %} + + + + {% endifnotequal %} +
+
+ {{ linkform.email }} + +
+
+ +

Settings

+ +
+ +{{ profileform }} + + + +
+ + +
+
+ +{% endblock %} diff --git a/templates/patchwork/project.html b/templates/patchwork/project.html new file mode 100644 index 0000000..4ea1009 --- /dev/null +++ b/templates/patchwork/project.html @@ -0,0 +1,32 @@ +{% extends "patchwork/base.html" %} + +{% block title %}{{ project.name }}{% endblock %} +{% block heading %}{{ project.name }}{% endblock %} + +{% block body %} + + + + + + + + + + + + + + + + +
Name{{project.name}} +
List address{{project.listemail}}
Maintainer{{maintainers|length|pluralize}} + {% for maintainer in maintainers %} + {{ maintainer.get_profile.name }} + <{{maintainer.email}}> +
+ {% endfor %} +
Patch count{{n_patches}} (+ {{n_archived_patches}} archived)
+ +{% endblock %} diff --git a/templates/patchwork/projects.html b/templates/patchwork/projects.html new file mode 100644 index 0000000..349f314 --- /dev/null +++ b/templates/patchwork/projects.html @@ -0,0 +1,21 @@ +{% extends "patchwork/base.html" %} + +{% block title %}Project List{% endblock %} +{% block heading %}Project List{% endblock %} + +{% block body %} + +{% if projects %} +
+ {% for p in projects %} +
+ {{p.linkname}}
+
{{p.name}}
+ {% endfor %} +
+{% else %} +

Patchwork doesn't have any projects to display!

+{% endif %} + +{% endblock %} diff --git a/templates/patchwork/register-confirm.html b/templates/patchwork/register-confirm.html new file mode 100644 index 0000000..2af5744 --- /dev/null +++ b/templates/patchwork/register-confirm.html @@ -0,0 +1,13 @@ +{% extends "patchwork/base.html" %} + +{% block title %}Registration{% endblock %} +{% block heading %}Registration{% endblock %} + +{% block body %} +

Registraton confirmed!

+ +

Your patchwork registration is complete. Head over to your profile to start using +patchwork's extra features.

+ +{% endblock %} diff --git a/templates/patchwork/register.html b/templates/patchwork/register.html new file mode 100644 index 0000000..8bd422e --- /dev/null +++ b/templates/patchwork/register.html @@ -0,0 +1,122 @@ +{% extends "patchwork/base.html" %} + +{% block title %}Patchwork Registration{% endblock %} +{% block heading %}Patchwork Registration{% endblock %} + + +{% block body %} + +{% if request %} +

Registration successful!

+

email sent to {{ request.email }}

+

Beta note: While we're testing, the confirmation email has been replaced + by a single link: + {% url patchwork.views.user.register_confirm key=request.key %} +

+{% else %} +

By creating a patchwork account, you can:

+

    +
  • create "bundles" of patches
    • +
  • update the state of your own patches
    • +
+
+ + + + + {% if error %} + + + + {% endif %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
register
{{ error }}
{{ form.first_name.label_tag }} +{% if form.first_name.errors %} + {{ form.first_name.errors }} +{% endif %} + {{ form.first_name }} +{% if form.first_name.help_text %} +
{{ form.first_name.help_text }}
+{% endif %} +
{{ form.last_name.label_tag }} +{% if form.last_name.errors %} + {{ form.last_name.errors }} +{% endif %} + {{ form.last_name }} +{% if form.last_name.help_text %} +
{{ form.last_name.help_text }}
+{% endif %} +
+ Your name is used to identify you on the site +
{{ form.email.label_tag }} +{% if form.email.errors %} + {{ form.email.errors }} +{% endif %} + {{ form.email }} +{% if form.email.help_text %} +
{{ form.email.help_text }}
+{% endif %} +
+ Patchwork will send a confirmation email to this address +
{{ form.username.label_tag }} +{% if form.username.errors %} + {{ form.username.errors }} +{% endif %} + {{ form.username }} +{% if form.username.help_text %} +
{{ form.username.help_text }}
+{% endif %} +
{{ form.password.label_tag }} +{% if form.password.errors %} + {{ form.password.errors }} +{% endif %} + {{ form.password }} +{% if form.password.help_text %} +
{{ form.password.help_text }}
+{% endif %} +
+ +
+
+{% endif %} + +{% endblock %} diff --git a/templates/patchwork/todo-list.html b/templates/patchwork/todo-list.html new file mode 100644 index 0000000..8a5ab7a --- /dev/null +++ b/templates/patchwork/todo-list.html @@ -0,0 +1,17 @@ +{% extends "patchwork/base.html" %} + +{% load person %} + +{% block title %}{{ user }}'s todo list{% endblock %} +{% block heading %}{{user}}'s todo list for {{ project.linkname }}{% endblock %} + +{% block body %} + +

A Patchwork Todo-list contains patches that are assigned to you, and +are in an "action required" state +({% for state in action_required_states %}{% if forloop.last and not forloop.first %} or {% endif %}{{ state }}{% if not forloop.last and not forloop.first %}, {%endif %}{% endfor %}), and are not archived. +

+ +{% include "patchwork/patch-list.html" %} + +{% endblock %} diff --git a/templates/patchwork/todo-lists.html b/templates/patchwork/todo-lists.html new file mode 100644 index 0000000..8eb10cc --- /dev/null +++ b/templates/patchwork/todo-lists.html @@ -0,0 +1,29 @@ +{% extends "patchwork/base.html" %} + +{% block title %}{{ user }}'s todo lists{% endblock %} +{% block heading %}{{ user }}'s todo lists{% endblock %} + +{% block body %} + +{% if todo_lists %} +

You have multiple todo lists. Each todo list contains patches for a single + project.

+ + + + + +{% for todo_list in todo_lists %} + + + + +{% endfor %} +
projectpatches
{{ todo_list.project.name }}{{ todo_list.n_patches }}
+ +{% else %} + No todo lists +{% endif %} +{% endblock %} diff --git a/templates/patchwork/user-link-confirm.html b/templates/patchwork/user-link-confirm.html new file mode 100644 index 0000000..61979cf --- /dev/null +++ b/templates/patchwork/user-link-confirm.html @@ -0,0 +1,19 @@ +{% extends "patchwork/base.html" %} + +{% block title %}{{ user.username }}{% endblock %} +{% block heading %}link accounts for {{ user.username }}{% endblock %} + + +{% block body %} + +{% if errors %} +

{{ errors }}

+{% else %} +

You have sucessfully linked the email address {{ person.email }} to + your patchwork account

+ +{% endif %} +

Back to your + profile.

+ +{% endblock %} diff --git a/templates/patchwork/user-link.html b/templates/patchwork/user-link.html new file mode 100644 index 0000000..3eeb527 --- /dev/null +++ b/templates/patchwork/user-link.html @@ -0,0 +1,30 @@ +{% extends "patchwork/base.html" %} + +{% block title %}{{ user.username }}{% endblock %} +{% block heading %}link accounts for {{ user.username }}{% endblock %} + + +{% block body %} + +{% if confirmation %} +

A confirmation email has been sent to {{ confirmation.email }}.

+ +

beta link: {% url patchwork.views.user.link_confirm key=confirmation.key %}

+ +{% else %} + + {% if form.errors %} +

There was an error submitting your link request.

+ {{ form.non_field_errors }} + {% endif %} + +
+ {{linkform.email.errors}} + Link an email address: {{ linkform.email }} +
+ +{% endif %} + +{% endblock %} -- cgit v1.2.3