Bundle settings
- - -

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

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

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

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

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

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

{% 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 patchwork/templates/patchwork/profile.html patchwork/templates/patchwork/profile.html index 4a4b5582..552dde47 100644 --- patchwork/templates/patchwork/profile.html +++ 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" }}.

+ Your 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 patchwork/templates/patchwork/project.html patchwork/templates/patchwork/project.html index bd9d20e2..cad372f7 100644 --- patchwork/templates/patchwork/project.html +++ 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 patchwork/templates/patchwork/projects.html patchwork/templates/patchwork/projects.html index 9ce1918c..16b1bc5d 100644 --- patchwork/templates/patchwork/projects.html +++ 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 patchwork/templates/patchwork/registration-confirm.html patchwork/templates/patchwork/registration-confirm.html index 3832139c..e9219a5a 100644 --- patchwork/templates/patchwork/registration-confirm.html +++ 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 patchwork/templates/patchwork/registration.html patchwork/templates/patchwork/registration.html index 5280b660..8e2a3511 100644 --- patchwork/templates/patchwork/registration.html +++ 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 patchwork/templates/patchwork/submission.html patchwork/templates/patchwork/submission.html index 2238e82e..944d893a 100644 --- patchwork/templates/patchwork/submission.html +++ patchwork/templates/patchwork/submission.html @@ -11,7 +11,7 @@ {% endblock %} -{% block title %}{{submission.name}}{% endblock %} +{% block title %}{{ submission.name }}{% endblock %} {% block body %} @@ -20,240 +20,233 @@

- - - - {% 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 %} - - - + + - +{% else %} + + {{ sibling.name|default:"[no subject]"|truncatechars:100 }} + +{% endif %} + +{% endfor %} + + + + {% 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 %} +
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 %} - +{% 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 }} - - {% 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 %} - - -

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

Context	Check	Description
Context	Check	Description
{{ check.user }}/{{ check.context }}	- - {{ check.get_state_display }} - -	- {% if check.target_url %} - - {% endif %} - {{ check.description }} - {% if check.target_url %} - - {% endif %} -
{{ check.user }}/{{ check.context }}	+ + {{ check.get_state_display }} + +	+ {% if check.target_url %} + + {% endif %} + {{ check.description }} + {% if check.target_url %} + + {% 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 %} -
- -

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

Checks

Patch

TODO

TODO

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