From: dwickwire Date: Wed, 18 Jan 2012 17:57:46 +0000 (-0600) Subject: Adding basic merge template X-Git-Tag: 22.4~61 X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/5c23ea6294967989b40bb872ea7547a8544cb5c0?hp=d20955a26f2dbfe2480c601c2e209be1a43060e1 Adding basic merge template --- diff --git a/cas_provider/templates/cas/merge.html b/cas_provider/templates/cas/merge.html new file mode 100644 index 0000000..5a362f7 --- /dev/null +++ b/cas_provider/templates/cas/merge.html @@ -0,0 +1,24 @@ +{% extends "base.html" %} + +{% block title %} +Merge +{% endblock %} + +{% block content %} +
+
+ Merge your accounts + {% if errors %} +
    + {% for error in errors %} +
  • {{ error|escape }}
  • + {% endfor %} +
+ {% endif %} + + {{ form.as_table }} +
+

+
+
+{% endblock %}