From ad2762cf775a8dde508de47164d6429f3fd724f1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sun, 24 May 2015 16:57:33 +0800 Subject: Move to a more recent django project structure This change updates patchwor to the newer project struture: we've moved the actual application out of the apps/ directory, and the patchwork-specific templates to under the patchwork application. This gives us the manage.py script in the top-level now. Signed-off-by: Jeremy Kerr --- templates/patchwork/activation_email.txt | 11 - templates/patchwork/activation_email_subject.txt | 1 - templates/patchwork/bundle.html | 47 ---- templates/patchwork/bundles.html | 59 ----- templates/patchwork/confirm-error.html | 19 -- templates/patchwork/filters.html | 183 -------------- templates/patchwork/help/about.html | 17 -- templates/patchwork/help/index.html | 2 - templates/patchwork/help/pwclient.html | 23 -- templates/patchwork/list.html | 25 -- templates/patchwork/login.html | 27 --- templates/patchwork/logout.html | 8 - templates/patchwork/mail-form.html | 38 --- templates/patchwork/mail-settings.html | 37 --- templates/patchwork/optin-request.html | 50 ---- templates/patchwork/optin-request.mail | 12 - templates/patchwork/optin.html | 19 -- templates/patchwork/optout-request.html | 51 ---- templates/patchwork/optout-request.mail | 12 - templates/patchwork/optout.html | 22 -- templates/patchwork/pagination.html | 45 ---- .../patch-change-notification-subject.text | 1 - templates/patchwork/patch-change-notification.mail | 20 -- templates/patchwork/patch-list.html | 268 --------------------- templates/patchwork/patch.html | 199 --------------- templates/patchwork/profile.html | 144 ----------- templates/patchwork/project.html | 58 ----- templates/patchwork/projects.html | 27 --- templates/patchwork/pwclient | 1 - templates/patchwork/pwclientrc | 15 -- templates/patchwork/register.mail | 11 - templates/patchwork/registration-confirm.html | 13 - templates/patchwork/registration_form.html | 121 ---------- templates/patchwork/todo-list.html | 17 -- templates/patchwork/todo-lists.html | 29 --- templates/patchwork/user-link-confirm.html | 19 -- templates/patchwork/user-link.html | 32 --- templates/patchwork/user-link.mail | 12 - 38 files changed, 1695 deletions(-) delete mode 100644 templates/patchwork/activation_email.txt delete mode 100644 templates/patchwork/activation_email_subject.txt delete mode 100644 templates/patchwork/bundle.html delete mode 100644 templates/patchwork/bundles.html delete mode 100644 templates/patchwork/confirm-error.html delete mode 100644 templates/patchwork/filters.html delete mode 100644 templates/patchwork/help/about.html delete mode 100644 templates/patchwork/help/index.html delete mode 100644 templates/patchwork/help/pwclient.html delete mode 100644 templates/patchwork/list.html delete mode 100644 templates/patchwork/login.html delete mode 100644 templates/patchwork/logout.html delete mode 100644 templates/patchwork/mail-form.html delete mode 100644 templates/patchwork/mail-settings.html delete mode 100644 templates/patchwork/optin-request.html delete mode 100644 templates/patchwork/optin-request.mail delete mode 100644 templates/patchwork/optin.html delete mode 100644 templates/patchwork/optout-request.html delete mode 100644 templates/patchwork/optout-request.mail delete mode 100644 templates/patchwork/optout.html delete mode 100644 templates/patchwork/pagination.html delete mode 100644 templates/patchwork/patch-change-notification-subject.text delete mode 100644 templates/patchwork/patch-change-notification.mail delete mode 100644 templates/patchwork/patch-list.html delete mode 100644 templates/patchwork/patch.html delete mode 100644 templates/patchwork/profile.html delete mode 100644 templates/patchwork/project.html delete mode 100644 templates/patchwork/projects.html delete mode 120000 templates/patchwork/pwclient delete mode 100644 templates/patchwork/pwclientrc delete mode 100644 templates/patchwork/register.mail delete mode 100644 templates/patchwork/registration-confirm.html delete mode 100644 templates/patchwork/registration_form.html delete mode 100644 templates/patchwork/todo-list.html delete mode 100644 templates/patchwork/todo-lists.html delete mode 100644 templates/patchwork/user-link-confirm.html delete mode 100644 templates/patchwork/user-link.html delete mode 100644 templates/patchwork/user-link.mail (limited to 'templates/patchwork') diff --git a/templates/patchwork/activation_email.txt b/templates/patchwork/activation_email.txt deleted file mode 100644 index caf514a..0000000 --- a/templates/patchwork/activation_email.txt +++ /dev/null @@ -1,11 +0,0 @@ -Hi, - -This email is to confirm your account on the patchwork patch-tracking -system. You can activate your account by visiting the url: - - http://{{site.domain}}{% url 'patchwork.views.confirm' key=confirmation.key %} - -If you didn't request a user account on patchwork, then you can ignore -this mail. - -Happy patchworking. diff --git a/templates/patchwork/activation_email_subject.txt b/templates/patchwork/activation_email_subject.txt deleted file mode 100644 index c409f38..0000000 --- a/templates/patchwork/activation_email_subject.txt +++ /dev/null @@ -1 +0,0 @@ -Patchwork account confirmation diff --git a/templates/patchwork/bundle.html b/templates/patchwork/bundle.html deleted file mode 100644 index 4a96b6b..0000000 --- a/templates/patchwork/bundle.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends "base.html" %} - -{% load person %} -{% load static %} - -{% block headers %} - - - -{% endblock %} -{% block title %}{{project.name}}{% endblock %} -{% block heading %}bundle: {{bundle.owner.username}} / -{{bundle.name}}{% endblock %} - -{% block body %} - -

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

