second take on skins - quite a bit simpler

15 files changed, 0 insertions, 677 deletions

diff --git a/forum/templates/authopenid/changeemail.html b/forum/templates/authopenid/changeemail.html
deleted file mode 100644
index 94d1881c..00000000
--- a/forum/templates/authopenid/changeemail.html
+++ /dev/null
@@ -1,88 +0,0 @@
-{% extends "base_content.html" %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Change email" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<!-- changeemail.html action_type={{action_type}}-->
-{% ifequal action_type "change" %}
-    <div id="main-bar" class="headNormal">
-        {% if user.email %}
-            {% trans "Change email" %}
-        {% else %}
-            {% trans "Save your email address" %}
-        {% endif %}
-    </div>
-    <p class="message">
-        {% if user.email %}
-            {% blocktrans %}change {{email}} info{% endblocktrans %}
-        {% else %}
-            {% blocktrans %}here is why email is required, see {{gravatar_faq_url}}{% endblocktrans %}
-        {% endif %}
-    </p>
-    {% if msg %}
-    <p class="error">{{ msg }}</p>
-    {% endif %}
-
-    <div class="aligned">
-        <form action="." method="post" accept-charset="utf-8">
-            {% if next %}
-                <input type="hidden" name="next" value="{{next}}"/>
-            {% endif %}
-            <div class="form-row-vertical">
-                <label for="id_email">{% if user.email %}{% trans "Your new Email" %}{% else %}{% trans "Your Email" %}{% endif %}</label>
-                {% if form.email.errors %}
-                <p class="error">{{form.email.errors|join:", "}}</p>
-                {% endif %}
-                {{ form.email }}
-            </div>
-            <div class="submit-row">
-                <input class="submit" type="submit" name="change_email" value="{% if user.email %}{% trans "Change email" %}{% else %}{% trans "Save Email" %}{% endif %}">
-                {% if user.email %}
-                <input class="submit" type="submit" name="cancel" value="{% trans "Cancel" %}">
-                {% endif %}
-            </div>
-
-        </form>
-    </div>
-{% endifequal %}
-{% ifequal action_type "validate" %}
-    <div id="main-bar" class="headNormal">
-        {% trans "Validate email" %}
-    </div>
-    <p class="message">
-        {% blocktrans %}validate {{email}} info or go to {{change_email_url}}{% endblocktrans %}
-    </p>
-{% endifequal %}
-{% ifequal action_type "keep" %}
-    <div id="main-bar" class="headNormal">
-        {% trans "Email not changed" %}
-    </div>
-    <p class="message">
-        {% blocktrans %}old {{email}} kept, if you like go to {{change_email_url}}{% endblocktrans %}
-    </p>
-{% endifequal %}
-{% ifequal action_type "done_novalidate" %}
-    <div id="main-bar" class="headNormal">
-        {% trans "Email changed" %}
-    </div>
-    <p class="message">
-        {% blocktrans %}your current {{email}} can be used for this{% endblocktrans %}
-    </p>
-{% endifequal %}
-{% ifequal action_type "validation_complete" %}
-    <div id="main-bar" class="headNormal">
-        {% trans "Email verified" %}
-    </div>
-    <p class="message">
-        {% trans "thanks for verifying email" %}
-    </p>
-{% endifequal %}
-{% ifequal action_type "key_not_sent" %}
-    <div id="main-bar" class="headNormal">
-        {% trans "email key not sent" %}
-    </div>
-    <p class="message">
-        {% blocktrans %}email key not sent {{email}} change email here {{change_link}}{% endblocktrans %}
-    </p>
-{% endifequal %}
-{% endblock %}
-<!-- end changeemail.html -->
diff --git a/forum/templates/authopenid/changeopenid.html b/forum/templates/authopenid/changeopenid.html
deleted file mode 100644
index d01788fb..00000000
--- a/forum/templates/authopenid/changeopenid.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-<!-- changeopenid.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Change OpenID" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div id="main-bar" class="">
-    <h3>
-        {% trans "Account: change OpenID URL" %}
-    </h3>
-</div>
-
-<p>{% blocktrans %}This is where you can change your OpenID URL. Make sure you remember it!{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-	{% if form.openid_url.errors %} 
-		<span class="error">{{ form.openid_url.errors|join:", " }}</span>
-	{% endif %}
-
-
-</p>
-{% endif %}
-{% if msg %}
-	<p class="errors">{{ msg }}</p>
-{% endif %}
-
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
-
-		<div id="form-row"><label for="id_openid_url">{% trans "OpenID URL:" %}</label>{{ form.openid_url }}</div>
-        <p><input type="submit" value="{% trans "Change OpenID" %}"></p>
-
-	</form>
-	</div>
-{% endblock %}
-<!-- end changeopenid.html -->
diff --git a/forum/templates/authopenid/changepw.html b/forum/templates/authopenid/changepw.html
deleted file mode 100644
index 8b059544..00000000
--- a/forum/templates/authopenid/changepw.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "base.html" %}
-<!-- changepw.html -->
-{% load i18n %}
-{% block head %}{% endblock %}
-{% block title %}{% spaceless %}{% trans "Change password" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div class="headNormal">{% trans "Account: change password" %}</div>
-<p class="message">{% blocktrans %}This is where you can change your password. Make sure you remember it!{% endblocktrans %}</p>
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
-        <ul id="changepw-form" class="form-horizontal-rows">
-        {{form.as_ul}}
-        </ul>
-        <div class="submit-row"><input type="submit" class="submit" value="{% trans "Change password" %}" /></div>
-	</form>
-	</div>
-{% endblock %}
-<!-- end changepw.html -->
diff --git a/forum/templates/authopenid/complete.html b/forum/templates/authopenid/complete.html
deleted file mode 100644
index 62970e38..00000000
--- a/forum/templates/authopenid/complete.html
+++ /dev/null
@@ -1,130 +0,0 @@
-{% extends "base_content.html" %}
-<!-- complete.html -->
-{% comment %}
-views calling this template: 
-* django_authopenid.views.register with login_type='openid'
-* django_authopenid.views.signin - with login_type='legacy'
-
-parameters:
-* provider 
-* login_type openid|legacy
-* username (same as screen name or username in the models, and nickname in openid sreg)
-* form1 - OpenidRegisterForm
-* form2 - OpenidVerifyForm not clear what this form is supposed to do, not used for legacy
-* email_feeds_form forum.forms.SimpleEmailSubscribeForm
-* openid_username_exists
-{% endcomment %}
-{% load i18n %}
-{% block head %}{% endblock %}
-{% block title %}{% spaceless %}{% trans "Connect your OpenID with this site" %}{% endspaceless %}{% endblock %}
-{% block content %}
-    <div id="main-bar" class="headNormal">
-		{% trans "Connect your OpenID with your account on this site" %}
-    </div>      
-	<div id="completetxt" >
-        <div class="message">
-            {% ifequal login_type 'openid' %}
-                {% blocktrans %}register new {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
-            {% else %}
-                {% ifequal login_type 'legacy' %}
-                    {% if external_login_name_is_taken %}
-                        {% blocktrans %}{{username}} already exists, choose another name for 
-                            {{provider}}. Email is required too, see {{gravatar_faq_url}}
-                        {% endblocktrans %} 
-                    {% else %}
-                        {% blocktrans %}register new external {{provider}} account info, see {{gravatar_faq_url}}{% endblocktrans %}
-                    {% endif %}
-                {% else %}
-                    {% blocktrans %}register new Facebook connect account info, see {{gravatar_faq_url}}{% endblocktrans %}
-                {% endifequal %}
-            {% endifequal %}
-        </div>
-    	<p style="display:none">{% trans "This account already exists, please use another." %}</p>
-	</div>
-
-	{% if form1.errors %}
-        <ul class="errorlist">
-        {% if form1.non_field_errors %}
-            {% for error in form1.non_field_errors %}
-                <li>{{error}}</li>
-            {% endfor %}
-        {% endif %}
-        </ul>
-	{% endif %}
-    {% comment %}
-	{% if form2.errors %}<!--form2 is dysfunctional so commented out -->
-	<div class="errors">
-        <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/>
-        <ul class="error-list">
-		{% if form2.username.errors %} 
-			<li><span class="error">{{ form2.username.errors|join:", " }}</span></li>
-		{% endif %}
-		{% if form2.password.errors %} 
-			<li><span class="error">{{ form2.password.errors|join:", " }}</span></li>
-		{% endif %}
-       </ul>
-	</div>
-	{% endif %}
-    {% endcomment %}
-
-	<div class="login">
-        {% ifequal login_type 'openid' %}
-        <form name="fregister" action="{% url user_register %}" method="POST">
-        {% else %}
-            {% ifequal login_type 'facebook' %}
-            <form name="fregister" action="" method="POST">
-            {% else %}
-            <form name="fregister" action="{% url user_signin %}" method="POST">
-            {% endifequal %}
-        {% endifequal %}
-            {{ form1.next }}
-            <div class="form-row-vertical">
-                <label for="id_username">{% trans "Screen name label" %}</label>
-                {% if form1.username.errors %} 
-                    <p class="error">{{ form1.username.errors|join:", " }}</p>
-                {% endif %}
-                {{ form1.username }}
-            </div>
-            <div class="form-row-vertical margin-bottom">
-                <label for="id_email">{% trans "Email address label" %}</label>
-                {% if form1.email.errors %} 
-                    <p class="error">{{ form1.email.errors|join:", " }}</p>
-                {% endif %}
-                {{ form1.email }}
-            </div>
-            <p>{% trans "receive updates motivational blurb" %}</p>
-            <div class='simple-subscribe-options'>
-            {{email_feeds_form.subscribe}}
-            {% if email_feeds_form.errors %}
-            <p class="error">{% trans "please select one of the options above" %}</p>
-            {% endif %}
-            </div>
-            <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p>
-            <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div>
-		</form>
-	</div>
-    {% comment %}<!-- this form associates openID with an existing password-protected account, not yet functional -->
-    {% if form2 %}
-	<div class="login" style="display:none">
-        <form name="fverify" action="{% url user_register %}" method="POST">
-            {{ form2.next }}
-			<fieldset style="padding:10px">
-				<legend class="big">{% trans "Existing account" %}</legend>
-				<div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
-				<div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
-                <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p>
-                <div class='simple-subscribe-options'>
-                {{email_feeds_form.subscribe}}
-                </div>
-				<!--todo double check translation from chinese 确认 = "Register" -->
-				<div class="submit-row">
-					<input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> 
-					<a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>
-				</div>
-			</fieldset>
-		</form>
-	</div>
-    {% endif %}
-    {% endcomment %}
-{% endblock %}
-<!-- end complete.html -->
diff --git a/forum/templates/authopenid/confirm_email.txt b/forum/templates/authopenid/confirm_email.txt
deleted file mode 100644
index 3a01f146..00000000
--- a/forum/templates/authopenid/confirm_email.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{% load i18n %}
-{% trans "Thank you for registering at our Q&A forum!" %}
-
-{% trans "Your account details are:" %}
-
-{% trans "Username:" %} {{ username }}
-{% trans "Password:" %} {{ password }}
-
-{% trans "Please sign in here:" %}
-{{signup_url}}
-
-{% blocktrans %}Sincerely,
-Forum Administrator{% endblocktrans %}
diff --git a/forum/templates/authopenid/delete.html b/forum/templates/authopenid/delete.html
deleted file mode 100644
index 0f9f1c60..00000000
--- a/forum/templates/authopenid/delete.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base.html" %}
-<!-- delete.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Delete account" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div id="main-bar" class="">
-    <h3>
-        {% trans "Account: delete account" %}
-    </h3>
-</div>
-
-<p class="settings-descr">{% blocktrans %}Note: After deleting your account, anyone will be able to register this username.{% endblocktrans %}</p>
-{% if form.errors %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-	{% if form.confirm.errors %} 
-    <span class="error">{% trans "Check confirm box, if you want delete your account." %}</span><br />
-	{% endif %}
-	{% if form.password.errors %} 
-    <span class="error">{% trans "Password:" %} {{ form.password.errors|join:", " }}</span>
-	{% endif %}
-</p>
-{% endif %}
-{% if msg %}
-<p class="errors">{% trans "Please correct errors below:" %}<br />
-    <span class="error">{{ msg }}</span>
-    </p>
-{% endif %}
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
-
-        <div id="form-row"> {{ form.confirm }} {% trans "I am sure I want to delete my account." %}</div>
-        <div id="form-row"><label for="id_password">{% trans "Password/OpenID URL" %}</label>{{ form.password }} {% trans "(required for your security)" %}</div>
-
-        <p><input type="submit" value="{% trans "Delete account permanently" %}"></p>
-
-	</form>
-	</div>
-{% endblock %}
-<!-- end delete.html -->
diff --git a/forum/templates/authopenid/email_validation.txt b/forum/templates/authopenid/email_validation.txt
deleted file mode 100644
index 5b166a9b..00000000
--- a/forum/templates/authopenid/email_validation.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load i18n %}
-{% trans "Greetings from the Q&A forum" %},
-
-{% trans "To make use of the Forum, please follow the link below:" %}
-
-{{validation_link}}
-
-{% trans "Following the link above will help us verify your email address." %}
-
-{% blocktrans %}If you beleive that this message was sent in mistake - 
-no further action is needed. Just ingore this email, we apologize
-for any inconvenience{% endblocktrans %}
-
-{% blocktrans %}Sincerely,
-Forum Administrator{% endblocktrans %}
diff --git a/forum/templates/authopenid/external_legacy_login_info.html b/forum/templates/authopenid/external_legacy_login_info.html
deleted file mode 100644
index 3318499c..00000000
--- a/forum/templates/authopenid/external_legacy_login_info.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base_content.html" %}
-<!--customize this template-->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Traditional login information" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div class="headNormal">
-    {% trans "Traditional login information" %}
-</div>
-{% spaceless %}
-<div class="message">
-<!--add info about your external login site here-->
-{% blocktrans %}how to login with password through external login website or use {{feedback_url}}{% endblocktrans %}
-</div>
-{% endspaceless %}
-{% endblock %}
diff --git a/forum/templates/authopenid/failure.html b/forum/templates/authopenid/failure.html
deleted file mode 100644
index d075d6b0..00000000
--- a/forum/templates/authopenid/failure.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<!-- failure.html -->
-<html>
-<head>
-  <title>OpenID failed</title>
-</head>
-<body>
-<h1>OpenID failed</h1>
-
-<p>{{ message|escape }}</p>
-
-</body>
-</html><!-- end failure.html -->
diff --git a/forum/templates/authopenid/sendpw.html b/forum/templates/authopenid/sendpw.html
deleted file mode 100644
index 6241c811..00000000
--- a/forum/templates/authopenid/sendpw.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-<!-- sendpw.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-{% block content %}
-<div class="headNormal">
-    {% trans "Send new password" %}
-</div>
-<p class="message">
-{% trans "password recovery information" %}
-</p>
-{% if msg %}
-    <p class="action-status"><span>{{msg}}</span><p>
-{% endif %}
-
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
-        <ul id="emailpw-form" class="form-horizontal-rows">
-            {{form.as_ul}}
-        </ul>
-        <p style="padding-top:10px"><input type="submit" class="submit" value="{% trans "Reset password" %}" /> 
-        <a href="{% url user_signin %}"><span class="strong">{% trans "return to login" %}</span></a></p>
-	</form>
-</div>
-{% endblock %}
-<!-- end sendpw.html -->
diff --git a/forum/templates/authopenid/sendpw_email.txt b/forum/templates/authopenid/sendpw_email.txt
deleted file mode 100644
index f044ca45..00000000
--- a/forum/templates/authopenid/sendpw_email.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load i18n %}
-{% blocktrans%}Someone has requested to reset your password on {{site_url}}.
-If it were not you, it is safe to ignore this email.{% endblocktrans %}
-
-{% blocktrans %}email explanation how to use new {{password}} for {{username}}
-with the {{key_link}}{% endblocktrans %}
-
-{% blocktrans %}Sincerely,
-Forum Administrator{% endblocktrans %}
diff --git a/forum/templates/authopenid/settings.html b/forum/templates/authopenid/settings.html
deleted file mode 100644
index 66ea5953..00000000
--- a/forum/templates/authopenid/settings.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "base_content.html" %}
-<!-- settings.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Account functions" %}{% endspaceless %}{% endblock %}
-{% block head %}
-<style type="text/css" media="screen">
-    h4 {font-size:12pt;}
-	dt, dd { padding:0 0 0.35em 0; }
-	dt { float: left; width: 21ex;  }
-	dd { margin-left: 23ex;  }
-	
-	#settings-options, #settings-intro { padding: 4em 1.5em;}
-	#settings-options { min-height: 300px; border-left: 1px solid #333;}
-	
-	#settings-options h5 { font-weight: bold;}
-</style>
-{% endblock %}
-
-{% block content %}
-<div id="main-bar">
-    <h3><strong>{{ request.user.username }} {% trans "Profile" %}</strong></h3>
-</div>
-<div id="settings-options">
-	{% if msg %}
-		<p class="error">{{ msg }}</p>
-	{% endif %}
-
-	<dl class="list-item">
-        <dt>» <a href="{% url user_changepw %}">{% trans "Change password" %}</a></dt>
-        <dd>{% trans "Give your  account a new password." %}</dd>
-        <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt>
-        <dd>{% trans "Add or update the email address associated with your account." %}</dd>
-        {% if is_openid %}
-        <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID" %}</a></dt>
-        <dd>{% trans "Change openid associated to your account" %}</dd>
-        {% endif %}
-        
-        <dt>» <a href="{% url user_delete %}">{% trans "Delete account" %}</a></dt>
-        <dd>{% trans "Erase your username and all your data from website" %}</dd>
-	</dl>
-</div>
-{% endblock %}
-<!-- end settings.html -->
diff --git a/forum/templates/authopenid/signin.html b/forum/templates/authopenid/signin.html
deleted file mode 100755
index 4e060d0f..00000000
--- a/forum/templates/authopenid/signin.html
+++ /dev/null
@@ -1,186 +0,0 @@
-{% extends "base.html" %}

-<!-- signin.html -->

-{% load i18n %}

-{% load extra_tags %}

-{% block title %}{% spaceless %}{% trans "User login" %}{% endspaceless %}{% endblock %}

-{% block forejs %}

-    <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>

-

-	<link rel="stylesheet" type="text/css" media="screen" href="{% media  "/media/jquery-openid/openid.css" %}"/>

-	<script type="text/javascript" src="{% media  "/media/jquery-openid/jquery.openid.js" %}"></script>

-	<script type="text/javascript">  $().ready( function() { $("form.openid:eq(0)").openid(); })</script>

-	<!--<script type="text/javascript">

-	$().ready(function(){

-	    openid.init('id_openid_url');

-        setupFormValidation("#openid_form", {bsignin:{required: true}});

-	});

-	</script>-->

-{% endblock %}

-{% block content %}

-<div class="headNormal">

-	{% trans "User login" %}

-</div>

-        {% if msg %}

-            <p class="warning">{{ msg }}</p>

-        {% endif %}

-        {% if answer %}

-            <div class="message">

-                {% blocktrans with answer.question.title as title and answer.summary as summary %}

-                Your answer to {{title}} {{summary}} will be posted once you log in

-                {% endblocktrans %}

-            </div>

-        {% endif %}

-        {% if question %}

-            <div class="message">

-                {% blocktrans with question.title as title and question.summary as summary %}Your question 

-                {{title}} {{summary}} will be posted once you log in

-                {% endblocktrans %}

-            </div>

-        {% endif %}

-			<form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> 

-		      <div style="width:600px;float:left;margin-bottom:5px;">

-                {% trans "Click to sign in through any of these services." %}

-              </div>

-			  <ul class="providers"> 

-			  <li class="local" title="Local login">

-				  <div class="logo_box local_login_box">

-						<img src="{% media  "/media/jquery-openid/images/local-login.png" %}" alt="your icon here" /> 

-				  </div>

-			  <span></span>

-			  </li> 

-			  <li class="direct" title="Google"> 

-			  	<div class="logo_box google_box">

-					<img src="{% media  "/media/jquery-openid/images/google.gif" %}" alt="icon" /><span>https://www.google.com/accounts/o8/id</span>

-				</div>

-		 	  </li>

-			  <li class="direct" title="Yahoo"> 

-			  	<div class="logo_box yahoo_box">

-					<img src="{% media  "/media/jquery-openid/images/yahoo.gif" %}" alt="icon" /><span>http://yahoo.com/</span>

-				</div>

-			  </li>

-			  <li class="username" title="AOL screen name"> 

-			  	<div class="logo_box aol_box">

-					<img src="{% media  "/media/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>

-				</div>

-			  </li>

-              </ul>            

-			  <ul id="openid_small_providers" class="providers"> 

-			  <!--<li class="openid" title="OpenID">

-				  <div class="logo_box openid_box">

-						<img src="/media/jquery-openid/images/openid.gif" alt="icon" /> 

-				  </div>

-			  <span><strong>http://{your-openid-url}</strong></span>

-			  </li>-->

-              <li class="first_tiny_li facebook" title="Facebook Connect">

-                    {% if question %}

-                        <fb:login-button onlogin="window.location = '{% url fb_signin_new_question %}'"></fb:login-button>

-                    {% else %}

-                        {% if answer %}

-                            <fb:login-button onlogin="window.location = '{% url fb_signin_new_answer %}'"></fb:login-button>

-                        {% else %}

-                            <fb:login-button onlogin="window.location = '{% url fb_signin %}'"></fb:login-button>

-                        {% endif %}

-                    {% endif %}                    

-              </li>

-			  <li class="openid" title="OpenID URL"> 

-					<img src="{% media  "/media/jquery-openid/images/openidico16.png" %}" alt="icon" />

-					<span>http://{your-openid-url}</span>

-		      </li> 

-			  <li class="username" title="MyOpenID user name"> 

-					<img src="{% media  "/media/jquery-openid/images/myopenid-2.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.myopenid.com/</span>

-		      </li> 

-			  <li class="username" title="Flickr user name"> 

-					<img src="{% media  "/media/jquery-openid/images/flickr.png" %}" alt="icon" />

-					<span>http://flickr.com/<strong>username</strong>/</span>

-			  </li> 

-			  <li class="username" title="Technorati user name"> 

-					<img src="{% media  "/media/jquery-openid/images/technorati-1.png" %}" alt="icon" />

-					<span>http://technorati.com/people/technorati/<strong>username</strong>/</span>

-			  </li> 

-			  <li class="username" title="Wordpress blog name"> 

-					<img src="{% media  "/media/jquery-openid/images/wordpress.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.wordpress.com</span>

-              </li> 

-			  <li class="username" title="Blogger blog name"> 

-					<img src="{% media  "/media/jquery-openid/images/blogger-1.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.blogspot.com/</span>

-			  </li> 

-			  <li class="username" title="LiveJournal blog name"> 

-					<img src="{% media  "/media/jquery-openid/images/livejournal-1.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.livejournal.com</span>

-			  </li> 

-			  <li class="username" title="ClaimID user name"> 

-					<img src="{% media  "/media/jquery-openid/images/claimid-0.png" %}" alt="icon" />

-					<span>http://claimid.com/<strong>username</strong></span>

-			  </li> 

-			  <li class="username" title="Vidoop user name"> 

-					<img src="{% media  "/media/jquery-openid/images/vidoop.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.myvidoop.com/</span>

-			  </li> 

-			  <li class="username" title="Verisign user name"> 

-					<img src="{% media  "/media/jquery-openid/images/verisign-2.png" %}" alt="icon" />

-					<span>http://<strong>username</strong>.pip.verisignlabs.com/</span>

-			  </li> 

-			  </ul>

-			  {{ form2.next }}

-			  <fieldset> 

-				  <p id="provider_name_slot">{% trans 'Enter your <span id="enter_your_what">Provider user name</span>' %}</p> 

-				  <div><p><span></span>

-				  		<input id="openid_username" type="text" name="openid_username" /><span></span> 

-			  			<input type="submit" value="Login" />

-				  </p></div>

-			  </fieldset> 

-			  <fieldset> 

-				  <p>{% trans 'Enter your <a class="openid_logo" href="http://openid.net">OpenID</a> web address' %}</p> 

-				  <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> 

-				  <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> 

-			  </fieldset> 

-              <fieldset id='local_login_fs'>

-				  <p>{% trans 'Enter your login name and password' %}</p> 

-                  {% if form1.errors %}

-                    {{form1.non_field_errors.as_ul}}

-                  {% endif %}

-				  <div><p class="login"><label for="id_username">{% trans "Login name" %}</label>

-                            {{form1.username}}</p>

-                  <p class="login"><label for="id_password">{% trans "Password" %}</label>

-                            {{form1.password}}</p>

-                  <p id="local_login_buttons">

-				  <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" />

-                  <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/>

-                  <a href="{% url user_sendpw %}">{% trans "Forgot your password?" %}</a>

-                  </p>

-                  </div>

-              </fieldset>

-			</form>

-{% endblock %}

-

-{% block sidebar %}

-<div class="boxC">

-    <h3 class="subtitle">{% trans "Why use OpenID?" %}</h3>

-    <ul class="list-item">

-        <li>

-		{% trans "with openid it is easier" %}

-        </li>

-        <li>

-		{% trans "reuse openid" %}

-        </li>

-        <li>

-		{% trans "openid is widely adopted" %}

-        </li>

-        <li>

-		{% trans "openid is supported open standard" %}

-        </li>

-        

-    </ul>

-    <p class="info-box-follow-up-links">

-        <a href="http://openid.net/what/" target="_blank">{% trans "Find out more" %} »</a><br/>

-        <a href="http://openid.net/get/" target="_blank">{% trans "Get OpenID" %} »</a>

-    </p>

-</div>

-<script type="text/javascript" src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"></script>

-<script type="text/javascript">  FB.init("{{ fb_api_key }}","{% url  xd_receiver %}");</script> 

-{% endblock%}

-

-		<script type="text/javascript">  $( function() { $("form.openid:eq(0)").openid(); })</script>

-<!-- end signin.html -->

diff --git a/forum/templates/authopenid/signup.html b/forum/templates/authopenid/signup.html
deleted file mode 100644
index fdb236c2..00000000
--- a/forum/templates/authopenid/signup.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "base_content.html" %}
-<!--signup.html-->
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Signup" %}{% endspaceless %}{% endblock %}
-
-{% block content %}
-<div class="headNormal">
-    {% trans "Create login name and password" %}
-</div>
-<p class="message">{% trans "Traditional signup info" %}</p>
-<form action="{% url user_signup %}" method="post" accept-charset="utf-8">
-    <ul class="form-horizontal-rows">
-    <li><label for="usename_id">{{form.username.label}}</label>{{form.username}}{{form.username.errors}}</li>
-    <li><label for="email_id">{{form.email.label}}</label>{{form.email}}{{form.email.errors}}</li>
-    <li><label for="password1_id">{{form.password1.label}}</label>{{form.password1}}{{form.password1.errors}}</li>
-    <li><label for="password2_id">{{form.password2.label}}</label>{{form.password2}}{{form.password2.errors}}</li>
-    </ul>
-    <p class="margin-top">{% trans "receive updates motivational blurb" %}</p>
-    <div class='simple-subscribe-options'>
-    {{email_feeds_form.subscribe}}
-    {% if email_feeds_form.errors %}
-    <p class="error">{% trans "please select one of the options above" %}</p>
-    {% endif %}
-    </div>
-    <p class="signup_p">{% trans "Please read and type in the two words below to help us prevent automated account creation." %}</p>
-    {{form.recaptcha}}
-    <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
-    <strong>{% trans "or" %}
-    <a href="{% url user_signin %}">{% trans "return to OpenID login" %}</a></strong></div>
-</form>
-{% endblock %}
-<!--end signup.html-->
diff --git a/forum/templates/authopenid/yadis.xrdf b/forum/templates/authopenid/yadis.xrdf
deleted file mode 100644
index a9ed44fe..00000000
--- a/forum/templates/authopenid/yadis.xrdf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xrds:XRDS
-   xmlns:xrds='xri://$xrds'
-   xmlns:openid='http://openid.net/xmlns/1.0'
-   xmlns='xri://$xrd*($v*2.0)'>
- <XRD>
-   <Service>
-     <Type>http://specs.openid.net/auth/2.0/return_to</Type>
-     {% for uri in return_to %}
-        <URI>{{ uri }}</URI>
-     {% endfor %}
-   </Service>
- </XRD>
-</xrds:XRDS>
\ No newline at end of file