From 7f4fabc2b0493ff96b621c98179ca2a14d4060ee Mon Sep 17 00:00:00 2001 From: John Peart <4903081+johnpeart@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:55:50 +0100 Subject: [PATCH 1/3] Update page styles Various style changes to match with www.mentormatching.online styles --- mentor_match_web/app/templates/base.html | 272 +++++++++++--------- mentor_match_web/app/templates/done.html | 6 - mentor_match_web/app/templates/index.html | 8 +- mentor_match_web/app/templates/input.html | 20 +- mentor_match_web/app/templates/login.html | 6 - mentor_match_web/app/templates/options.html | 8 +- mentor_match_web/app/templates/output.html | 6 - mentor_match_web/app/templates/process.html | 6 - 8 files changed, 159 insertions(+), 173 deletions(-) diff --git a/mentor_match_web/app/templates/base.html b/mentor_match_web/app/templates/base.html index 56b0f27e..99cb6a1c 100644 --- a/mentor_match_web/app/templates/base.html +++ b/mentor_match_web/app/templates/base.html @@ -1,133 +1,155 @@ - - {% block head %} - - Mentor matcher • {% block title %}{% endblock %} - {% endblock %} - - - - -
-
-
    -
  1. - Home -
    2. -
  2. - Tools -
    3. - {% block breadcrumbs %}{% endblock %} -