- -

Download bundle as mbox

- -{% if bundleform %} -
- {% csrf_token %} - - - - - - - -{{ bundleform }} - - - -
Bundle settings
- - -
-
- -
-{% endif %} - -{% include "patchwork/patch-list.html" %} - -{% endblock %} diff --git a/templates/patchwork/bundles.html b/templates/patchwork/bundles.html deleted file mode 100644 index 11fb89d..0000000 --- a/templates/patchwork/bundles.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "base.html" %} - -{% load static %} - -{% block title %}Bundles{% endblock %} -{% block heading %}Bundles{% endblock %} - -{% block body %} - -{% if bundles %} - - - - - - - - -{% for bundle in bundles %} - - - - - - - - - -{% endfor %} -
NameProjectPublic LinkPatches - DownloadDelete
{{ bundle.name }}{{ bundle.project.linkname }} - {% if bundle.public %} - {{ bundle.public_url }} - {% endif %} - {{ bundle.n_patches }}download -
- {% csrf_token %} - {{ bundle.delete_form.as_p }} - -
-
-{% endif %} - -

Bundles are groups of related patches. You can create bundles by -selecting patches from a project, then using the 'create bundle' form -to give your bundle a name. Each bundle can be public or private; public -bundles are given a persistent URL, based you your username and the name -of the bundle. Private bundles are only visible to you.

- -{% if not bundles %} -

You have no bundles.

-{% endif %} -{% endblock %} diff --git a/templates/patchwork/confirm-error.html b/templates/patchwork/confirm-error.html deleted file mode 100644 index 81292e2..0000000 --- a/templates/patchwork/confirm-error.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Confirmation{% endblock %} -{% block heading %}Confirmation{% endblock %} - - -{% block body %} - -{% if error == 'inactive' %} -

This confirmation has already been processed; you've probably visited this -page before.

-{% endif %} - -{% if error == 'expired' %} -

The confirmation has expired. If you'd still like to perform the -{{conf.get_type_display}} process, you'll need to resubmit the request.

