From 5c23ea6294967989b40bb872ea7547a8544cb5c0 Mon Sep 17 00:00:00 2001 From: dwickwire Date: Wed, 18 Jan 2012 11:57:46 -0600 Subject: [PATCH 1/1] Adding basic merge template --- cas_provider/templates/cas/merge.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 cas_provider/templates/cas/merge.html 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 %} -- 2.20.1