diff --git a/src/marketplace/templates/marketplace/components/proj_task_deliverables_list.html b/src/marketplace/templates/marketplace/components/proj_task_deliverables_list.html new file mode 100644 index 0000000..7e8f94d --- /dev/null +++ b/src/marketplace/templates/marketplace/components/proj_task_deliverables_list.html @@ -0,0 +1,41 @@ +{% if task.task_home_url %} + + External task home + open_in_new + +{% endif %} + +{% if task.task_deliverables_url %} + + External deliverables page + open_in_new + +{% endif %} + +{% if project.deliverable_management_url %} + + External project home + open_in_new + +{% endif %} + +{% if project.deliverable_github_url %} + + Project GitHub page + open_in_new + +{% endif %} + +{% if project.deliverable_reports_url %} + + Project reports + open_in_new + +{% endif %} + +{% if project.deliverable_documentation_url %} + + Project documentation + open_in_new + +{% endif %} diff --git a/src/marketplace/templates/marketplace/proj_deliverables.html b/src/marketplace/templates/marketplace/proj_deliverables.html index b599b74..1b86fc9 100644 --- a/src/marketplace/templates/marketplace/proj_deliverables.html +++ b/src/marketplace/templates/marketplace/proj_deliverables.html @@ -1,31 +1,24 @@ {% extends "marketplace/proj.html" %} -{% block tabcontents %} +{% load markdown_deux_tags %} - {% load markdown_deux_tags %} +{% block tabcontents %} +
+

Project results

-

Project results

+ {% if project.is_completed %} + {% if project.deliverables_description %} + {{ project.deliverables_description|markdown }} + {% else %} +

This project has been completed.

+

Below you can find links to all the public results, documentation, data, code, etc. that has been generated as part of the project.

+ {% endif %} - {% if project.is_completed %} - {% if project.deliverables_description %} - {{ project.deliverables_description|markdown }} +
+ {% include 'marketplace/components/proj_task_deliverables_list.html' with project=project %} +
{% else %} -

This project has been completed. Below you can find links to all the public results, documentation, data, code, etc. that has been generated as part of the project.

- {% endif %} - {% if project.deliverable_management_url %} -
Project home
- {% endif %} - {% if project.deliverable_github_url %} -
Project github page
+

This project is still in progress, so no public deliverables are available.

{% endif %} - {% if project.deliverable_reports_url %} -
Project reports
- {% endif %} - {% if project.deliverable_documentation_url %} -
Project documentation
- {% endif %} - {% else %} -

This project is still in progress, so no public deliverables are available.

- {% endif %} - +
{% endblock %} diff --git a/src/marketplace/templates/marketplace/proj_finish.html b/src/marketplace/templates/marketplace/proj_finish.html index 7d7a53a..beae8ba 100644 --- a/src/marketplace/templates/marketplace/proj_finish.html +++ b/src/marketplace/templates/marketplace/proj_finish.html @@ -1,29 +1,26 @@ {% extends 'marketplace/proj.html' %} {% block tabcontents %} -

Finish project

-

Are you sure you want to finish this project? This will make the project completed and no more volunteering work will be allowed in it.

+ +

Are you sure you want to finish this project?

+

This will make the project completed and no more volunteering work will be allowed in it.

+ {% csrf_token %} {% include 'marketplace/components/standard_form_fields.html' %} -
-
- - - close - No, keep this project in QA - -
-
+ + + close + No, keep this project in QA +
- {% endblock %} diff --git a/src/marketplace/templates/marketplace/proj_info.html b/src/marketplace/templates/marketplace/proj_info.html index 03f0aa9..abab1d6 100644 --- a/src/marketplace/templates/marketplace/proj_info.html +++ b/src/marketplace/templates/marketplace/proj_info.html @@ -68,19 +68,11 @@

Internal People Available During the Project

{% if project.is_completed %}
Project results
-
- {% if project.deliverable_management_url %} -
Project home
- {% endif %} - {% if project.deliverable_github_url %} -
Project github page
- {% endif %} - {% if project.deliverable_reports_url %} -
Project reports
- {% endif %} - {% if project.deliverable_documentation_url %} -
Project documentation
- {% endif %} + +
+
+ {% include 'marketplace/components/proj_task_deliverables_list.html' with project=project %} +
{% endif %} diff --git a/src/marketplace/templates/marketplace/proj_instructions_task.html b/src/marketplace/templates/marketplace/proj_instructions_task.html index ecaff34..44f234e 100644 --- a/src/marketplace/templates/marketplace/proj_instructions_task.html +++ b/src/marketplace/templates/marketplace/proj_instructions_task.html @@ -1,39 +1,24 @@ {% extends "marketplace/proj_volunteer_task_base.html" %} -{% block taskcontents %} - - - - {% load markdown_deux_tags %} +{% load markdown_deux_tags %} +{% block taskcontents %}
{% include 'marketplace/components/task_type_display.html' %} -

{{ project_task.name }}

- {% include 'marketplace/components/task_status.html' with task=project_task %} - -

{{ project_task.description|markdown }}

-

{{ project_task.onboarding_instructions|markdown }}

- - {% if project.deliverable_management_url %} - External project home - {% endif %} - {% if project.deliverable_github_url %} - Project github page - {% endif %} - {% if project.deliverable_reports_url %} - Project reports - {% endif %} - {% if project.deliverable_documentation_url %} - Project documentation - {% endif %} - +

{{ project_task.name }}