-{% endif %} - -{% endblock %} diff --git a/templates/patchwork/filters.html b/templates/patchwork/filters.html deleted file mode 100644 index 10ca587..0000000 --- a/templates/patchwork/filters.html +++ /dev/null @@ -1,183 +0,0 @@ -{% load static %} - - - -
-
- Filters: - {% if filters.applied_filters %} - {% for filter in filters.applied_filters %} - {{ filter.name }} = {{ filter.condition }} - {% if not filter.forced %} - remove filter - {% endif %} - {% if not forloop.last %}   |   {% endif %} - {% endfor %} - {% else %} - none - add filter - {% endif %} -
- -
- - diff --git a/templates/patchwork/help/about.html b/templates/patchwork/help/about.html deleted file mode 100644 index 7befa6b..0000000 --- a/templates/patchwork/help/about.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "base.html" %} - -{% block title %}About{% endblock %} -{% block heading %} - About Patchwork{% endblock %} - -{% block body %} - -

Patchwork is free software, and is available from the -patchwork website.

- -

Patchwork is built on the django -web framework.

- -

Icons from the Sweetie icon set. - -{% endblock %} - diff --git a/templates/patchwork/help/index.html b/templates/patchwork/help/index.html deleted file mode 100644 index 5cb6467..0000000 --- a/templates/patchwork/help/index.html +++ /dev/null @@ -1,2 +0,0 @@ -{% extends "base.html" %} - diff --git a/templates/patchwork/help/pwclient.html b/templates/patchwork/help/pwclient.html deleted file mode 100644 index 7101ec1..0000000 --- a/templates/patchwork/help/pwclient.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Command-line client{% endblock %} -{% block heading %} - Command-line client{% endblock %} - -{% block body %} - -

pwclient is the command-line client for patchwork. Currently, -it provides access to some read-only features of patchwork, such as downloading -and applying patches.

- -

To use pwclient, you will need:

- - -

You can create your own .pwclientrc file. Each -patchwork project -provides a sample linked from the 'project info' page.

- -{% endblock %} diff --git a/templates/patchwork/list.html b/templates/patchwork/list.html deleted file mode 100644 index 654fe8c..0000000 --- a/templates/patchwork/list.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "base.html" %} - -{% load person %} -{% load static %} - -{% 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 deleted file mode 100644 index 2dfc2a7..0000000 --- a/templates/patchwork/login.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Login{% endblock %} -{% block heading %}Login{% endblock %} - - -{% block body %} -
-{% csrf_token %} - - - - - {% if error %} - - - - {% endif %} - {{ form }} - - - -
login
{{ error }}
- -
-
-{% endblock %} diff --git a/templates/patchwork/logout.html b/templates/patchwork/logout.html deleted file mode 100644 index f030aee..0000000 --- a/templates/patchwork/logout.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Logout{% endblock %} -{% block heading %}Logout{% endblock %} - -{% block body %} -

Logged out

-{% endblock %} diff --git a/templates/patchwork/mail-form.html b/templates/patchwork/mail-form.html deleted file mode 100644 index d71b2fb..0000000 --- a/templates/patchwork/mail-form.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base.html" %} - -{% block title %}mail settings{% endblock %} -{% block heading %}mail settings{% endblock %} - -{% block body %} - -

You can configure patchwork to send you mail on certain events, -or block automated mail altogether. Enter your email address to -view or change your email settings.

- -
-{% csrf_token %} - -{% if form.errors %} - - - -{% endif %} - - - - - - - -
- There was an error accessing your mail settings: -
{{ form.email.label_tag }} - {{form.email}} - {{form.email.errors}} -
- -
-
- - -{% endblock %} diff --git a/templates/patchwork/mail-settings.html b/templates/patchwork/mail-settings.html deleted file mode 100644 index 440af08..0000000 --- a/templates/patchwork/mail-settings.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "base.html" %} - -{% block title %}mail settings{% endblock %} -{% block heading %}mail settings{% endblock %} - -{% block body %} -

