fnp
/
django-cas-provider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d20955a
)
Adding basic merge template
author
dwickwire
<wickwire@gmail.com>
Wed, 18 Jan 2012 17:57:46 +0000
(11:57 -0600)
committer
dwickwire
<wickwire@gmail.com>
Wed, 18 Jan 2012 17:57:46 +0000
(11:57 -0600)
cas_provider/templates/cas/merge.html
[new file with mode: 0644]
patch
|
blob
diff --git a/cas_provider/templates/cas/merge.html
b/cas_provider/templates/cas/merge.html
new file mode 100644
(file)
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 %}