From 824d8683c6fa7c1585add5c4b7d3879d4f44c5a7 Mon Sep 17 00:00:00 2001 From: Hannah Date: Fri, 20 Oct 2023 16:24:46 +0000 Subject: [PATCH 1/7] Portal home amends for new editing flow --- .../templates/provider_portal/home.html | 101 ++++++++++++------ 1 file changed, 66 insertions(+), 35 deletions(-) diff --git a/apps/accounts/templates/provider_portal/home.html b/apps/accounts/templates/provider_portal/home.html index 8800e33f..ebcda86c 100644 --- a/apps/accounts/templates/provider_portal/home.html +++ b/apps/accounts/templates/provider_portal/home.html @@ -5,52 +5,83 @@
-

Provider portal

- -

Do you want to become part of the Green Web Dataset as a verified green hosting provider? - Do you want to keep your submitted information up-to-date? Get started here.

+

+ Welcome to our
+ Provider portal

-

Submit a new verification request

- - {% if object_list.providers %} -

Your verified providers

- {% if request.user.is_admin %} -

You belong to the admin group, which gives you permission to manage all providers in the database. - Below is a list of those providers for which a permission has been granted explicitly for you, rather than based on the group membership. -

- {% endif %} + {% for request in object_list.requests %} +

Pending approval

+ + {% if request.status|lower == "more info required" %} +
+ {% endif %} + +
+

{{ request.name }} | {{ request.status | upper }}

+

Submitted: {{ request.created }}

+
- {% for provider in object_list.providers %} -

- {{ provider }} -

- {% if provider.request and provider.request.approved_at %} -

Last updated: {{ provider.request.approved_at }}

+ {% if request.status|lower == "more info required" %} +
{% endif %} - {% flag "edit_provider" %} - {% get_obj_perms request.user for provider as "provider_perms" %} - {% if "manage_provider" in provider_perms %} -

- Update listing -

- {% endif %} - {% endflag %} + + {% empty %} + {% endfor %} + +

Your verified providers

+ +

Verified providers appear in our + Green Web Dataset and + Green Web Directory.

+ + {% if request.user.is_admin %} +
+

You belong to the admin group, which gives you permission to manage all providers in the database. + Below is a list of those providers for which a permission has been granted explicitly for you, rather than based on the group membership.

+
{% endif %} -

Looking for the old style admin screens?

- -

Your submitted verification requests

+ {% if object_list.providers %} - {% for request in object_list.requests %} -

{{ request.name }} | {{ request.status | upper }}

+

We ask you to ensure listings are kept up to date, and recommend that you review your submitted evidence every 12 months.

- {% empty %} -

You haven't submitted any verification requests yet. Get started. +

+ {% for provider in object_list.providers %} +
+ +
+

+ {{ provider }} +

- {% endfor %} + {% if provider.request and provider.request.approved_at %} +

Last updated: {{ provider.request.approved_at }}

+ {% endif %} +
+
+ {% flag "edit_provider" %} + {% get_obj_perms request.user for provider as "provider_perms" %} + + {% if "manage_provider" in provider_perms %} + Update listing + {% endif %} + {% endflag %} +
+ +
+ {% endfor %} +
+ + {% else %} +

You don't have any verified listings yet.

+

Submit a new verification request

+ + {% endif %} + +

Looking for the old style admin screens?

From 38bcc584c377d5c53cd687ff309ccb6747a74c2c Mon Sep 17 00:00:00 2001 From: Hannah Date: Fri, 20 Oct 2023 16:25:21 +0000 Subject: [PATCH 2/7] Change styling for "more info required" status on summary view --- .../provider_portal/request_detail.html | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/accounts/templates/provider_portal/request_detail.html b/apps/accounts/templates/provider_portal/request_detail.html index 10b8844d..b38e0f54 100644 --- a/apps/accounts/templates/provider_portal/request_detail.html +++ b/apps/accounts/templates/provider_portal/request_detail.html @@ -12,7 +12,17 @@

Summary of request

Submitted on: {{ object.created }}

-

Status: {{ object.status }}