Settings for {{email}}:

- - - - -{% if is_optout %} - - - -{% else %} - - -{% endif %} - -
Opt-out listPatchwork may not send automated notifications to - this address. -
- {% csrf_token %} - - -
- 		Patchwork may send automated notifications to - this address. -
- {% csrf_token %} - - -
-
- -{% endblock %} diff --git a/templates/patchwork/optin-request.html b/templates/patchwork/optin-request.html deleted file mode 100644 index 3dfb1bd..0000000 --- a/templates/patchwork/optin-request.html +++ /dev/null @@ -1,50 +0,0 @@ -{% extends "base.html" %} - -{% block title %}opt-in{% endblock %} -{% block heading %}opt-in{% endblock %} - -{% block body %} -{% if email_sent %} -

Opt-in confirmation email sent

-

An opt-in confirmation mail has been sent to -{{confirmation.email}}, containing a link. Please click on -that link to confirm your opt-in.

-{% else %} -{% if error %} -

{{error}}

-{% endif %} - -{% if form %} -

This form allows you to opt-in to automated email from patchwork. Use -this if you have previously opted-out of patchwork mail, but now want to -received notifications from patchwork.

-When you submit it, an email will be sent to your address with a link to click -to finalise the opt-in. Patchwork does this to prevent someone opting you in -without your consent.

-
-{% csrf_token %} -{{form.email.errors}} -
-{{form.email.label_tag}}: {{form.email}} -
- -
-{% endif %} - -{% if error and admins %} -

If you are having trouble opting in, please email -{% for admin in admins %} -{% if admins|length > 1 and forloop.last %} or {% endif %} -{{admin.0}} <{{admin.1}}>{% if admins|length > 2 and not forloop.last %}, {% endif %} -{% endfor %} -{% endif %} - -{% endif %} - -{% if user.is_authenticated %} -

Return to your user -profile.

-{% endif %} - -{% endblock %} diff --git a/templates/patchwork/optin-request.mail b/templates/patchwork/optin-request.mail deleted file mode 100644 index d97c78b..0000000 --- a/templates/patchwork/optin-request.mail +++ /dev/null @@ -1,12 +0,0 @@ -Hi, - -This email is to confirm that you would like to opt-in to automated -email from the patchwork system at {{site.domain}}. - -To complete the opt-in process, visit: - - http://{{site.domain}}{% url 'patchwork.views.confirm' key=confirmation.key %} - -If you didn't request this opt-in, you don't need to do anything. - -Happy patchworking. diff --git a/templates/patchwork/optin.html b/templates/patchwork/optin.html deleted file mode 100644 index 01aaa0e..0000000 --- a/templates/patchwork/optin.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base.html" %} - -{% block title %}opt-in{% endblock %} -{% block heading %}opt-in{% endblock %} - -{% block body %} - -

Opt-in complete. You have sucessfully opted back in to -automated email from this patchwork system, using the address -{{email}}.

-

If you later decide that you no longer want to receive automated mail from -patchwork, just visit http://{{site.domain}}{% url 'patchwork.views.mail.settings' %}, or -visit the main patchwork page and navigate from there.

-{% if user.is_authenticated %} -

Return to your user -profile.

-{% endif %} -{% endblock %} diff --git a/templates/patchwork/optout-request.html b/templates/patchwork/optout-request.html deleted file mode 100644 index 092dbbb..0000000 --- a/templates/patchwork/optout-request.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "base.html" %} - -{% block title %}opt-out{% endblock %} -{% block heading %}opt-out{% endblock %} - -{% block body %} -{% if email_sent %} -

Opt-out confirmation email sent

-

An opt-out confirmation mail has been sent to -{{confirmation.email}}, containing a link. Please click on -that link to confirm your opt-out.

