From: Stephen Finucane Date: Fri, 10 Apr 2020 13:02:39 +0000 (+0100) Subject: templates: Use standard indentation X-Git-Tag: v3.1.0~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9aaf31f51b18d23a50f5e206e82561e7ac40c15b;p=thirdparty%2Fpatchwork.git templates: Use standard indentation Use a standard two space indentation across files, rewrapping some stuff as we go along. Signed-off-by: Stephen Finucane --- diff --git a/patchwork/templates/patchwork/about.html b/patchwork/templates/patchwork/about.html index 210e9513..43f3110b 100644 --- a/patchwork/templates/patchwork/about.html +++ b/patchwork/templates/patchwork/about.html @@ -48,8 +48,7 @@

REST - + {% if enabled_apis.rest %} enabled {% else %} @@ -58,8 +57,7 @@

XML-RPC - + {% if enabled_apis.xmlrpc %} enabled {% else %} diff --git a/patchwork/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html index 411c18b5..fc87eac4 100644 --- a/patchwork/templates/patchwork/bundle.html +++ b/patchwork/templates/patchwork/bundle.html @@ -4,37 +4,34 @@ {% load static %} {% block headers %} - - + + {% endblock %} -{% block title %}{{project.name}}{% endblock %} +{% block title %}{{ project.name }}{% endblock %} {% block body %}

Bundle

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

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

Download bundle as mbox

{% if bundleform %}

- {% csrf_token %} - - - - - - - + {% csrf_token %} + +

Bundle settings

+ + + {{ bundleform }} - - - -

Bundle settings
- - -

+ + + + + + +

diff --git a/patchwork/templates/patchwork/bundles.html b/patchwork/templates/patchwork/bundles.html index 1bb3b0da..cc2ebf90 100644 --- a/patchwork/templates/patchwork/bundles.html +++ b/patchwork/templates/patchwork/bundles.html @@ -10,53 +10,55 @@ {% if bundles %} - - - - - - - - + + + + + + + + {% for bundle in bundles %} - - - - - - - + + + + + + + - + {% endfor %}