+ {% include 'marketplace/components/task_status.html' with task=project_task %} +

{{ project_task.description|markdown }}

+

{{ project_task.onboarding_instructions|markdown }}

+
+ {% include 'marketplace/components/proj_task_deliverables_list.html' with project=project task=project_task %} +
@@ -61,7 +46,7 @@

{{ project_task.name }}

Schedule

Start: {{ project_task.estimated_start_date }} (estimated), {{ project_task.actual_start_date }} (actual)

-

End: {{ project_task.estimated_end_date }} (estimated), {{ project_task.actual_end_date }} (actual)

+

End: {{ project_task.estimated_end_date }} (estimated){% if project_task.actual_end_date %}, {{ project_task.actual_end_date }} (actual){% endif %}

diff --git a/src/marketplace/templates/marketplace/proj_task.html b/src/marketplace/templates/marketplace/proj_task.html index 1541882..b8df0c4 100644 --- a/src/marketplace/templates/marketplace/proj_task.html +++ b/src/marketplace/templates/marketplace/proj_task.html @@ -78,17 +78,17 @@

{{ project_task.name }}

Created on: {{ project_task.creation_date }}

Last modified: {{ project_task.last_modified_date }}

Start: {{ project_task.estimated_start_date }} (estimated), {{ project_task.actual_start_date }} (actual)

-

End: {{ project_task.estimated_end_date }} (estimated), {{ project_task.actual_end_date }} (actual)

+

End: {{ project_task.estimated_end_date }} (estimated){% if project_task.actual_end_date %}, {{ project_task.actual_end_date }} (actual){% endif %}

Work details
-

Estimated effort in hours: {{ project_task.estimated_effort_hours }}

-

Actual effort spent in hours: {{ project_task.actual_effort_hours }}

+

Estimated effort in hours: {{ project_task.estimated_effort_hours|default:'(none)' }}

+

Actual effort spent in hours: {{ project_task.actual_effort_hours|default:'(none)' }}

-

External task home: {{ project_task.task_home_url }}

-

External deliverables page: {{ project_task.task_deliverables_url }}

+

External task home: {{ project_task.task_home_url|default:'(none)'|urlize }}

+

External deliverables page: {{ project_task.task_deliverables_url|default:'(none)'|urlize }}

diff --git a/src/marketplace/templates/marketplace/proj_task_finish.html b/src/marketplace/templates/marketplace/proj_task_finish.html index 3716762..2f96f45 100644 --- a/src/marketplace/templates/marketplace/proj_task_finish.html +++ b/src/marketplace/templates/marketplace/proj_task_finish.html @@ -3,28 +3,31 @@ {% block taskcontents %} {% if project_task %} -

Mark work as done

-

Task:{{ project_task.name }}

- -

Remember to put all the results of your work in the appropriate sites - designed for the task:

- {% if project.deliverable_management_url %} - External project home - {% endif %} - {% if project.deliverable_github_url %} - Project github page - {% endif %} - {% if project.deliverable_reports_url %} - Project reports - {% endif %} - {% if project.deliverable_documentation_url %} - Project documentation - {% endif %} +

Task: {{ project_task.name }}

+ +
+
+
+

+

Remember to put all the results of your work into the appropriate documents and/or repositories + designated for this task.

+
+
+ +
+
+ {% include 'marketplace/components/proj_task_deliverables_list.html' with project=project task=project_task %} +
+
+
+ +
{% csrf_token %} + {% include 'marketplace/components/standard_form_fields.html' %}
@@ -37,6 +40,7 @@

Mark work as done

check Mark work as done + close Cancel @@ -44,7 +48,6 @@

Mark work as done

- {% else %}

You don't have any active task in this project.

{% endif %} diff --git a/src/marketplace/templates/marketplace/proj_task_review.html b/src/marketplace/templates/marketplace/proj_task_review.html index 8b9b287..ee29f64 100644 --- a/src/marketplace/templates/marketplace/proj_task_review.html +++ b/src/marketplace/templates/marketplace/proj_task_review.html @@ -1,24 +1,40 @@ {% extends "marketplace/proj_task_base.html" %} +{% load markdown_deux_tags rules %} + {% block taskcontents %} +

Completed task review

- {% load markdown_deux_tags %} +
+
+
+
Task
+
{{ project_task.name }}
-

Completed task review

-

Task: {{ project_task.name }}

-

Estimated effort in hours: {{ project_task.estimated_effort_hours }}

-

Total effort spent (in hours): {{ task_review.volunteer_effort_hours }}

-

Volunteer's comments: {{ task_review.volunteer_comment|markdown }}

+
Estimated effort (hours)
+
{{ project_task.estimated_effort_hours }}
- {% if project_task.task_home_url %} -

External task home: {{ project_task.task_home_url }}

- {% endif %} - {% if project_task.task_deliverables_url %} -

External deliverables page: {{ project_task.task_deliverables_url }}

- {% endif %} -

Request date: {{ task_review.review_request_date }}

+
Total effort spent (hours)
+
{{ task_review.volunteer_effort_hours }}
+ +
Request date
+
{{ task_review.review_request_date }}
+ +
Volunteer's comments
+
+
{{ task_review.volunteer_comment|markdown }}
+
+
+ +
+
+ {% include 'marketplace/components/proj_task_deliverables_list.html' with project=project task=project_task %} +
+
+
+ +
- {% load rules %} {% has_perm 'project.task_review_do' user project as perm_task_reviewer %} {% if task_review.is_pending %}