-{% else %} -{% if error %} -

{{error}}

-{% endif %} - -{% if form %} -

This form allows you to opt-out of automated email from patchwork.

-

If you opt-out of email, Patchwork may still email you if you do certain -actions yourself (such as create a new patchwork account), but will not send -you unsolicited email.

-When you submit it, one email will be sent to your address with a link to click -to finalise the opt-out. Patchwork does this to prevent someone opting you out -without your consent.

-
-{% csrf_token %} -{{form.email.errors}} -
-{{form.email.label_tag}}: {{form.email}} -
- -
-{% endif %} - -{% if error and admins %} -

If you are having trouble opting out, please email -{% for admin in admins %} -{% if admins|length > 1 and forloop.last %} or {% endif %} -{{admin.0}} <{{admin.1}}>{% if admins|length > 2 and not forloop.last %}, {% endif %} -{% endfor %} -{% endif %} - -{% endif %} - -{% if user.is_authenticated %} -

Return to your user -profile.

-{% endif %} - -{% endblock %} diff --git a/templates/patchwork/optout-request.mail b/templates/patchwork/optout-request.mail deleted file mode 100644 index 67203ca..0000000 --- a/templates/patchwork/optout-request.mail +++ /dev/null @@ -1,12 +0,0 @@ -Hi, - -This email is to confirm that you would like to opt-out from all email -from the patchwork system at {{site.domain}}. - -To complete the opt-out process, visit: - - http://{{site.domain}}{% url 'patchwork.views.confirm' key=confirmation.key %} - -If you didn't request this opt-out, you don't need to do anything. - -Happy patchworking. diff --git a/templates/patchwork/optout.html b/templates/patchwork/optout.html deleted file mode 100644 index b140bf4..0000000 --- a/templates/patchwork/optout.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "base.html" %} - -{% block title %}opt-out{% endblock %} -{% block heading %}opt-out{% endblock %} - -{% block body %} - -

Opt-out complete. You have successfully opted-out of -automated notifications from this patchwork system, from the address -{{email}}

-

Please note that you may still receive email from other patchwork setups at -different sites, as they are run independently. You may need to opt-out of -those separately.

-

If you later decide to receive mail from patchwork, just visit -http://{{site.domain}}{% url 'patchwork.views.mail.settings' %}, or -visit the main patchwork page and navigate from there.

-{% if user.is_authenticated %} -

Return to your user -profile.