+ + {% if object.status|lower == "more info required" %} +
+ {% endif %} + +

Status: {{ object.status }}

+ + {% if object.status|lower == "more info required" %} +

Update request now

+
+ {% endif %} {% if object.approved_at and object.status|lower == "approved" %}

Approved on: {{ object.approved_at }}

@@ -22,9 +32,7 @@

Summary of request

We are currently reviewing this request. If you want to update the information relating to this provider, please get in touch using our support form. {% endif %} - {% if object.status|lower == "more info required" %} -

Update this request

- {% endif %} +
From cdf89478606aa378e2fb6f3bd7a03d05d4242642 Mon Sep 17 00:00:00 2001 From: Hannah Date: Fri, 20 Oct 2023 17:26:27 +0000 Subject: [PATCH 3/7] Make update listing button open in same window --- setup-stuff.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 setup-stuff.sh diff --git a/setup-stuff.sh b/setup-stuff.sh new file mode 100644 index 00000000..17ff23ff --- /dev/null +++ b/setup-stuff.sh @@ -0,0 +1,10 @@ +cp ./.env.gitpod ./.env +mysqladmin create greencheck +python -m pipenv install --dev +python -m pipenv run python ./manage.py migrate +python -m pipenv run python ./manage.py tailwind install +python -m pipenv run python ./manage.py tailwind build +cd ./apps/theme/static_src/ +npx rollup --config +cd ../../../ +python -m pipenv run python ./manage.py collectstatic --no-input \ No newline at end of file From 6c5e5394147f4c0fee2ad865ebc5e7d77416dc08 Mon Sep 17 00:00:00 2001 From: Hannah Date: Fri, 20 Oct 2023 17:28:01 +0000 Subject: [PATCH 4/7] Make update listing button open in same browser window --- apps/accounts/templates/provider_portal/home.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/accounts/templates/provider_portal/home.html b/apps/accounts/templates/provider_portal/home.html index ebcda86c..3ee7565b 100644 --- a/apps/accounts/templates/provider_portal/home.html +++ b/apps/accounts/templates/provider_portal/home.html @@ -62,13 +62,14 @@

Your verified providers

- {% flag "edit_provider" %} + + {% flag "edit_provider" %} {% get_obj_perms request.user for provider as "provider_perms" %} {% if "manage_provider" in provider_perms %} - Update listing + Update listing {% endif %} - {% endflag %} + {% endflag %}
From f322097307501f4843d3081b3c4a3dbd56a8c864 Mon Sep 17 00:00:00 2001 From: Hannah Date: Fri, 20 Oct 2023 17:28:57 +0000 Subject: [PATCH 5/7] Accidentally committed setup-stuff file, remove it --- setup-stuff.sh | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 setup-stuff.sh diff --git a/setup-stuff.sh b/setup-stuff.sh deleted file mode 100644 index 17ff23ff..00000000 --- a/setup-stuff.sh +++ /dev/null @@ -1,10 +0,0 @@ -cp ./.env.gitpod ./.env -mysqladmin create greencheck -python -m pipenv install --dev -python -m pipenv run python ./manage.py migrate -python -m pipenv run python ./manage.py tailwind install -python -m pipenv run python ./manage.py tailwind build -cd ./apps/theme/static_src/ -npx rollup --config -cd ../../../ -python -m pipenv run python ./manage.py collectstatic --no-input \ No newline at end of file From cd19652dbc892dd3be0e883d0e34f9a983509f4f Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 24 Oct 2023 15:07:21 +0000 Subject: [PATCH 6/7] Add link to support FAQs in portal footer --- apps/accounts/templates/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/accounts/templates/base.html b/apps/accounts/templates/base.html index 0771492e..463ce35d 100644 --- a/apps/accounts/templates/base.html +++ b/apps/accounts/templates/base.html @@ -81,6 +81,7 @@

Django + Tailwind = ❤️

Need help?

+

Common questions and their answers - browse our FAQs.

Our friendly support team are on hand to clarify anything you're not sure about.

Contact our support team

