From 50c8b0adedc769bdee6d676e7043f9b91a5252a1 Mon Sep 17 00:00:00 2001 From: Flavio Tarsetti Date: Mon, 16 Mar 2020 16:40:23 +0100 Subject: [PATCH 1/4] [ui][registration][forms] Add information that emails need to be institutional --- beat/web/ui/registration/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beat/web/ui/registration/forms.py b/beat/web/ui/registration/forms.py index cdd08995..6bcb3a39 100644 --- a/beat/web/ui/registration/forms.py +++ b/beat/web/ui/registration/forms.py @@ -77,7 +77,7 @@ class RegistrationForm(forms.Form): label=_(u'Last name')) email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, maxlength=75)), - label=_(u'E-mail address')) + label=_(u'Institutional E-mail address')) password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False), label=_(u'Password')) password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False), @@ -350,7 +350,7 @@ class RegistrationSupervisorForm(forms.Form): label=_(u'Last name')) email = forms.EmailField(widget=forms.TextInput(attrs=dict(attrs_dict, maxlength=75)), - label=_(u'E-mail address')) + label=_(u'Institutional E-mail address')) password1 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False), label=_(u'Password')) password2 = forms.CharField(widget=forms.PasswordInput(attrs=attrs_dict, render_value=False), -- GitLab From ba122bc0b24ebaf618d9fd9ba76ccf015b418f8a Mon Sep 17 00:00:00 2001 From: Flavio Tarsetti Date: Mon, 16 Mar 2020 16:44:40 +0100 Subject: [PATCH 2/4] [doc][user][faq] Enforce institutional email in documentation Fixes #544 --- doc/user/faq.rst | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/user/faq.rst b/doc/user/faq.rst index 393bb258..be6aca3a 100644 --- a/doc/user/faq.rst +++ b/doc/user/faq.rst @@ -264,7 +264,8 @@ What is a supervisor? A supervisor is a recognized person on the platform. The supervisor is generally a person that holds a senior position in a laboratory/research -institute or company. +institute or company. It is important to note that your email should be +institutional! Why do I need a supervisor to start using the |project| platform? @@ -273,12 +274,14 @@ Why do I need a supervisor to start using the |project| platform? Supervisors ensure you belong to a work group. They are institutionally responsible that you follow the |project| platform terms of use. To successfully register, you'll need to specify the username of a *currently -existing* supervisor on the platform. After you have validated your e-mail -address, a request will be made to such an user in order to confirm your +existing* supervisor on the platform. After you have validated your institutional +e-mail address, a request will be made to such an user in order to confirm your registration. Once the supervisor has confirmed your affiliation, your account becomes active and you can use the platform. Re-activation is required after a period of time (usually every year). +It is important to note that your email should be institutional! + If your supervisor is not registered on the |project| platform, ask them to register, and to make a request to become a supervisor (see text below). Once their account is created, you will then be able to make a supervision request @@ -315,7 +318,7 @@ To become a supervisor, there are two ways. * Sign up on the platform and `register as a supervisor`_. - After you have validated that your email is correct, a request will then be + After you have validated that your institutional email is correct, a request will then be made to the |project| admins in order to validate your account. After checking, that you hold a position in your university/research institute or laboratory, an admin of the platform will accept your request. -- GitLab From 84cdaff67db6d520eb5abf8f59bbe015f5ab18ae Mon Sep 17 00:00:00 2001 From: Flavio Tarsetti Date: Mon, 16 Mar 2020 16:51:31 +0100 Subject: [PATCH 3/4] [settings/ui][settings/templates-views] Fix issue with documentation pointers Fixes #545 --- beat/web/settings/settings.py | 1 + .../templates/registration/registration_form.html | 6 +++--- beat/web/ui/registration/views.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/beat/web/settings/settings.py b/beat/web/settings/settings.py index 5f86463e..e66f581e 100755 --- a/beat/web/settings/settings.py +++ b/beat/web/settings/settings.py @@ -435,3 +435,4 @@ SERIALIZATION_MODULES = {"json": "beat.web.utils.activity_stream_serializer"} ############################################################################## DOCUMENTATION_LINK = "https://www.idiap.ch/software/beat/docs/beat/docs/stable/beat.web/doc/user/index.html" +DOCUMENTATION_FAQ_LINK = "https://www.idiap.ch/software/beat/docs/beat/docs/stable/beat.web/doc/user/faq.html" diff --git a/beat/web/ui/registration/templates/registration/registration_form.html b/beat/web/ui/registration/templates/registration/registration_form.html index e08b5fb0..1c6c5383 100644 --- a/beat/web/ui/registration/templates/registration/registration_form.html +++ b/beat/web/ui/registration/templates/registration/registration_form.html @@ -115,7 +115,7 @@ {% endfor %} @@ -157,8 +157,8 @@ {% endfor %} - @@ -157,7 +157,7 @@ {% endfor %} - -

  • User Guide

    • +

  • User Guide

    • {% if PREREGISTRATION_ONLY %}

  • Sign-up

    • @@ -138,8 +138,8 @@ -
  • User Guide
    • - +
  • User Guide
    • + {% if request.user.is_superuser %}
  • Scheduler
    • -- GitLab