From 5c23ea6294967989b40bb872ea7547a8544cb5c0 Mon Sep 17 00:00:00 2001
From: dwickwire <wickwire@gmail.com>
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 %}
+  <form action='.' method='post'>
+    <fieldset>
+      <legend>Merge your accounts</legend>
+      {% if errors %}
+        <ul>
+            {% for error in errors %}
+                <li>{{ error|escape }}</li>
+            {% endfor %}
+        </ul>
+      {% endif %}
+      <table style="border: none;">
+        {{ form.as_table }}
+      </table>
+      <p><input type="submit" value="Merge"/></p>
+    </fieldset>
+  </form>
+{% endblock %}
-- 
2.20.1