-{% endif %} -{% endblock %} diff --git a/templates/patchwork/pagination.html b/templates/patchwork/pagination.html deleted file mode 100644 index 3e95126..0000000 --- a/templates/patchwork/pagination.html +++ /dev/null @@ -1,45 +0,0 @@ -{% 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-change-notification-subject.text b/templates/patchwork/patch-change-notification-subject.text deleted file mode 100644 index c9d96d4..0000000 --- a/templates/patchwork/patch-change-notification-subject.text +++ /dev/null @@ -1 +0,0 @@ -[{{ projects|join:"," }}] Patch notification: {{notifications|length}} patch{{notifications|length|pluralize:"es"}} updated diff --git a/templates/patchwork/patch-change-notification.mail b/templates/patchwork/patch-change-notification.mail deleted file mode 100644 index 4246704..0000000 --- a/templates/patchwork/patch-change-notification.mail +++ /dev/null @@ -1,20 +0,0 @@ -Hello, - -The following patch{{notifications|length|pluralize:"es"}} (submitted by you) {{notifications|length|pluralize:"has,have"}} been updated in patchwork: -{% for notification in notifications %} - * {{notification.patch.project.linkname}}: {{notification.patch.name|safe}} - - http://{{site.domain}}{{notification.patch.get_absolute_url}} - - for: {{notification.patch.project.name}} - was: {{notification.orig_state}} - now: {{notification.patch.state}} -{% endfor %} -This email is a notification only - you do not need to respond. - -Happy patchworking. - --- - -This is an automated mail sent by the patchwork system at -{{site.domain}}. To stop receiving these notifications, edit -your mail settings at: - http://{{site.domain}}{% url 'patchwork.views.mail.settings' %} diff --git a/templates/patchwork/patch-list.html b/templates/patchwork/patch-list.html deleted file mode 100644 index 675f67f..0000000 --- a/templates/patchwork/patch-list.html +++ /dev/null @@ -1,268 +0,0 @@ -{% load person %} -{% load listurl %} -{% load static %} - -{% include "patchwork/pagination.html" %} - - - - - - {% if order.editable %} - - {% endif %} - -
- {% include "patchwork/filters.html" %} - -
- {% csrf_token %} - - - - - -
-
- -{% if page.paginator.long_page and user.is_authenticated %} -
- ▾ -
-{% endif %} - -
-{% csrf_token %} - - - - - - {% if user.is_authenticated %} - - {% endif %} - - - - - - - - - - - - - - -{% if page.paginator.count %} - - {% for patch in page.object_list %} - - {% if user.is_authenticated %} - - {% endif %} - - - - - - - {% endfor %} - -
- - - {% ifequal order.name "name" %} - Patch - {% else %} - {% if not order.editable %} - Patch - {% else %} - Patch - {% endif %} - {% endifequal %} - - {% ifequal order.name "date" %} - Date - {% else %} - {% if not order.editable %} - Date - {% else %} - Date - {% endif %} - {% endifequal %} - - {% ifequal order.name "submitter" %} - Submitter - {% else %} - {% if not order.editable %} - Submitter - {% else %} - Submitter - {% endif %} - {% endifequal %} - - {% ifequal order.name "delegate" %} - Delegate - {% else %} - {% if not order.editable %} - Delegate - {% else %} - Delegate - {% endif %} - {% endifequal %} - - {% ifequal order.name "state" %} - State - {% else %} - {% if not order.editable %} - State - {% else %} - State - {% endif %} - {% endifequal %} -
- - {{ patch.name|default:"[no subject]" }}{{ patch.date|date:"Y-m-d" }}{{ patch.submitter|personify:project }}{{ patch.delegate.username }}{{ 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 deleted file mode 100644 index f18ee3b..0000000 --- a/templates/patchwork/patch.html +++ /dev/null @@ -1,199 +0,0 @@ -{% extends "base.html" %} - -{% load syntax %} -{% load person %} -{% load patch %} - -{% block title %}{{patch.name}}{% endblock %} -{% block heading %}{{patch.name}}{%endblock%} - -{% block body %} - - - - - - - - - - - - - - - - - - - - - - - - - - -{% if patch.commit_ref %} - - - - -{% endif %} -{% if patch.delegate %} - - - - -{% endif %} - - - - -
Submitter{{ patch.submitter|personify:project }}
Date{{ patch.date }}
Message ID{{ patch.msgid }}
Download - mbox -{% if patch.content %}| - patch -{% endif %} -
Permalink{{ patch.get_absolute_url }} -
State{{ patch.state.name }}{% if patch.archived %}, archived{% endif %}
Commit{{ patch.commit_ref }}
Delegated to:{{ patch.delegate.profile.name }}
Headersshow - -
- -
- -{% if patchform %} -
-

Patch Properties

-
- {% csrf_token %} - - - - - - - - - - - - - - - - - -
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 %} -
- {% csrf_token %} - - {% if createbundleform.name.errors %} -
{{createbundleform.name.errors}}
- {% endif %} - {{ createbundleform.name }} - -
-
Add to bundle: -
- {% csrf_token %} - - - -
-
- -
-{% endif %} - -
-
-
- -{% if patch.pull_url %} -

Pull-request

-{{ patch.pull_url }} -{% endif %} - -

Comments

-{% for comment in patch.comments %} -
-
{{ comment.submitter|personify:project }} - {{comment.date}}
-
-{{ comment|commentsyntax }}
-
-
-{% endfor %} - -{% if patch.content %} -

Patch

-
-
-{{ patch|patchsyntax }}
-
-
-{% endif %} - - -{% endblock %} diff --git a/templates/patchwork/profile.html b/templates/patchwork/profile.html deleted file mode 100644 index 116d6d6..0000000 --- a/templates/patchwork/profile.html +++ /dev/null @@ -1,144 +0,0 @@ -{% extends "base.html" %} - -{% block title %}User Profile: {{ user.username }}{% endblock %} -{% block heading %}User Profile: {{ user.username }}{% endblock %} - - -{% block body %} - -

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

- -
-
-

Todo

-{% if user.profile.n_todo_patches %} -

Your todo - list contains {{ user.profile.n_todo_patches }} - patch{{ user.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 %} -
- -
-

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 addresses.

-

The "notify?" column allows you to opt-in or -out of automated -patchwork notification emails. Setting it to "no" will disable automated -notifications for that address.

-

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

- - - - - - -{% for email in linked_emails %} - - - - - -{% endfor %} - - - -
emailactionnotify?
{{ email.email }} - {% ifnotequal user.email email.email %} -
- {% csrf_token %} - -
- {% endifnotequal %} - 		- {% if email.is_optout %} -
- No, - {% csrf_token %} - - -
- {% else %} -
- Yes, - {% csrf_token %} - - -
- {% endif %} -
-
- {% csrf_token %} - {{ linkform.email }} - -
-
-
-
- -
- -
-

Bundles

- -{% if bundles %} -

You have the following bundle{{ bundle|length|pluralize }}:

- -

Visit the bundles - page to manage your bundles.

-{% else %} -

You have no bundles.

-{% endif %} -
- - -
-

Settings

- -
- {% csrf_token %} - -{{ profileform }} - - - -
- - -
-
-
- -
-

Authentication

-Change password -
- -
- -

- -{% endblock %} diff --git a/templates/patchwork/project.html b/templates/patchwork/project.html deleted file mode 100644 index be8cadc..0000000 --- a/templates/patchwork/project.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ project.name }}{% endblock %} -{% block heading %}{{ project.name }}{% endblock %} - -{% block body %} - - - - - - - - - - - - - - - - - -{% if project.web_url %} - - - - -{% endif %} -{% if project.webscm_url %} - - - - -{% endif %} -{% if project.scm_url %} - - - - -{% endif %} -
Name{{project.name}} -
List address{{project.listemail}}
Maintainer{{maintainers|length|pluralize}} - {% for maintainer in maintainers %} - {{ maintainer.profile.name }} - <{{maintainer.email}}> -
- {% endfor %} -
Patch count{{n_patches}} (+ {{n_archived_patches}} archived)
Website{{project.web_url}}
Source Code Web Interface{{project.webscm_url}}
Source Code Manager URL{{project.scm_url}}
- -{% if settings.ENABLE_XMLRPC %} -

Sample patchwork -client configuration for this project: .pwclientrc.

-{% endif %} - -{% endblock %} diff --git a/templates/patchwork/projects.html b/templates/patchwork/projects.html deleted file mode 100644 index 8c727ad..0000000 --- a/templates/patchwork/projects.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Project List{% endblock %} -{% block heading %}Project List{% endblock %} - -{% block body %} - -{% if projects %} -
- {% for p in projects %} -
-

- {{p.linkname}} -

-
{{p.name}}
-{% if p.web_url %} -
website
-{% endif %} -
- {% endfor %} -
-{% else %} -

Patchwork doesn't have any projects to display!

-{% endif %} - -{% endblock %} diff --git a/templates/patchwork/pwclient b/templates/patchwork/pwclient deleted file mode 120000 index ae4faf3..0000000 --- a/templates/patchwork/pwclient +++ /dev/null @@ -1 +0,0 @@ -../../apps/patchwork/bin/pwclient \ No newline at end of file diff --git a/templates/patchwork/pwclientrc b/templates/patchwork/pwclientrc deleted file mode 100644 index d331003..0000000 --- a/templates/patchwork/pwclientrc +++ /dev/null @@ -1,15 +0,0 @@ -# Sample .pwclientrc file for the {{ project.linkname }} project, -# running on {{ site.domain }}. -# -# Just append this file to your existing ~/.pwclientrc -# If you do not already have a ~/.pwclientrc, then copy this file to -# ~/.pwclientrc, and uncomment the following two lines: -# [options] -# default={{ project.linkname }} - -[{{ project.linkname }}] -url= {{scheme}}://{{site.domain}}{% url 'patchwork.views.xmlrpc.xmlrpc' %} -{% if user.is_authenticated %} -username: {{ user.username }} -password: -{% endif %} diff --git a/templates/patchwork/register.mail b/templates/patchwork/register.mail deleted file mode 100644 index 9079203..0000000 --- a/templates/patchwork/register.mail +++ /dev/null @@ -1,11 +0,0 @@ -Hi, - -This email is to confirm your account on the patchwork patch-tracking -system. You can activate your account by visiting the url: - - http://{{site.domain}}{% url 'registration_activateactivation_key'=request.key %} - -If you didn't request a user account on patchwork, then you can ignore -this mail. - -Happy patchworking. diff --git a/templates/patchwork/registration-confirm.html b/templates/patchwork/registration-confirm.html deleted file mode 100644 index 6111401..0000000 --- a/templates/patchwork/registration-confirm.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "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/registration_form.html b/templates/patchwork/registration_form.html deleted file mode 100644 index 3a314b8..0000000 --- a/templates/patchwork/registration_form.html +++ /dev/null @@ -1,121 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Registration{% endblock %} -{% block heading %}Registration{% endblock %} - - -{% block body %} - -{% if confirmation and not error %} -

Registration successful!

-

A confirmation email has been sent to {{ confirmation.email }}. You'll - need to visit the link provided in that email to confirm your - registration.

-

-{% else %} -

By creating a patchwork account, you can:

-

    -
  • create "bundles" of patches
    • -
  • update the state of your own patches
    • -
-
-{% csrf_token %} - - - - - {% 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 deleted file mode 100644 index b301901..0000000 --- a/templates/patchwork/todo-list.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "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 deleted file mode 100644 index e268160..0000000 --- a/templates/patchwork/todo-lists.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "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 deleted file mode 100644 index 449bfeb..0000000 --- a/templates/patchwork/user-link-confirm.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "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 deleted file mode 100644 index e436c3a..0000000 --- a/templates/patchwork/user-link.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ user.username }}{% endblock %} -{% block heading %}link accounts for {{ user.username }}{% endblock %} - - -{% block body %} - -{% if confirmation and not error %} -

A confirmation email has been sent to {{ confirmation.email }}. Click -on the link provided in the email to confirm that this address belongs to -you.

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

There was an error submitting your link request.

- {{ form.non_field_errors }} - {% endif %} - {% if error %} -
  • {{error}}
- {% endif %} - -
- {% csrf_token %} - {{linkform.email.errors}} - Link an email address: {{ linkform.email }} -
- -{% endif %} - -{% endblock %} diff --git a/templates/patchwork/user-link.mail b/templates/patchwork/user-link.mail deleted file mode 100644 index 8db6726..0000000 --- a/templates/patchwork/user-link.mail +++ /dev/null @@ -1,12 +0,0 @@ -Hi, - -This email is to confirm that you own the email address: - - {{ confirmation.email }} - -So that you can add it to your patchwork profile. You can confirm this -email address by visiting the url: - - http://{{site.domain}}{% url 'patchwork.views.confirm' key=confirmation.key %} - -Happy patchworking. -- cgit v1.2.3