-
-
- -
- - {% block header %}{% endblock %} - - {% block content %}{% endblock %} - -
-
-
- - - - - - {% block js %}{% endblock %} - + + + {% block js %}{% endblock %} + diff --git a/mentor_match_web/app/templates/done.html b/mentor_match_web/app/templates/done.html index 3e8356bb..6a9ffc22 100644 --- a/mentor_match_web/app/templates/done.html +++ b/mentor_match_web/app/templates/done.html @@ -4,12 +4,6 @@ {{ super() }} {% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block paneltitle %}Download complete{% endblock %} {% block panelmessage %}

    You can safely close this window.

    diff --git a/mentor_match_web/app/templates/index.html b/mentor_match_web/app/templates/index.html index 3237b001..e326c0f8 100644 --- a/mentor_match_web/app/templates/index.html +++ b/mentor_match_web/app/templates/index.html @@ -4,8 +4,8 @@ {{ super() }} {% endblock %} -{% block pagecaption %}Tools{% endblock %} -{% block pageheading %}Mentor matcher{% endblock %} +{% block pagecaption %}Mentor matcher{% endblock %} +{% block pageheading %}Get started{% endblock %} {% block pageexcerpt %}This tool helps you to match mentors to mentees as part of the Civil Service LGBT+ mentoring programme.{% endblock %} {% block content %} @@ -13,9 +13,9 @@
    -

    Before you start

    +

    Before you start

      -
    1. This tool will only work with data in specific formats. You must have two files – mentees.csv and mentors.csv – to start the matching process. Those files need to be formatted with specific column headings. You can download a template from this website.
      2. +
    2. This tool will only work with data in specific formats. You must have two files – mentees.csv and mentors.csv – to start the matching process. Those files need to be formatted with specific column headings. You can find out more about formatting your data and download a template from this website.
    3. Do not close your browser window during the matching process. Doing this may cause the matching process to fail and you to lose your matches.
    4. The larger the number of matches you need, the longer this takes. Matching mentors to mentees takes around 10 minutes to match 500 participants.
    diff --git a/mentor_match_web/app/templates/input.html b/mentor_match_web/app/templates/input.html index 6fcba509..2f565a8a 100644 --- a/mentor_match_web/app/templates/input.html +++ b/mentor_match_web/app/templates/input.html @@ -4,12 +4,6 @@ {{ super() }} {% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block pagecaption %}Mentor matcher{% endblock %} {% block pageheading %}Upload your data{% endblock %} {% block pageexcerpt %}Upload the mentors and mentees you want to match.{% endblock %} @@ -18,17 +12,17 @@
    - {% if error_message %} -
    -

    An error has occurred

    -

    {{ error_message }}

    -
    - {% endif %}
    - + {% if error_message %} +
    +

    An error has occurred

    +

    {{ error_message }}

    +
    + {% endif %} +
    diff --git a/mentor_match_web/app/templates/login.html b/mentor_match_web/app/templates/login.html index 8cab7cf3..8b6aa62c 100644 --- a/mentor_match_web/app/templates/login.html +++ b/mentor_match_web/app/templates/login.html @@ -4,12 +4,6 @@ {{ super() }} {% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block pagecaption %}Mentor matcher{% endblock %} {% block pageheading %}Log in{% endblock %} {% block pageexcerpt %}This service is still in development. Please login to view it.{% endblock %} diff --git a/mentor_match_web/app/templates/options.html b/mentor_match_web/app/templates/options.html index 8f3c4259..5ed96fbd 100644 --- a/mentor_match_web/app/templates/options.html +++ b/mentor_match_web/app/templates/options.html @@ -2,12 +2,6 @@ {% block title %}Choose options{% endblock %} {% block head %}{{ super() }}{% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block pagecaption %}Mentor matcher{% endblock %} {% block pageheading %}Options{% endblock %} {% block pageexcerpt %}Choose how mentors and mentees are matched.{% endblock %} @@ -26,7 +20,7 @@
    - + Weightings diff --git a/mentor_match_web/app/templates/output.html b/mentor_match_web/app/templates/output.html index 972e122d..592452fd 100644 --- a/mentor_match_web/app/templates/output.html +++ b/mentor_match_web/app/templates/output.html @@ -4,12 +4,6 @@ {{ super() }} {% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block pagecaption %}Mentor matcher{% endblock %} {% block pageheading %}Matching complete{% endblock %} {% block pageexcerpt %}Download the matching results.{% endblock %} diff --git a/mentor_match_web/app/templates/process.html b/mentor_match_web/app/templates/process.html index 92514103..5fd83d29 100644 --- a/mentor_match_web/app/templates/process.html +++ b/mentor_match_web/app/templates/process.html @@ -2,12 +2,6 @@ {% block title %}Process matches{% endblock %} {% block head %}{{ super() }}{% endblock %} -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - {% block pagecaption %}Mentor matcher{% endblock %} {% block pageheading %}Start matching{% endblock %} {% block pageexcerpt %}Process the data and match mentors to mentees.{% endblock %} From c2b5e767287b3b6644bf3a1dfd609317a5b3a194 Mon Sep 17 00:00:00 2001 From: John Peart <4903081+johnpeart@users.noreply.github.com> Date: Wed, 16 Aug 2023 08:57:17 +0100 Subject: [PATCH 2/3] Remove templates and update routes I've moved the docs to the main [mentormatching.online](//mentormatching.online) Jekyll deployment, so these templates are no longer necessary. This should allow us to separate concerns, and remove the Jekyll code from this repo entirely. --- mentor_match_web/app/main/routes.py | 4 +- mentor_match_web/app/templates/cookies.html | 42 -------------- .../app/templates/privacy-and-data.html | 58 ------------------- 3 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 mentor_match_web/app/templates/cookies.html delete mode 100644 mentor_match_web/app/templates/privacy-and-data.html diff --git a/mentor_match_web/app/main/routes.py b/mentor_match_web/app/main/routes.py index a07e12b9..1fc0cf11 100644 --- a/mentor_match_web/app/main/routes.py +++ b/mentor_match_web/app/main/routes.py @@ -37,12 +37,12 @@ def index(): @main_bp.route("/cookies") def cookies(): - return redirect("http://docs.mentoring.service.civilservice.lgbt/cookies/") + return redirect("http://mentormatching.online/cookies/") @main_bp.route("/privacy-and-data") def privacy(): - return redirect("http://docs.mentoring.service.civilservice.lgbt/privacy/") + return redirect("http://mentormatching.online/privacy/") @main_bp.route("/upload", methods=["GET", "POST"]) diff --git a/mentor_match_web/app/templates/cookies.html b/mentor_match_web/app/templates/cookies.html deleted file mode 100644 index 1390b4a7..00000000 --- a/mentor_match_web/app/templates/cookies.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends "page-with-header.html" %} -{% block title %}Match mentees to mentors{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - -{% block pagecaption %}Mentor matcher{% endblock %} -{% block pageheading %}Cookies{% endblock %} -{% block pageexcerpt %}This page explains the use of cookies on this website.{% endblock %} - -{% block content %} -
    -
    -
    -

    Cookies are small files saved on your phone, tablet or computer when you visit a website.

    -

    We use cookies to make the Civil Service LGBT+ mentoring programme Mentor Matcher work.

    - -

    Essential cookies

    -

    We use some cookies to make the Mentor Matcher work properly. We do not need to ask permission to use them.

    - - - - - - - - - - - - -
    NamePurposeExpires
    `data-folder`This unique string is the name of the folder where your uploaded data is stored30 minutes
    -
    -
    -
    -{% endblock %} diff --git a/mentor_match_web/app/templates/privacy-and-data.html b/mentor_match_web/app/templates/privacy-and-data.html deleted file mode 100644 index e9e2a948..00000000 --- a/mentor_match_web/app/templates/privacy-and-data.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "page-with-header.html" %} -{% block title %}Match mentees to mentors{% endblock %} -{% block head %} -{{ super() }} -{% endblock %} - -{% block breadcrumbs %} -
  • - Mentor matcher -
    • -{% endblock %} - -{% block pagecaption %}Mentor matcher{% endblock %} -{% block pageheading %}Privacy and data{% endblock %} -{% block pageexcerpt %}This page explains the privacy and data policy for this website.{% endblock %} - -{% block content %} -
    -
    -
    -

    The Civil Service LGBT+ Network is a volunteer-led employee network for the UK Civil Service. We follow Civil Service policies and procedures.

    -

    The 'Mentor Matcher' service is a web service used to match mentees with mentors as part of the Civil Service LGBT+ mentoring programme. This policy explains how we use the data that is uploaded to the service.

    - -

    What information is collected and how it is used

    -

    The Mentor Matcher service is a tool that volunteers of the Civil Service LGBT+ Network can use to automate the process of matching mentors and mentees who have signed up to the Civil Service LGBT+ Network's mentoring programme.

    -

    You must not use this service without collecting explicit permission from users to process their data.

    -

    Data for the mentor matcher must be uploaded to the service in a specific format. The data must be in two spreadsheets: mentees.csv and mentors.csv. -

    The data collected as part of the programme includes, but is not limited to a participant's:

    -
      -
    • name
      • -
    • email address
      • -
    • place of work
      • -
    • job title
      • -
    • professional or functional anchor
      • -
    • grade
      • -
    -

    People signing up to take part in the mentoring programme must have given explicit consent for their data to be used for the purpose of matching mentors and mentees. If this consent has not been obtained, you should not use this service to match mentors and mentees.

    -

    To enable the mentor matcher to function, all of the data collected as part of the programme is uploaded to a server and processed. Once mentors and mentees are matched together, users of this service can download the data. The data is deleted once it has been downloaded.

    -

    Provided consent was collected in the appropriate manner when participants register for the programme, no further consent is required to use this tool, as it is an essential part of the programme.

    -

    Special category data is collected as part of the programme. This service processes special category data in order to make the programme function. Where special category data is collected and processed, explicit consent should be been gained from the data subject. If this consent has not been obtained, you should not use this service to match mentors and mentees.

    - -

    How the data is protected and how long it is retained for

    -

    We implement a variety of security measures to maintain the safety of data used on this service.

    -

    The data uploaded to this service is only retained for as long as is strictly necessary and it is regularly erased to mitigate against it being accessed by others.

    - -

    Changes to this policy

    -

    We keep this policy under review. Any updates to this policy will be published on this website. This policy was last updated on 25 June 2022.

    - -

    Informing you of changes or issues

    -

    If we make changes to the way we process your information, or we identify an issue with the way data is being managed, we will publish a notice on our website.

    -

    Read all notices

    - -

    How to contact us

    -

    Please contact us if you have any questions about this policy or information we hold about you.

    -
    -
    -
    -{% endblock %} From 026546244d8577f15bba71d0d18cf3d1f26caf4f Mon Sep 17 00:00:00 2001 From: John Peart <4903081+johnpeart@users.noreply.github.com> Date: Sun, 20 Aug 2023 16:19:25 +0100 Subject: [PATCH 3/3] Change http:// to https:// Changed redirects to https:// per [this comment](https://github.com/mentor-matching-online/mentor-match/pull/12#discussion_r1298463557) --- mentor_match_web/app/main/routes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mentor_match_web/app/main/routes.py b/mentor_match_web/app/main/routes.py index 1fc0cf11..00aa010a 100644 --- a/mentor_match_web/app/main/routes.py +++ b/mentor_match_web/app/main/routes.py @@ -37,12 +37,12 @@ def index(): @main_bp.route("/cookies") def cookies(): - return redirect("http://mentormatching.online/cookies/") + return redirect("https://mentormatching.online/cookies/") @main_bp.route("/privacy-and-data") def privacy(): - return redirect("http://mentormatching.online/privacy/") + return redirect("https://mentormatching.online/privacy/") @main_bp.route("/upload", methods=["GET", "POST"])