{% comment %} From df42a6a8a83e1bd1be89d6fc6f2ca1a4e2f9e9cc Mon Sep 17 00:00:00 2001 From: Hannah Date: Tue, 24 Oct 2023 16:21:04 +0000 Subject: [PATCH 7/7] Copy and layout improvements to provider home --- .../templates/provider_portal/home.html | 70 +++++++++++-------- apps/theme/static_src/src/css/components.css | 8 +++ 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/apps/accounts/templates/provider_portal/home.html b/apps/accounts/templates/provider_portal/home.html index 3ee7565b..f327dd68 100644 --- a/apps/accounts/templates/provider_portal/home.html +++ b/apps/accounts/templates/provider_portal/home.html @@ -9,33 +9,37 @@

Welcome to our
Provider portal

- {% for request in object_list.requests %} -

Pending approval

- - {% if request.status|lower == "more info required" %} -
- {% endif %} +

Providers overview

-
-

{{ request.name }} | {{ request.status | upper }}

-

Submitted: {{ request.created }}

-
+

Verified providers appear in our + Green Web Dataset and + Green Web Directory.

- {% if request.status|lower == "more info required" %} -
- {% endif %} + + {% for request in object_list.requests %} +

Pending verification

+ + +
+ {% if request.status|lower == "more info required" %} +
+ {% endif %} + +

{{ request.name }} | {{ request.status | upper }}

+

Submitted: {{ request.created }}

+ + {% if request.status|lower == "more info required" %} +
+ {% endif %} +
+ {% empty %} {% endfor %} -

Your verified providers

-

Verified providers appear in our - Green Web Dataset and - Green Web Directory.

- {% if request.user.is_admin %}

You belong to the admin group, which gives you permission to manage all providers in the database. @@ -43,17 +47,18 @@

Your verified providers

{% endif %} + {% if object_list.providers %} -

We ask you to ensure listings are kept up to date, and recommend that you review your submitted evidence every 12 months.

+

We ask you to ensure the listings below are kept up to date, and request you review your submitted evidence every 12 months.

{% for provider in object_list.providers %} -
+

- {{ provider }} + {{ provider }}

{% if provider.request and provider.request.approved_at %} @@ -63,22 +68,31 @@

Your verified providers

- {% flag "edit_provider" %} + {% flag "edit_provider" %} {% get_obj_perms request.user for provider as "provider_perms" %} {% if "manage_provider" in provider_perms %} - Update listing + 📝 Update listing {% endif %} - {% endflag %} + {% endflag %}
{% endfor %}
+

Or create entirely new provider

+ + {% else %} -

You don't have any verified listings yet.

-

Submit a new verification request

+ + {% if object_list.requests|length == 0 %} +

You don't have any verified listings yet.

+

Submit a new verification request

+ {% else %} +

Thank you! We're already working on a verification request you've submitted, listed in the pending verification above.

+

If you wish, you can create an entirely new provider verification request to restart the process.

+ {% endif %} {% endif %} @@ -89,9 +103,9 @@

Your verified providers

Why should I get verified?

-

Green Web Foundation is on a mission to make the internet fossil-free by 2030. We maintain the world's largest open dataset on websites running on green energy, the Green Domains Dataset.

+

Green Web Foundation is on a mission to make the internet fossil-free by 2030. We maintain the world's largest open dataset on websites running on green energy, the Green Web Dataset.

Every day, across the globe, more than seven million checks against this dataset are made.

-

If you are a hosting provider getting verified with us allow you to show as green, and therefore become visible as a findable and trusted source.

+

If you are a hosting provider getting verified with us allows you to show as green, and therefore become visible as a trusted supplier.

diff --git a/apps/theme/static_src/src/css/components.css b/apps/theme/static_src/src/css/components.css index 247a4a7e..6bafb31c 100644 --- a/apps/theme/static_src/src/css/components.css +++ b/apps/theme/static_src/src/css/components.css @@ -159,4 +159,12 @@ .heading-icon__lightning--black::before { @apply bg-lightning-black; } + .verification_request:hover { + .verification_request__date { + @apply text-black; + } + .verification_request__name { + @apply no-underline; + } + } } \ No newline at end of file