Bundle	Project	Public	Patches	Download	Delete
Bundle	Project	Public	Patches	Download	Delete
{{ bundle.name }}	- - {{ bundle.project.linkname }} - -	- {% if bundle.public %} - - {% else %} - - {% endif %} -	{{ bundle.patches.count }}		- - {% csrf_token %} - {{ bundle.delete_form.as_p }} - - -
{{ bundle.name }}	+ + {{ bundle.project.linkname }} + +	+ {% if bundle.public %} + + {% else %} + + {% endif %} +	{{ bundle.patches.count }}		+ + {% 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.

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

diff --git a/patchwork/templates/patchwork/confirm-error.html b/patchwork/templates/patchwork/confirm-error.html index 81292e27..b1ce42ee 100644 --- a/patchwork/templates/patchwork/confirm-error.html +++ b/patchwork/templates/patchwork/confirm-error.html @@ -7,13 +7,17 @@ {% block body %} {% if error == 'inactive' %} -

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

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

+ 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/patchwork/templates/patchwork/login.html b/patchwork/templates/patchwork/login.html index 46f77edf..86111342 100644 --- a/patchwork/templates/patchwork/login.html +++ b/patchwork/templates/patchwork/login.html @@ -14,26 +14,24 @@ {% block body %}

{% csrf_token %} - - - - - {% if error %} - - - - {% endif %} - {{ form }} - - - - -

login
{{ error }}
- -	- - Forgot password? - -

+ + + + +{% if error %} + + + +{% endif %} +{{ form }} + + + + +

login
{{ error }}
+ +	+ Forgot password? +

{% endblock %} diff --git a/patchwork/templates/patchwork/mail-settings.html b/patchwork/templates/patchwork/mail-settings.html index e35fa871..58f567ac 100644 --- a/patchwork/templates/patchwork/mail-settings.html +++ b/patchwork/templates/patchwork/mail-settings.html @@ -4,33 +4,34 @@ {% block heading %}Mail settings{% endblock %} {% block body %} -

Settings for {{email}}:

Settings for {{ email }}:

- - + + {% if is_optout %} - - + + {% else %} - - + + {% endif %} - +

Opt-out list
Opt-out list	Patchwork may not send automated notifications to - this address.	- - {% csrf_token %} - - - -	+ Patchwork may not send automated notifications to this address. +	+ + {% csrf_token %} + + + +	Patchwork may send automated notifications to - this address.	- - {% csrf_token %} - - - -	+ Patchwork may send automated notifications to this address. +	+ + {% csrf_token %} + + + +

- {% endblock %} diff --git a/patchwork/templates/patchwork/mail.html b/patchwork/templates/patchwork/mail.html index 1c6c0493..a2ad23d1 100644 --- a/patchwork/templates/patchwork/mail.html +++ b/patchwork/templates/patchwork/mail.html @@ -4,35 +4,34 @@ {% 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.

+ 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: -
+ There was an error accessing your mail settings: +
{{ form.email.label_tag }}	- {{form.email}} - {{form.email.errors}} -
- -
{{ form.email.label_tag }}	+ {{ form.email }} + {{ form.email.errors }} +
+ +

- - {% endblock %} diff --git a/patchwork/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html index 90963e65..3384c462 100644 --- a/patchwork/templates/patchwork/optin-request.html +++ b/patchwork/templates/patchwork/optin-request.html @@ -6,44 +6,50 @@ {% block body %} {% if confirmation %}

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.

+ 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 %} -

{% 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.

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

+ {% endif %} {% if error and admins %} -

If you are having trouble opting in, please email +

+ 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 %} +{{ 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.

Return to your user profile.

{% endif %} - {% endblock %} diff --git a/patchwork/templates/patchwork/optin.html b/patchwork/templates/patchwork/optin.html index 37a2198f..659bfccb 100644 --- a/patchwork/templates/patchwork/optin.html +++ b/patchwork/templates/patchwork/optin.html @@ -4,15 +4,18 @@ {% block heading %}Opt-in{% endblock %} {% block body %} -

Opt-in complete. You have successfully 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 'mail-settings' %}, or -visit the main Patchwork page and navigate from there.

+ Opt-in complete. You have successfully 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 'mail-settings' %}, + or visit the main Patchwork page and navigate from there. +

{% if user.is_authenticated %} -

Return to your user -profile.

Return to your user profile.

{% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html index 659af773..7396fd36 100644 --- a/patchwork/templates/patchwork/optout-request.html +++ b/patchwork/templates/patchwork/optout-request.html @@ -6,45 +6,53 @@ {% block body %} {% if confirmation %}

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.

+ 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 %} -

{% 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.

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

{% endif %} {% if error and admins %} -

If you are having trouble opting out, please email +

+ 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 %} +{{ 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.

Return to your user profile.

{% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/optout.html b/patchwork/templates/patchwork/optout.html index f3b75ce6..2d7e67e5 100644 --- a/patchwork/templates/patchwork/optout.html +++ b/patchwork/templates/patchwork/optout.html @@ -4,18 +4,22 @@ {% 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 'mail-settings' %}, or -visit the main Patchwork page and navigate from there.

+ 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 'mail-settings' %}, + or visit the main Patchwork page and navigate from there. +

{% if user.is_authenticated %} -

Return to your user -profile.

Return to your user profile.

{% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/partials/download-buttons.html b/patchwork/templates/patchwork/partials/download-buttons.html index e75a25ce..149bbc62 100644 --- a/patchwork/templates/patchwork/partials/download-buttons.html +++ b/patchwork/templates/patchwork/partials/download-buttons.html @@ -1,23 +1,27 @@

- {% if submission.diff %} +{% if submission.diff %} diff + class="btn btn-default" role="button" title="Download patch diff"> + diff + mbox - {% else %} + class="btn btn-default" role="button" title="Download patch mbox"> + mbox + +{% else %} mbox - {% endif %} - {% if submission.series %} + class="btn btn-default" role="button" title="Download cover mbox"> + mbox + +{% endif %} +{% if submission.series %} series - {% endif %} + class="btn btn-default" role="button" title="Download patch mbox with dependencies"> + series + +{% endif %}

diff --git a/patchwork/templates/patchwork/partials/filters.html b/patchwork/templates/patchwork/partials/filters.html index e89c4d0f..1175af14 100644 --- a/patchwork/templates/patchwork/partials/filters.html +++ b/patchwork/templates/patchwork/partials/filters.html @@ -80,45 +80,46 @@ $(document).ready(function() {

- Show patches with: - {% if filters.applied_filters %} - {% for filter in filters.applied_filters.values %} - {{ filter.name }} = {{ filter.condition }} - {% if not filter.forced %} - - {% endif %} - {% if not forloop.last %} | {% endif %} - {% endfor %} - {% else %} - none - {% endif %} - {% with patch_count=page.paginator.count %} - | {{ patch_count }} - patch{{ patch_count | pluralize:"es" }} - {% endwith %} -

- +

+ Show patches with: +{% if filters.applied_filters %} +{% for filter in filters.applied_filters.values %} + {{ filter.name }} = {{ filter.condition }} +{% if not filter.forced %} + + + +{% endif %} +{% if not forloop.last %} + | +{% endif %} +{% endfor %} +{% else %} + none +{% endif %} +{% with patch_count=page.paginator.count %} + | {{ patch_count }} + patch{{ patch_count | pluralize:"es" }} +{% endwith %} +

+ +

diff --git a/patchwork/templates/patchwork/partials/pagination.html b/patchwork/templates/patchwork/partials/pagination.html index ee4b555d..0767d385 100644 --- a/patchwork/templates/patchwork/partials/pagination.html +++ b/patchwork/templates/patchwork/partials/pagination.html @@ -3,43 +3,41 @@ {% if page.paginator.num_pages != 1 %}

{% if page.has_previous %} - - « + + « + {% else %} - « + « {% endif %} {% if page.paginator.trailing_set %} - {% for p in page.paginator.trailing_set %} - {{ p }} - {% endfor %} - ... +{% for p in page.paginator.trailing_set %} + {{ p }} +{% endfor %} + â¦ {% endif %} {% for p in page.paginator.adjacent_set %} - {% if p == page.number %} - {{ p }} - {% else %} - {{ p }} - {% endif %} +{% if p == page.number %} + {{ p }} +{% else %} + {{ p }} +{% endif %} {% endfor %} {% if page.paginator.leading_set %} - â¦ - {% for p in page.paginator.leading_set %} - {{ p }} - {% endfor %} + â¦ +{% for p in page.paginator.leading_set %} + {{ p }} +{% endfor %} {% endif %} {% if page.has_next %} - - » + + » {% else %} - » + » {% endif %}

{% endif %} diff --git a/patchwork/templates/patchwork/partials/patch-list.html b/patchwork/templates/patchwork/partials/patch-list.html index 02d6dff8..93d1e867 100644 --- a/patchwork/templates/patchwork/partials/patch-list.html +++ b/patchwork/templates/patchwork/partials/patch-list.html @@ -5,33 +5,30 @@ {% load static %} {% include "patchwork/partials/filters.html" %} - {% include "patchwork/partials/pagination.html" %} {% if order.editable %} - - - + + +

- -

+ +

{% endif %} {% if page.paginator.long_page and user.is_authenticated %}

- - ▾ - + + ▾ +

{% endif %} @@ -51,252 +48,246 @@ $(document).ready(function() {

-{% csrf_token %} - - - - - - {% if user.is_authenticated %} - - {% endif %} + {% csrf_token %} + + +

- -

+ + +{% if user.is_authenticated %} + +{% endif %} - {% if user.is_authenticated and user.profile.show_ids %} - - {% endif %} +{% if user.is_authenticated and user.profile.show_ids %} + +{% endif %} - + - + - + - + - + - + - + - + - - + + - - {% for patch in page.object_list %} - - {% if user.is_authenticated %} - - {% endif %} - {% if user.is_authenticated and user.profile.show_ids %} - - {% endif %} - - - - - - - - - - {% empty %} - - - - {% endfor %} - -

+ +	- ID -	+ ID +	- {% if order.name == "name" %} - - - - - Patch - - {% else %} - {% if not order.editable %} - Patch - {% else %} - Patch - {% endif %} - {% endif %} -	+{% if order.name == "name" %} + + + + + Patch + +{% else %} +{% if not order.editable %} + Patch +{% else %} + Patch +{% endif %} +{% endif %} +	- Series -	+ Series +	- {% project_tags %} -	+ {% project_tags %} +	- S/W/F -	+ S/W/F +	- {% if order.name == "date" %} - - - - - Date - - {% else %} - {% if not order.editable %} - Date - {% else %} - Date - {% endif %} - {% endif %} -	+{% if order.name == "date" %} + + + + + Date + +{% else %} +{% if not order.editable %} + Date +{% else %} + Date +{% endif %} +{% endif %} +	- {% if order.name == "submitter" %} - - - - - Submitter - - {% else %} - {% if not order.editable %} - - Submitter - - {% else %} - Submitter - {% endif %} - {% endif %} -	+{% if order.name == "submitter" %} + + + + + Submitter + +{% else %} +{% if not order.editable %} + + Submitter + +{% else %} + Submitter +{% endif %} +{% endif %} +	- {% if order.name == "delegate" %} - - - - - Delegate - - {% else %} - {% if not order.editable %} - Delegate - {% else %} - Delegate - {% endif %} - {% endif %} -	+{% if order.name == "delegate" %} + + + + + Delegate + +{% else %} +{% if not order.editable %} + Delegate +{% else %} + Delegate +{% endif %} +{% endif %} +	- {% if order.name == "state" %} - - - - - State - - {% else %} - {% if not order.editable %} - State - {% else %} - State - {% endif %} - {% endif %} -	+{% if order.name == "state" %} + + + + + State + +{% else %} +{% if not order.editable %} + State +{% else %} + State +{% endif %} +{% endif %} +
- -	- -	- - {{ patch.name\|default:"[no subject]"\|truncatechars:100 }} - -	- {% if patch.series %} - - {{ patch.series\|truncatechars:100 }} - - {% endif %} -	{{ patch\|patch_tags }}	{{ patch\|patch_checks }}	{{ patch.date\|date:"Y-m-d" }}	{{ patch.submitter\|personify:project }}	{{ patch.delegate.username }}	{{ patch.state }}
No patches to display

+ +{% for patch in page.object_list %} + +{% if user.is_authenticated %} + + + +{% endif %} +{% if user.is_authenticated and user.profile.show_ids %} + + + +{% endif %} + + + {{ patch.name|default:"[no subject]"|truncatechars:100 }} + + + +{% if patch.series %} + + {{ patch.series|truncatechars:100 }} + +{% endif %} + + {{ patch|patch_tags }} + {{ patch|patch_checks }} + {{ patch.date|date:"Y-m-d" }} + {{ patch.submitter|personify:project }} + {{ patch.delegate.username }} + {{ patch.state }} + +{% empty %} + + No patches to display + +{% endfor %} + + {% if page.paginator.count %} {% include "patchwork/partials/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 }} -
	- -

- +

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:	- - -

Bundling

+ + + + + +{% if bundles %} + + + + {% endif %} - -

- - +{% if bundle %} + + + + +{% endif %} +

Create bundle:	+ + +
Add to bundle:	+ + +
Remove from bundle:	+ + +

+{% endif %} +

{% endif %} - diff --git a/patchwork/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html index 4a4b5582..3abfa45f 100644 --- a/patchwork/templates/patchwork/profile.html +++ b/patchwork/templates/patchwork/profile.html @@ -6,169 +6,168 @@ {% block body %}

Your Profile

{% if user.profile.maintainer_projects.count %} -Maintainer of +

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

{% endif %} {% if user.profile.contributor_projects.count %} -Contributor to +

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

+{% endif %}

Todo

+ Your todo list contains patches that + have been delegated to you. {% if user.profile.n_todo_patches %} -

Your todo - list contains {{ user.profile.n_todo_patches }} - patch{{ user.profile.n_todo_patches|pluralize:"es" }}.

+ You have {{ user.profile.n_todo_patches }} + patch{{ user.profile.n_todo_patches|pluralize:"es" }} in your todo list. {% else %} -

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

+ You have no patches 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.

- - - - - - +

+ + +

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 opt-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. +

email	action	notify?

+ + + + + {% for email in linked_emails %} - - - - - + + + + + {% endfor %} - - - -

email	action	notify?
{{ email.email }}	- {% if user.email != email.email %} - - {% csrf_token %} - - - {% endif %} -	- {% if email.is_optout %} - - No, - {% csrf_token %} - - - - {% else %} - - Yes, - {% csrf_token %} - - - - {% endif %} -
{{ email.email }}	+{% if user.email != email.email %} + + {% csrf_token %} + + +{% endif %} +	+{% if email.is_optout %} + + {% csrf_token %} + No, + + + +{% else %} + + {% csrf_token %} + Yes, + + + +{% endif %} +
- - {% csrf_token %} - {{ linkform.email }} - - -

+ + + + + + +

- -

Bundles

- +

Bundles

{% if bundles %} -

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

{{ bundle.name }}
{{ bundle.name }}

Visit the bundles - page to manage your bundles.

Visit the bundles page to manage your bundles.

{% else %} -

You have no bundles.

{% endif %} -

- - -

Settings

- - -

+ +

Settings

+ + +

Authentication

- - - - +

Password:	Change password -

+ + + {% if rest_api_enabled %} - - - - - - - + + +

Password:	Change password +
API Token:	- {% if api_token %} - - - {% endif %} -
	- - {% csrf_token %} - {% if api_token %} - - {% else %} - - {% endif %} - -
API Token:	+{% if api_token %} + + {% endif %} -

- + + + + + + + +{% endif %} + +

- {% endblock %} diff --git a/patchwork/templates/patchwork/project.html b/patchwork/templates/patchwork/project.html index bd9d20e2..cad372f7 100644 --- a/patchwork/templates/patchwork/project.html +++ b/patchwork/templates/patchwork/project.html @@ -4,70 +4,76 @@ {% block info_active %}active{% endblock %} {% block body %} -

About {{project.name}}

About {{ project.name }}

- - - - - - - + + + + + + + {% if project.list_archive_url %} - - - - + + + + {% endif %} - - - - - - - - + + + + + + + + {% if project.web_url %} - - - - + + + + {% endif %} {% if project.webscm_url %} - - - - + + + + {% endif %} {% if project.scm_url %} - - - - + + + + {% endif %}

Name	{{project.name}} -
List address	{{project.listemail}}
Name	{{ project.name }} +
List address	{{ project.listemail }}
List archive	{{ project.list_archive_url }}
List archive	{{ project.list_archive_url }}
Maintainer{{maintainers\|length\|pluralize}}	- {% for maintainer in maintainers %} - {{ maintainer.profile.name }} - <{{maintainer.email}}> - - {% endfor %} -
Patches	{{n_patches}} (+ {{n_archived_patches}} archived)
Maintainer{{ maintainers\|length\|pluralize }}	+ {% for maintainer in maintainers %} + {{ maintainer.profile.name }} + <{{ maintainer.email }}> + + {% endfor %} +
Patches	{{ n_patches }} (+ {{ n_archived_patches }} archived)
Website	{{project.web_url}}
Website	{{ project.web_url }}
Source Code Web Interface	{{project.webscm_url}}
Source Code Web Interface	{{ project.webscm_url }}
Source Code Manager URL	{{project.scm_url}}
Source Code Manager URL	{{ project.scm_url }}

{% if enable_xmlrpc %}

pwclient

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.

+ 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:

The pwclient program
(optional) A .pwclientrc file for this project, which should be stored in your - home directory.
+ The pwclient + program. +
+ (Optional) A .pwclientrc + file for this project, which should be stored in your home directory. +

{% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/projects.html b/patchwork/templates/patchwork/projects.html index 9ce1918c..16b1bc5d 100644 --- a/patchwork/templates/patchwork/projects.html +++ b/patchwork/templates/patchwork/projects.html @@ -9,19 +9,19 @@

- - - View patches - - + + + View patches + +

{% if p.web_url %} -

{% endif %} {% if p.webscm_url %} -

{% endif %}

diff --git a/patchwork/templates/patchwork/registration-confirm.html b/patchwork/templates/patchwork/registration-confirm.html index 3832139c..e9219a5a 100644 --- a/patchwork/templates/patchwork/registration-confirm.html +++ b/patchwork/templates/patchwork/registration-confirm.html @@ -6,8 +6,9 @@ {% block body %}

Registration confirmed!

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

- +

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

{% endblock %} diff --git a/patchwork/templates/patchwork/registration.html b/patchwork/templates/patchwork/registration.html index 5280b660..8e2a3511 100644 --- a/patchwork/templates/patchwork/registration.html +++ b/patchwork/templates/patchwork/registration.html @@ -4,116 +4,110 @@ {% 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.

+ 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
create "bundles" of patches
update the state of your own patches

-{% csrf_token %} - - - - - {% if error %} - - - - {% endif %} - - - - + + + + +

+ {% csrf_token %} + + + + +{% if error %} + + + +{% endif %} + + + - - - - - + + + + - - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + - - - - - + + + + - - - - - -

register
{{ error }}
{{ form.first_name.label_tag }}	{% if form.first_name.errors %} - {{ form.first_name.errors }} + {{ form.first_name.errors }} {% endif %} - {{ form.first_name }} + {{ form.first_name }} {% if form.first_name.help_text %} - {{ form.first_name.help_text }} + {{ form.first_name.help_text }} {% endif %} -
{{ form.last_name.label_tag }}	+
{{ form.last_name.label_tag }}	{% if form.last_name.errors %} - {{ form.last_name.errors }} + {{ form.last_name.errors }} {% endif %} - {{ form.last_name }} + {{ form.last_name }} {% if form.last_name.help_text %} - {{ 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 }}	+
	+ Your name is used to identify you on the site +
{{ form.email.label_tag }}	{% if form.email.errors %} - {{ form.email.errors }} + {{ form.email.errors }} {% endif %} - {{ form.email }} + {{ form.email }} {% if form.email.help_text %} - {{ form.email.help_text }} + {{ form.email.help_text }} {% endif %} -
	- Patchwork will send a confirmation email to this address -
{{ form.username.label_tag }}	+
	+ Patchwork will send a confirmation email to this address +
{{ form.username.label_tag }}	{% if form.username.errors %} - {{ form.username.errors }} + {{ form.username.errors }} {% endif %} - {{ form.username }} + {{ form.username }} {% if form.username.help_text %} - {{ form.username.help_text }} + {{ form.username.help_text }} {% endif %} -
{{ form.password.label_tag }}	+
{{ form.password.label_tag }}	{% if form.password.errors %} - {{ form.password.errors }} + {{ form.password.errors }} {% endif %} - {{ form.password }} + {{ form.password }} {% if form.password.help_text %} - {{ form.password.help_text }} + {{ form.password.help_text }} {% endif %} -
- -

+ +

{% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/submission.html b/patchwork/templates/patchwork/submission.html index 2814f3d5..266744d9 100644 --- a/patchwork/templates/patchwork/submission.html +++ b/patchwork/templates/patchwork/submission.html @@ -8,7 +8,7 @@ {% load utils %} {% block headers %} - + {% endblock %} {% block title %}{{submission.name}}{% endblock %} @@ -16,215 +16,207 @@ {% block body %}

- {% include "patchwork/partials/download-buttons.html" %} +{% include "patchwork/partials/download-buttons.html" %}

- - - - {% if submission.list_archive_url %} - - {% else %} - - {% endif %} - +

Message ID	{{ submission.url_msgid }} (mailing list archive)	{{ submission.url_msgid }}

+ + +{% if submission.list_archive_url %} + +{% else %} + +{% endif %} + {% if submission.state %} - - - - + + + + {% endif %} {% if submission.commit_ref %} - - - - + + + + {% endif %} {% if submission.delegate %} - - - - + + + + {% endif %} - - - - + + + + {% if submission.series %} - - - - + + + + {% endif %} {% if submission.related %} - - - + + - + + {% endif %}

Message ID	{{ submission.url_msgid }} (mailing list archive)	{{ submission.url_msgid }}
State	{{ submission.state.name }}{% if submission.archived %}, archived{% endif %}
State	{{ submission.state.name }}{% if submission.archived %}, archived{% endif %}
Commit	{{ submission\|patch_commit_display }}
Commit	{{ submission\|patch_commit_display }}
Delegated to:	{{ submission.delegate.profile.name }}
Delegated to:	{{ submission.delegate.profile.name }}
Headers	- - - {{submission.headers}} - -
Headers	+ + + {{submission.headers}} + +
Series	- - {{ submission.series.name }} - \| - - - - {% with submission.series.cover_letter as cover %} - - {% if cover %} - {% if cover == submission %} - {{ cover.name\|default:"[no subject]"\|truncatechars:100 }} - {% else %} - - {{ cover.name\|default:"[no subject]"\|truncatechars:100 }} - - {% endif %} - {% endif %} - - {% endwith %} - {% for sibling in submission.series.patches.all %} - - {% if sibling == submission %} - {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} - {% else %} - - {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} - - {% endif %} - - {% endfor %} - - -
Series	+ + {{ submission.series.name }} + \| + + + +{% with submission.series.cover_letter as cover %} + +{% if cover %} +{% if cover == submission %} + {{ cover.name\|default:"[no subject]"\|truncatechars:100 }} +{% else %} + + {{ cover.name\|default:"[no subject]"\|truncatechars:100 }} + +{% endif %} +{% endif %} + +{% endwith %} +{% for sibling in submission.series.patches.all %} + +{% if sibling == submission %} + {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} +{% else %} + + {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} + +{% endif %} + +{% endfor %} + + +
Related	- - - - {% for sibling in related_same_project %} - - {% if sibling.id != submission.id %} - - {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} - - {% endif %} - - {% endfor %} - {% if related_different_project %} - - - {% for sibling in related_outside %} - - - {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} - (in {{ sibling.project }}) - - {% endfor %} +
Related	+ + + +{% for sibling in related_same_project %} + +{% if sibling.id != submission.id %} + + {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} + +{% endif %} + +{% endfor %} +{% if related_different_project %} + + +{% for sibling in related_outside %} + + + {{ sibling.name\|default:"[no subject]"\|truncatechars:100 }} + (in {{ sibling.project }}) + +{% endfor %} + +{% endif %} + - {% endif %} - - -

{% 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 }} -
	- -

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

- - - - - +

Bundling

Create bundle:

- {% if createbundleform.non_field_errors %} -

- {% endif %} - -

+ + + + {% 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 %} - - - - -
Add to bundle:	+ +{% csrf_token %} + + + + +

- -

+ +

{% endif %} - -

{% if submission.pull_url %}

Pull-request

-{{ submission.pull_url }} +{{ submission.pull_url }} {% endif %} {% if checks %} @@ -239,19 +231,18 @@ {{ check.user }}/{{ check.context }} - + {{ check.get_state_display }} - {% if check.target_url %} +{% if check.target_url %} - {% endif %} - {{ check.description }} - {% if check.target_url %} +{% endif %} + {{ check.description }} +{% if check.target_url %} - {% endif %} +{% endif %} {% endfor %} @@ -285,67 +276,66 @@ {{ item.date }} UTC | #{{ forloop.counter }} - {% if item.addressed == None %} -

- {% else %} - - {% if item.addressed == True %} -

- {% else %} -

- {% endif %} -

- - Addressed -

- {% if editable or comment_is_editable %} - - {% endif %} +{% if item.addressed == None %} +

+{% else %} + +{% if item.addressed == True %} +

+{% else %} +

+{% endif %} +

+ + Addressed

- {% if item.addressed == False %} -

- {% else %} - +{% if item.addressed == False %} +

+{% else %} +

-  {{ item|commentsyntax }}
+{{ item|commentsyntax }}

{% endfor %} {% if submission.diff %}

- {% include "patchwork/partials/download-buttons.html" %} +{% include "patchwork/partials/download-buttons.html" %}

Patch

+   {{ submission|patchsyntax }}
-
+

{% endif %} - {% endblock %} diff --git a/patchwork/templates/patchwork/todo-list.html b/patchwork/templates/patchwork/todo-list.html index 1ec2713d..6c656b10 100644 --- a/patchwork/templates/patchwork/todo-list.html +++ b/patchwork/templates/patchwork/todo-list.html @@ -7,11 +7,11 @@ {% block body %}

TODO

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

+ A Patchwork todo-list contains patches that are assigned to you, are in an + "action required" state ({{ action_required_states|join:", " }}), and are + not archived.

{% include "patchwork/partials/patch-list.html" %} - {% endblock %} diff --git a/patchwork/templates/patchwork/todo-lists.html b/patchwork/templates/patchwork/todo-lists.html index ea65ea05..2f57bdb7 100644 --- a/patchwork/templates/patchwork/todo-lists.html +++ b/patchwork/templates/patchwork/todo-lists.html @@ -7,24 +7,27 @@

TODO

{% if todo_lists %} -

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

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

- - - - + + + + {% for todo_list in todo_lists %} - - - - + + + + {% endfor %}

project	patches
project	patches
{{ todo_list.project.name }}	{{ todo_list.n_patches }}
+ + {{ todo_list.project.name }} + +	{{ todo_list.n_patches }}

- {% else %} - No todo lists +No todo lists {% endif %} {% endblock %} diff --git a/patchwork/templates/patchwork/user-link-confirm.html b/patchwork/templates/patchwork/user-link-confirm.html index a6d671f3..d1daf498 100644 --- a/patchwork/templates/patchwork/user-link-confirm.html +++ b/patchwork/templates/patchwork/user-link-confirm.html @@ -6,10 +6,13 @@ {% block body %} {% if not errors %} -

You have successfully linked the email address {{ person.email }} to - your Patchwork account

+ You have successfully linked the email address {{ person.email }} to + your Patchwork account +

{% endif %} -

Back to your - profile.

+ Back to your profile. +

{% endblock %} diff --git a/patchwork/templates/patchwork/user-link.html b/patchwork/templates/patchwork/user-link.html index c0595bdc..38b61d2a 100644 --- a/patchwork/templates/patchwork/user-link.html +++ b/patchwork/templates/patchwork/user-link.html @@ -5,22 +5,24 @@ {% 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.

+ 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 %} -

There was an error submitting your link request:

- {% if form.errors %} - {{ form.non_field_errors }} - {% endif %} - {% if error %} -

{{error}}

- {% endif %} +

There was an error submitting your link request:

+{% if form.errors %} +{{ form.non_field_errors }} +{% endif %} +{% if error %} +

{{error}}

+{% endif %} - + {% endif %} {% endblock %} diff --git a/patchwork/tests/views/test_user.py b/patchwork/tests/views/test_user.py index 22bb9839..86f8972d 100644 --- a/patchwork/tests/views/test_user.py +++ b/patchwork/tests/views/test_user.py @@ -383,7 +383,7 @@ class UserProfileTest(_UserTestCase): response = self.client.get(reverse('user-profile')) - self.assertContains(response, 'contains 5') + self.assertContains(response, 'You have 5') self.assertContains(response, reverse('user-todos')) def test_user_profile_valid_post(self): diff --git a/templates/404.html b/templates/404.html index fe2b0e4e..dd95e2ec 100644 --- a/templates/404.html +++ b/templates/404.html @@ -4,7 +4,5 @@ {% block heading %}404: File not found{% endblock %} {% block body %} -

The page URL requested ({{ request_path }}) does not exist.

- {% endblock %} diff --git a/templates/base.html b/templates/base.html index de765956..ba95f9b1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,140 +1,140 @@ {% load static %} - - - {% block title %}Patchwork{% endblock %} - Patchwork - - - - - - - - - + + + + + + + - - - - - - - - {% block headers %}{% endblock %} - - -

- -

+ + +

+{% comment %} + spaceless tag is used to remove automatically added whitespace so that the container + is truly considered empty by the `:empty` pseudo-class that is used for styling +{% endcomment %}{% spaceless %} +

{{ message }} +{% endfor %} +{% endif %} +

+{% if errors %} +

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

{{ error }}

{% endif %} -

- - - {% comment %} - spaceless tag is used to remove automatically added whitespace so that the container - is truly considered empty by the `:empty` pseudo-class that is used for styling - {% endcomment %}{% spaceless %} -

{{ message }} - {% endfor %} - {% endif %} -

- {% if errors %} -

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

{{ error }}

- {% endif %} -

- {% endspaceless %} -

+{% endspaceless %} +

{% block body %} {% endblock %} -

- - +

+ + diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html index 65d89ef6..88b7d26d 100644 --- a/templates/registration/password_change_done.html +++ b/templates/registration/password_change_done.html @@ -4,7 +4,5 @@ {% block heading %}Password Change Complete{% endblock %} {% block body %} -

Your password has been changed successfully.

- {% endblock %} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index 8abe55ef..3e9a0788 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -4,42 +4,36 @@ {% block heading %}Password Change{% endblock %} {% block body %} - -

Please enter your old password, for security's sake, and then enter your new -password twice so we can verify you typed it in correctly.

+ Please enter your old password, for security's sake, and then enter your new + password twice so we can verify you typed it in correctly. +

{% endblock %} diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html index 1d88fdff..8678ee89 100644 --- a/templates/registration/password_reset_complete.html +++ b/templates/registration/password_reset_complete.html @@ -4,6 +4,5 @@ {% block heading %}Password reset completed{% endblock %} {% block body %} - -

Your password has been set. You may go ahead and log in now.

{% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index 7e1e2f1e..4ab2357f 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -4,48 +4,46 @@ {% block heading %}Password reset confirmation{% endblock %} {% block body %} - {% if validlink %} -

Your username, in case you've forgotten: {{ form.user.get_username }}

Please enter your new password twice so we can verify you typed it in -correctly

+ Your username, in case you've forgotten: {{ form.user.get_username }} +

+ Please enter your new password twice so we can verify you typed it in + correctly. +

{% else %} -

The password reset link was invalid, possibly because it has already -been used. Please request a new password reset.

+ The password reset link was invalid, possibly because it has already + been used. Please request a new password reset. +

{% endif %} {% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html index fe9e551a..6070f767 100644 --- a/templates/registration/password_reset_done.html +++ b/templates/registration/password_reset_done.html @@ -4,10 +4,12 @@ {% block heading %}Password reset{% endblock %} {% block body %} - -

We have emailed you instructions for setting your password. -You should be receiving them shortly.

If you don't receive an email, please make sure you've entered the -address you registered with, and check your spam folder

- +

+ We have emailed you instructions for setting your password. + You should be receiving them shortly. +

+ If you don't receive an email, please make sure you've entered the + address you registered with, and check your spam folder. +

{% endblock %} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html index bdc28518..b90c13af 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.html @@ -5,7 +5,7 @@ your user account on the Patchwork patch-tracking system. Please visit the following url and choose a new password: {% block reset_link %} -{{ protocol }}://{{domain}}{% url 'password_reset_confirm' uidb64=uid token=token %} +{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %} {% endblock %} Happy patchworking. diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index 4718f436..fa6f3f1a 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -4,42 +4,36 @@ {% block heading %}Password reset{% endblock %} {% block body %} - -

Forgotten your password? Enter your email address below, and we will -email instructions for setting a new one.

+ Forgotten your password? Enter your email address below, and we will + email instructions for setting a new one. +

{% endblock %}

Please correct the errors below. -
Please correct the errors below. +
{{ field.label_tag }}	- {{ field.errors }} - {{ field }} +
{{ field.label_tag }}	+ {{ field.errors }} + {{ field }} {% if field.help_text %} - {{ field.help_text }} + {{ field.help_text }} {% endif %} -
- -

Please correct the errors below. -
Please correct the errors below. +
{{ field.label_tag }}	- {{ field.errors }} - {{ field }} +
{{ field.label_tag }}	+ {{ field.errors }} + {{ field }} {% if field.help_text %} - {{ field.help_text }} + {{ field.help_text }} {% endif %} -
- -

Please correct the errors below. -
Please correct the errors below. +
{{ field.label_tag }}	- {{ field.errors }} - {{ field }} +
{{ field.label_tag }}	+ {{ field.errors }} + {{ field }} {% if field.help_text %} - {{ field.help_text }} + {{ field.help_text }} {% endif %} -
- -

Bundle

Properties

Properties

Bundling

Bundling

Your Profile

Todo

Todo

Linked email addresses

Linked email addresses

Bundles

Bundles

Settings

Settings

Authentication

Authentication

About {{project.name}}

About {{ project.name }}

pwclient

{{p.name}}

{{ p.name }}

{{ submission.name }}

Patch Properties

Patch Properties

Bundling

Bundling

Pull-request

Patch

TODO

TODO