Fixing functionality

sqrl/templates/admin/base.html

@@ -14,6 +14,6 @@
     {% if user.has_usable_password %}
         <a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a> /
     {% endif %}
-    <a href="{% url 'admin-sqrl_manage' %}">{% trans 'Manage SQRL' %}</a> /
+    <a href="{% url 'sqrl:admin-sqrl_manage' %}">{% trans 'Manage SQRL' %}</a> /
     <a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
 {% endblock %}

sqrl/templates/sqrl/login.html

@@ -12,7 +12,7 @@
     </p>
 
     {% sqrl as session_sqrl %}
-    {% sqrl_login_dropin session_sqrl %}
+    {% sqrl_login_dropin session_sqrl login %}
 {% endblock %}
 
 {% comment %}

sqrl/templates/sqrl/register.html

@@ -7,11 +7,12 @@
 
     <p>
         Already have account?
-        Login <a href="{% url 'login' %}">here</a> to associate
-        SQRL identity with existing account.
+        Login <a href="{% url 'sqrl:login' %}">here</a> to associate
+        SQRL identity with an existing account.
     </p>
 
     <form method="post">
+        {% csrf_token %}
         {{ form.as_p }}
         <input type="submit">
     </form>

sqrl/templates/sqrl/sqrl-dropin.html

@@ -28,13 +28,8 @@
         </div>
         
         <input type="hidden" name="nut" value="{{ session_sqrl.nut.nonce }}">
-        {% if session_sqrl.method == "manage" %}
-            {# redirect to manage page after successful SQRL transaction #}
-            <input type="hidden" name="next" value="{% url 'sqrl:manage' %}">
-            <input type="submit" value="Manage SQRL">
-        {% else %}
-            <input type="submit" value="Log in using SQRL">
-        {% endif %}
+        <input type="hidden" name="next" value="{{ redir }}">
+        <input type="submit" value="Authenticate using SQRL">
     </form>
 </div>
 <script>SQRL_CHECK_URL="{% sqrl_status_url_script_tag session_sqrl %}"</script>