Merge branch 'wizard' of salsa.debian.org:urbec/nm.debian.org

MR: !34


Signed-off-by: Mattia Rizzolo <mattia@debian.org>

wizard/templates/wizard/advocate.html

@@ -70,25 +70,11 @@
     </tbody>
   </table>
   {% endif %}
-
-{% elif not request.session.signon_identities %}
-
-{% url 'dm_claim' as dm_claim_url %}
-<p>{% blocktrans %}You are currently logged in
-with <a href="https://wiki.debian.org/DebianSingleSignOn">SSO username</a>
-<b>{{request.user.username}}</b>, but not mapped to any person in the site.
-If you are a Debian Maintainer, you can try to correct the situation using the
-<a href="{{dm_claim}}">claim interface</a>.{% endblocktrans %}</p>
-
 {% else %}
-
-<p>{% blocktrans %}You are not currently logged in. See the
-<a href="https://wiki.debian.org/DebianSingleSignOn">Single Sign-On page</a>
-for details.{% endblocktrans %}</p>
-
+<p class="lead">{% trans "This wizard only works when you are logged into the site" %}</p>
 {% endif %}
 
-{% if request.session.signon_identities %}
+{% if request.signon_identities %}
 {% include "wizard/whoami.html" %}
 {% endif %}
 

wizard/templates/wizard/newprocess.html

@@ -20,7 +20,7 @@ and follow the instructions.{% endblocktrans %}
   {% endif %}
 {% endif %}
 
-{% if request.session.signon_identities %}
+{% if request.signon_identities %}
 {% include "wizard/whoami.html" %}
 {% endif %}
 

wizard/templates/wizard/whoami.html

@@ -16,7 +16,7 @@
       {% blocktrans with request_user_username=request.user.username %}You
       are currently logged in, but not mapped to any person in the site.
       If you are a Debian Maintainer, you can try to correct the situation using the
-      <a href="{{dm_claim}}">claim interface</a>.{% endblocktrans %}
+      <a href="{{dm_claim_url}}">claim interface</a>.{% endblocktrans %}
 
       {% url 'public_newnm' as public_newnm_url %}
       {% blocktrans %}If you are not yet in the site,