second take on skins - quite a bit simpler

68 files changed, 0 insertions, 4389 deletions

diff --git a/forum/templates/404.html b/forum/templates/404.html
deleted file mode 100644
index 227de3ae..00000000
--- a/forum/templates/404.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template 404.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
-{% block forestyle%}
-    <style type="text/css">
- 		form input { margin-right: 5px; }
-	</style>
-{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-    404 Not Found
-</div>
-<div id="main-body" class="">
-    <div style="padding:5px 0px 10px 0;line-height:25px;">
-        <h3>{% trans "Sorry, could not find the page you requested." %}</h3>
-        <div style="margin-top:5px">
-        {% trans "This might have happened for the following reasons:" %}<br/>
-        <ul>
-            <li>{% trans "this question or answer has been deleted;" %}</li>
-            <li>{% trans "url has error - please check it;" %}</li>
-            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>;</li>
-            <li>{% trans "if you believe this error 404 should not have occured, please" %} 
-				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
-            </u>
-        </div>
-        <script type="text/javascript">
-            var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
-            var GOOG_FIXURL_SITE = '{{site_url}}';
-        </script>
-        <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
-        <ul>
-            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} »</li>
-            <li><a href="{% url questions %}">{% trans "see all questions" %} »</a></li>
-            <li><a href="{% url tags %}">{% trans "see all tags" %} »</a></li>
-        </u>
-    </div>
-
-</div>
-{% endblock %}
-<!-- end template 404.html -->
diff --git a/forum/templates/500.html b/forum/templates/500.html
deleted file mode 100644
index 51e73178..00000000
--- a/forum/templates/500.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template 500.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}500 Error{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type="text/javascript">
-        $().ready(function(){
-            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="">
-    <h3>
-        500 Server Error
-    </h3>
-
-</div>
-<div id="main-body" class="headNormal">
-    <div style="padding:5px 0px 10px 0;line-height:25px">
-        <h3>{% trans "sorry, system error" %}</h3>
-        <br/>
-        {% trans "system error log is recorded, error will be fixed as soon as possible" %}<br/>
-		{% trans "please report the error to the site administrators if you wish" %}
-        <ul>
-            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %}</li>
-            <li><a href="{% url questions %}">{% trans "see latest questions" %}</a></li>
-            <li><a href="{% url tags %}">{% trans "see tags" %}</a></li>
-        </u>
-    </div>
-
-</div>
-{% endblock %}
-<!-- end template 500.html -->
diff --git a/forum/templates/about.html b/forum/templates/about.html
deleted file mode 100644
index 66dcc3fd..00000000
--- a/forum/templates/about.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template about.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "About" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-{% trans "About" %}
-</div>
-
-<div class="content">
-    <p class="strong">Please customize file templates/about.html</p>
-
-    <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong>
-    and <strong>vote</strong> for the questions of others and their answers. Both questions and answers
-    <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with
-    the relevant keywords to simplify future access and organize the accumulated material.
-    </p>
-
-    <p>This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
-    Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong>
-    points. These points are added to the users account when others vote for his/her questions or answers.
-    These points (very) roughly reflect the level of trust of the community.
-    </p>
-    <p>No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url user_signin %}">join us!</a></strong>
-    </p>
-    <p>
-            If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
-    </p>
-</div>
-{% endblock %}
-<!-- end template about.html -->
diff --git a/forum/templates/answer_edit.html b/forum/templates/answer_edit.html
deleted file mode 100644
index 2d736f30..00000000
--- a/forum/templates/answer_edit.html
+++ /dev/null
@@ -1,85 +0,0 @@
-{% extends "base.html" %}
-<!-- template answer_edit.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
-        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
-        <script type="text/javascript">
-        
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('#editor').TextAreaResizer();
-            
-            //highlight code synctax when editor has new text
-            $("#editor").typeWatch({highlight: false, wait: 3000,
-                             captureLength: 5, callback: lanai.highlightSyntax});
-                             
-            //toggle preview of editor
-            var display = true;
-            var txt = "{% trans "hide preview" %}";
-            $('#pre-collapse').text(txt);
-            $('#pre-collapse').bind('click', function(){
-                txt = display ? "{% trans "show preview" %}" : "{% trans "hide preview" %}";
-                display = !display;
-                $('#previewer').toggle();
-                $('#pre-collapse').text(txt);
-            });
-
-            setupFormValidation("#fmedit", CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
-            
-            $('#id_revision').unbind().change(function(){
-                $("#select_revision").click();
-            });
-            
-            lanai.highlightSyntax();
-            
-        });
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Edit answer" %} [<a href="{{ answer.question.get_absolute_url }}#{{ answer.id }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="ask-body">
-    <div id="askform">
-        <form id="fmedit" action="{% url edit_answer answer.id %}" method="post" >
-            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
-            {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
-            <div style="vertical-align:middle">
-            {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" value="{% trans "select revision" %}">
-            </div>
-            <div class="form-item">
-                <div id="wmd-button-bar" class="wmd-panel"></div>
-                {{ form.text }}
-                <span class="form-error"></span>
-                <div class="preview-toggle"><span id="pre-collapse" 
-					title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span></div>
-                <div id="previewer" class="wmd-preview"></div>
-            </div>
-            
-            <strong>{{ form.summary.label_tag }}</strong> <br/>
-            {{ form.summary }}  {{ form.summary.errors }}
-            <div class="title-desc">
-                {{ form.summary.help_text }}
-            </div>
-            <input type="submit" value="{% trans "Save edit" %}" class="submit" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-{% include "answer_edit_tips.html" %}
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end template answer_edit.html -->
diff --git a/forum/templates/answer_edit_tips.html b/forum/templates/answer_edit_tips.html
deleted file mode 100644
index c390da06..00000000
--- a/forum/templates/answer_edit_tips.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- template answer_edit_tips.html -->
-{% load i18n %}
-<div class="boxC">
-    <p class="subtitle darkred">{% trans "answer tips" %}</p>
-    <div>
-        <ul class="list-item">
-            <li> <b>{% trans "please make your answer relevant to this community" %}</b>
-            </li>
-            <li>
-                {% trans  "try to give an answer, rather than engage into a discussion" %}
-            </li>
-            <li>
-                {% trans "please try to provide details" %}
-            </li>
-            <li>
-				{% trans "be clear and concise" %}
-            </li>
-        </ul>
-        <p class='info-box-follow-up-links'>
-            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">faq »</a>
-        </p>
-    </div>
-</div>
-
-<div class="boxC">
-    <p class="subtitle">{% trans "Markdown tips" %}</p>
-    <ul class="list-item">
-        <li>
-            {% trans "*italic* or __italic__" %}
-        </li>
-        <li>
-			{% trans "**bold** or __bold__" %}
-        </li>
-        <li>
-            <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
-
-        </li>
-        <li>
-            <b>{% trans "image" %}</b>:![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
-        </li>
-        <li>
-			{% trans "numbered list:" %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-			{% trans "basic HTML tags are also supported" %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
-    </p>
-</div>
-<!-- end template answer_edit_tips.html -->
diff --git a/forum/templates/ask.html b/forum/templates/ask.html
deleted file mode 100644
index 083b01d9..00000000
--- a/forum/templates/ask.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "base.html" %}
-<!-- template ask.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
-        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
-        <script type="text/javascript">
-        $().ready(function(){
-            //set current module button style
-            $("#nav_ask").attr('className',"on");
-            $('#editor').TextAreaResizer();
-
-            //highlight code synctax when editor has new text
-            $("#editor").typeWatch({highlight: false, wait: 3000,
-                             captureLength: 5, callback: lanai.highlightSyntax});
-
-            //toggle preview of editor
-			//todo remove copy-paste
-            var display = true;
-            var txt = "[{% trans "hide preview" %}]";
-            $('#pre-collapse').text(txt);
-            $('#pre-collapse').bind('click', function(){
-                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
-                display = !display;
-                $('#previewer').toggle();
-                $('#pre-collapse').text(txt);
-            });
-
-            //Tags autocomplete action
-            var tags = {{ tags|safe }};
-        	$("#id_tags").autocomplete(tags, {
-                minChars: 1,
-        		matchContains: true,
-                max: 20,
-                multiple: true,
-                multipleSeparator: " ",
-        		formatItem: function(row, i, max) {
-        			return row.n + " ("+ row.c +")";
-        		},
-                formatResult: function(row, i, max){
-                    return row.n;
-                }
-
-            });
-
-            setupFormValidation("#fmask", CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
-            lanai.highlightSyntax();
-
-        });
-        </script>
-{% endblock %}
-
-{% block content %}
-<div id="main-bar" class="headNormal">
-	{% trans "Ask a question" %}
-</div>
-<div id="main-body" class="ask-body">
-    <div id="askform">
-        <form id="fmask" action="" method="post" >
-			{% if not request.user.is_authenticated %}
-            <div class="message">
-			    <p>{% trans "login to post question info" %}</p>
-            </div>
-            {% else %}
-                {% ifequal settings.EMAIL_VALIDATION 'on' %}
-                    {% if not request.user.email_isvalid %}
-                        <div class="message">
-                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post, 
-                            see {{email_validation_faq_url}}
-                            {% endblocktrans %}
-                        </div>
-                    {% endif %}
-                {% endifequal %}
-			{% endif %}
-            <div class="form-item">
-                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/>
-                {{ form.title }} {{ form.title.errors }}
-                <div class="title-desc">
-                    {{ form.title.help_text }}
-                </div>
-            </div>
-
-            <div class="form-item">
-                <div id="wmd-button-bar" class="wmd-panel"></div>
-                {{ form.text }}
-
-                <div class="preview-toggle">
-                    <table width="100%">
-                        <tr>
-                            <td>
-                                <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
-                            </td>
-                            {% if settings.WIKI_ON %}
-                            <td style="text-align:right;">
-                                {{ form.wiki }} <span style="font-weight:normal;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
-                            </td>
-                            {% endif %}
-                        </tr>
-
-                    </table>
-                </div>
-                <div id="previewer" class="wmd-preview"></div>
-                <span class="form-error"></span>
-            </div>
-            <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> {% trans "(required)" %} <span class="form-error"></span><br/>
-                {{ form.tags }}  {{ form.tags.errors }}
-            </div>
-			<p class="title-desc">
-				{{ form.tags.help_text }}
-			</p>
-            {% if not request.user.is_authenticated %}
-            <input type="submit" value="{% trans "Login/signup to post your question" %}" class="submit" />
-			{% else %}
-            <input type="submit" value="{% trans "Ask your question" %}" class="submit" />
-            {% endif %}
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-{% include "question_edit_tips.html" %}
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end template ask.html -->
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
diff --git a/forum/templates/badge.html b/forum/templates/badge.html
deleted file mode 100644
index af6aa2a2..00000000
--- a/forum/templates/badge.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template badge.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{{ badge.name }} - {% trans "Badge" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_badges").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-	{% trans "Badge" %}
-</div>
-<div id="main-body" style="width:100%;margin-bottom:20px">
-    <p>
-        <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a> {{ badge.description }}
-    </p>
-    <div>
-        {% if badge.awarded_count %}
-        <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span>
-        <strong>{% trans "The users have been awarded with badges:" %}</strong></p>
-        {% endif %}
-    </div>
-    <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;">
-        {% for award in awards %}
-        <p style="width:180px;float:left"><a href="{% url users %}{{ award.id }}/{{ award.name }}">{{ award.name }}</a> {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}</p>
-        {% endfor %}
-    </div>
-
-</div>
-{% endblock %}
-<!-- end template badge.html -->
diff --git a/forum/templates/badges.html b/forum/templates/badges.html
deleted file mode 100644
index 8de93df5..00000000
--- a/forum/templates/badges.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% extends "base.html" %}
-<!-- template badges.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Badges summary" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_badges").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div class="headlineA">
-        <span class="headMedals">{% trans "Badges" %}</span>
-</div>
-<div class="badges" id="main-body" style="width:100%">
-    <p>
-	{% trans "Community gives you awards for your questions, answers and votes." %}<br/>
-	{% blocktrans %}Below is the list of available badges and number 
-    of times each type of badge has been awarded. Give us feedback at {{feedback_faq_url}}.
-    {% endblocktrans %}
-    </p>
-    <div id="medalList">
-        {% for badge in badges %}
-        <div style="clear:both;line-height:30px">
-            <div style="float:left;min-width:30px;text-align:right;height:30px">
-            {% for a in mybadges %}
-                {% ifequal a.badge_id badge.id %}
-                 <span style="font-size:175%; padding-right:5px; color:#5B9058;">&#10004;</span>
-                {% endifequal %}
-            {% endfor %}
-            </div>
-            <div style="float:left;width:230px;">
-                <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">&#9679;</span>&nbsp;{{ badge.name }}</a><strong> &#215; {{ badge.awarded_count|intcomma }}</strong>
-            </div>
-            <p style="float:left;margin-top:8px;">
-                {{ badge.description }}
-            </p>
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endblock %}
-{% block sidebar %}
-
-<div class="boxC">
-    <h3>{% trans "Community badges" %}</h3>
-    <div class="body">
-    <p>
-        <a style="cursor:default;" title="gold badge: the highest honor and is very rare" class="medal"><span class="badge1">&#9679;</span>&nbsp;{% trans "gold" %}</a>
-    </p>
-    <p>
-	{% trans "gold badge description" %}
-    </p>
-    <p>
-        <a style="cursor:default;" 
-			title="silver badge: occasionally awarded for the very high quality contributions" 
-			class="medal"><span class="badge2">&#9679;</span>&nbsp;{% trans "silver" %}</a>
-    </p>
-    <p>
-	{% trans "silver badge description" %}
-    </p>
-    <p>
-        <a style="cursor:default;" title="{% trans "bronze badge: often given as a special honor" %}" class="medal">
-		<span class="badge3">&#9679;</span>&nbsp;{% trans "bronze" %}</a>
-    </p>
-    <p>
-	{% trans "bronze badge description" %}
-    </p>
-    </div>
-</div>
-{% endblock %}
-<!-- end template badges.html -->
diff --git a/forum/templates/base.html b/forum/templates/base.html
deleted file mode 100755
index 9fabe7a1..00000000
--- a/forum/templates/base.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- template base.html -->
-{% load extra_filters %}
-{% load extra_tags %}
-{% load i18n %}
-<html xmlns="http://www.w3.org/1999/xhtml"{% if fb_api_key %} xmlns:fb="http://www.facebook.com/2008/fbml"{% endif %}>
-    <head>
-        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
-        {% spaceless %}
-        {% block meta %}{% endblock %}
-        {% endspaceless %}
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        {% if settings.GOOGLE_SITEMAP_CODE %}
-        <meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
-        {% endif %}
-        <link rel="shortcut icon" href="{% media  "/media/images/favicon.ico" %}" />
-        <link href="{% media  "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
-        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
-		<script type="text/javascript">
-            var i18nLang = '{{settings.LANGUAGE_CODE}}';
-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
-		</script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.i18n.js" %}'></script>
-		<script type='text/javascript' src='{% media  "/media/js/jquery.i18n.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.utils.js" %}'></script>
-        <!--<script type="text/javascript">
-        var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
-        document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
-        </script>
-        <script type="text/javascript">
-        UserVoice.Tab.show({ 
-            key: 'cnprog',
-            host: 'cnprog.uservoice.com', 
-            forum: 'general', 
-            alignment: 'left', /* 'left', 'right' */
-            background_color:'#777', 
-            text_color: 'white', /* 'white', 'black' */
-            hover_color: '#06C',
-            lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
-        })
-        </script>-->
-		<!-- todo move this to settings -->
-        {% if user_messages %}
-        <style type="text/css">
-            body { margin-top:2.4em; }
-        </style>
-        <script type="text/javascript">
-            $(document).ready(function() {
-                $('#validate_email_alert').click(function(){notify.close(true)})
-                notify.show();
-            });
-        </script>
-        {% endif %}
-      
-        {% block forejs %}
-        {% endblock %}
-    </head>
-    <body>
-        <div class="notify" style="display:none">
-            {% autoescape off %}
-                {% if user_messages %}
-                    {% for message in user_messages %}
-                          <p class="darkred">{{ message }}</p>
-                    {% endfor %}
-                {% endif %}
-            {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
-        </div>
-        {% include "header.html" %}
-        <div id="wrapper">
-            <div id="room">
-                <div id="CALeft">
-                    {% block content%}
-                    {% endblock%}
-
-                </div>
-                <div id="CARight">
-                    {% block sidebar%}
-                    {% endblock%}
-
-                </div>
-                <div id="tail" style="clear:both;">
-                    {% block tail %}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="spacer3"></div>
-        </div>
-        {% include "footer.html" %}
-        {% block endjs %}
-        {% endblock %}
-    </body>
-</html>
-<!-- end template base.html -->
diff --git a/forum/templates/base_content.html b/forum/templates/base_content.html
deleted file mode 100644
index 7f1ddf22..00000000
--- a/forum/templates/base_content.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- base_content.html -->
-{% load i18n %}
-{% load extra_tags %}
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE }}</title>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        {% if settings.GOOGLE_SITEMAP_CODE %}
-        <meta name="google-site-verification" content="{{ settings.GOOGLE_SITEMAP_CODE }}" />
-        {% endif %}
-        <link rel="shortcut icon" href="{% media  "/media/images/favicon.ico" %}" />
-        <link href="{% media  "/media/style/style.css" %}" rel="stylesheet" type="text/css" />
-		 {% spaceless %}
-        {% block forestyle %}{% endblock %}
-        {% endspaceless %}
-        <script src="http://www.google.com/jsapi" type="text/javascript"></script>
-        <script type="text/javascript">google.load("jquery", "1.2.6");</script>
-		<script type="text/javascript">
-            var i18nLang = '{{ settings.LANGUAGE_CODE }}';
-            var scriptUrl = '/{{settings.FORUM_SCRIPT_ALIAS}}'
-		</script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.i18n.js" %}'></script>
-	    <script type='text/javascript' src='{% media  "/media/js/jquery.i18n.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.utils.js" %}'></script>
-
-       <!-- <script type="text/javascript">
-        var uservoiceJsHost = ("https:" == document.location.protocol) ? "https://uservoice.com" : "http://cdn.uservoice.com";
-        document.write(unescape("%3Cscript src='" + uservoiceJsHost + "/javascripts/widgets/tab.js' type='text/javascript'%3E%3C/script%3E"))
-        </script>
-        <script type="text/javascript">
-        UserVoice.Tab.show({ 
-			//EDIT!!!
-            key: 'uservoicekey',
-            host: 'where.uservoice.com', 
-            forum: 'general', 
-            alignment: 'left', /* 'left', 'right' */
-            background_color:'#777', 
-            text_color: 'white', /* 'white', 'black' */
-            hover_color: '#06C',
-            lang: 'en' /* 'en', 'de', 'nl', 'es', 'fr' */
-        })
-        </script>-->
-		<!-- todo move this to settings-->
-
-        {% if user_messages %}
-        <style type="text/css">
-            body { margin-top:2.4em; }
-        </style>
-        <script type="text/javascript">
-            $(document).ready(function() {
-                var element = $('#validate_email_alert')
-                element.click(function(){notify.close(true);setTimeout(function(){},1000)})
-                notify.show();
-            });
-        </script>
-        {% endif %}
-      
-        {% block forejs %}
-        {% endblock %}
-    </head>
-    <body>
-        <div class="notify" style="display:none">
-            {% autoescape off %}
-                {% if user_messages %}
-                    {% for message in user_messages %}
-                          <p class="darkred">{{ message }}</p>
-                    {% endfor %}
-                {% endif %}
-            {% endautoescape %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
-        </div>
-        {% include "header.html" %}
-        <div id="wrapper">
-            <div id="room">
-                <div id="CAFull">
-                    {% block content%}
-                    {% endblock%}
-
-                </div>
-                <div id="tail" style="clear:both;">
-                    {% block tail %}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="spacer3"></div>
-        </div>
-        {% include "footer.html" %}
-        {% block endjs %}
-        {% endblock %}
-    </body>
-</html>
-<!-- end template base_content.html -->
diff --git a/forum/templates/book.html b/forum/templates/book.html
deleted file mode 100644
index 683f13cf..00000000
--- a/forum/templates/book.html
+++ /dev/null
@@ -1,152 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template book.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% block title %}{% spaceless %}{{ book.title }}-{% trans "reading channel" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">        
-         $().ready(function(){
-            $("#nav_books").attr('className',"on");
-            //$("#nav_ask").hide();
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-    <div class="headNormal"><a href="{{ book.get_absolute_url }}">《{{ book.title }}》</a></div>
-    <div class="bookInfo">
-        <div class="bookCover">
-            <img src="{{ book.cover_img }}" >
-        </div>
-        <div class="bookSummary">
-            <table>
-    	        <tr>
-    	        	<td>{% trans "[author]" %}</td>
-    	        	<td><b><a href="{% url user book.user.id %}" rel="nofollow" >{{ book.author }}</a></b></td>
-    	        </tr>
-    	        <tr>
-    	        	<td>{% trans "[publisher]" %}</td>
-    	        	<td>{{ book.publication }}</td>
-    	        </tr>
-                <tr>
-    	        	<td>{% trans "[publication date]" %}</td>
-    	        	<td>{{ book.published_at|date:"Y-m" }}</td>
-    	        </tr>
-                <tr>
-    	        	<td>{% trans "[price]" %}</td>
-    	        	<td>{{ book.price }} {% trans "currency unit" %}</td>
-    	        </tr>
-                <tr>
-    	        	<td>{% trans "[pages]" %}</td>
-    	        	<td>{{ book.pages }} {% trans "pages abbreviation" %}</td>
-    	        </tr>
-                <tr>
-    	        	<td>{% trans "[tags]" %}</td>
-    	        	<td>{{ book.tagnames }}</td>
-    	        </tr>
-                <tr>
-    	        	<td>&nbsp;</td>
-    	        	<td> </td>
-    	        </tr>
-                {% if author_info.blog_url %}
-                <tr>
-                    <td></td>
-                    <td><a href="{{ author_info.blog_url }}" rel="nofollow" >{% trans "author blog" %} »</a></td>
-    	        </tr>
-                
-                {% endif %}
-                <tr>
-                    <td> </td>
-                    <td><a href="#" rel="nofollow">{% trans "book directory" %} »</a></td>
-    	        </tr>
-                <tr>
-                    <td> </td>
-                    <td><a href="#" rel="nofollow">{% trans "buy online" %} »</a></td>
-    	        </tr>
-            </table>
-        </div>
-        <div class="blogRss">
-    
-        </div>
-    </div>
-    
-    <div class="bookQuestions">
-        
-        <div class="tabBar">
-            <div class="tabsB">
-                <a id="qa" class="on" title="{% trans "book technical Q&A %}" href="#">{% trans "reader questions" %}</a>
-            </div>
-        </div>
-        <div class="bookAsk"><a href="{% url ask_book book.short_name %}">{% trans "ask the author" %}</div>
-        <div class="user-stats-table">
-            {% for question in questions.object_list %}
-                {% if question.favourite_count %}
-                    {% if question.favorited_myself %}
-                        <div class="favorites-count">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media  "/media/images/vote-favorite-on.png" %}">
-                            <div><b>{{question.favourite_count|intcomma}}</b></div>
-                        </div>
-                    {% else %}
-                        <div class="favorites-count-off">
-                            <img title="{% trans "this question was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" src="{% media  "/media/images/vote-favorite-off.png" %}">
-                            <div><b>{{question.favourite_count|intcomma}}</b></div>
-                        </div>
-                    {% endif %}
-                {% else %}
-                    <div class="favorites-empty"> </div>
-                {% endif %}
-            <div id="question-summary-{{question.id}}" class="question-summary narrow">
-                <a style="text-decoration: none;" href="{% url questions %}{{question.id}}/{{question.get_question_title}}">
-                    <div class="stats">
-                        <div class="votes">
-                            <div class="vote-count-post">{{question.score|intcomma}}</div> 
-                            {% trans "votes" %}
-                          
-                        </div>
-                        <div title="{% if question.answer_accepted %}{% trans "the answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
-                            <div class="answer-count-post">{{question.answer_count|intcomma}}</div>
-							{% trans "answer" %}
-
-                        </div>
-                        <div class="views">
-                             <div class="views-count-post">{{question.view_count|cnprog_intword|safe}}</div>
-                             {% trans "views" %}
-                        </div>
-                    </div>
-                </a>
-                <div class="bookQuestionItem">
-                    <h3>
-                        <a title="{{question.summary|collapse}}" href="{% url questions %}{{question.id}}/{{question.title}}">{{question.title}}</a>
-                    </h3>
-                    <div class="tags">
-                        {% for tag in question.tagname_list %}
-                        <a href="{% url forum.views.tag tag|urlencode %}" title="{% "see questions tagged with" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-                        {% endfor %}
-                    </div>
-                    <div class="started">
-                        <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-                        <span class="score">{% get_score_badge question.last_activity_by %} </span>
-                        <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-                    </div>
-                </div>
-            </div>
-            <br clear="both"/>
-            {% endfor %}
-        </div>
-    </div>
-{% endblock %}
-{% block tail %}
-                        <div class="pager">
-                            {% cnprog_paginator context %}
-                            
-                        </div>
-                        <div class="bookFeed">
-                            <div id="feeds">
-                                <a href="{% media  "/feeds/rss" %} " title="{% trans "subscribe to book RSS feed" %}">{% trans "subscribe to the questions feed" %}</a>
-                            </div>
-                        </div>
-
-{% endblock %}
-<!-- end template book.html -->
diff --git a/forum/templates/close.html b/forum/templates/close.html
deleted file mode 100644
index d9e73507..00000000
--- a/forum/templates/close.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template close.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Close question" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $('#btBack').bind('click', function(){ history.back(); });
-        });
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-	{% trans "Close question" %}
-</div>
-<div id="main-body" style="width:100%;margin-bottom:10px">
-    <p>{% trans "Close the question" %}: <a href="{{ question.get_absolute_url }}">
-    <strong>{{ question.get_question_title }}</strong></a>
-    </p>   
-    
-    <form id="fmclose" action="{% url close question.id %}" method="post" >
-        <p>
-            <strong>{% trans "Reasons" %}:</strong> {{ form.reason }}
-        </p>
-        <div id="" style="padding-top:20px">
-            <input type="submit" value="{% trans "OK to close" %}" class="submit" />
-            <input id="btBack" type="button" class="submit" value="{% trans "Cancel" %}"  />
-            
-        </div>
-        
-    </form>
-</div>
-{% endblock %}
-<!-- end template close.html -->
diff --git a/forum/templates/edit_user_email_feeds_form.html b/forum/templates/edit_user_email_feeds_form.html
deleted file mode 100644
index 65902e7e..00000000
--- a/forum/templates/edit_user_email_feeds_form.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load i18n %}
-<table class='form-as-table'>
-{{email_feeds_form.as_table}}
-</table>
diff --git a/forum/templates/faq.html b/forum/templates/faq.html
deleted file mode 100644
index 236f4f76..00000000
--- a/forum/templates/faq.html
+++ /dev/null
@@ -1,144 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template faq.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}FAQ{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-    {% trans "Frequently Asked Questions " %}(FAQ)
-</div>
-<div id="main-body" class="about" style="width:100%">
-
-        <div class="first">
-            <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
-            <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}
-            {% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}
-            </p>
-            
-                <h3 class="subtitle">{% trans "What questions should I avoid asking?" %}</h3>
-            <p>{% trans "Please avoid asking questions that are not relevant to this community, too subjective and argumentative." %}
-            </p>
-        </div>
-    
-        <div>
-            <h3 class="subtitle">{% trans "What should I avoid in my answers?" %}</h3>
-            <p>{{ settings.APP_TITLE }} {% trans "is a Q&A site, not a discussion group. Therefore - please avoid having discussions in your answers, comment facility allows some space for brief discussions." %}</p>
-        </div>
-    
-        <div>
-            <h3 class="subtitle">{% trans "Who moderates this community?" %}</h3>
-            <p>{% trans "The short answer is: <strong>you</strong>." %}
-            {% trans "This website is moderated by the users." %}
-            {% trans "The reputation system allows users earn the authorization to perform a variety of moderation tasks." %} 
-            </p>
-        </div>
-
-        <div>
-            <h3 class="subtitle">{% trans "How does reputation system work?" %}</h3>
-            <p>{% trans "Rep system summary" %}</p>
-            <p>{% blocktrans %}For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate <strong>10</strong> points, each vote against will subtract <strong>2</strong> points. There is a limit of <strong>200</strong> points that can be accumulated per question or answer. The table below explains reputation point requirements for each type of moderation task.{% endblocktrans %}
-            </p>
-
-            <table style="font-family:arial;" cellspacing="3" cellpadding="3">
-                <tr>
-                    <th width="40px" style="text-align:right"></th>
-                    <th width="300px"></th>
-                </tr>
-                <!--
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                    <td>{% trans "upvote" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>15</strong></td>
-                    <td>{% trans "use tags" %}</td>
-                </tr>
-                -->
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
-                    <td>{% trans "add comments" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
-                    <td>{% trans "downvote" %}</td>
-                </tr><tr>
-                    <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
-                    <td>{% trans "open and close own questions" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
-                    <td>{% trans "retag questions" %}</td>
-                </tr>
-                {% if settings.WIKI_ON %}
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
-                    <td>{% trans "edit community wiki questions" %}</td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
-                    <td>{% trans "edit any answer" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
-                    <td>{% trans "open any closed question" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
-                    <td>{% trans "delete any comment" %}</td>
-                </tr>
-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
-                    <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
-                </tr>
-
-            </table>
-        </div>
-        {% ifequal settings.EMAIL_VALIDATION 'on' %}
-        <div>
-            <a id='validate'></a><h3 class="subtitle">{% trans "how to validate email title" %}</h3>
-            <!--special case here message must contain paragraphs-->
-            {% blocktrans %}how to validate email info with {{send_email_key_url}} {{gravatar_faq_url}}{% endblocktrans %}
-        </div>
-        {% endifequal %}
-        <div>
-            <a id='gravatar'></a><h3 class="subtitle">{% trans "what is gravatar" %}</h3>
-            <p>{% trans "gravatar faq info" %}</p>
-        </div>
-        <div>
-            <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
-            <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-            <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong> 
-            </p>
-        </div>
-    
-        <div>
-            <h3 class="subtitle">{% trans "Why other people can edit my questions/answers?" %}</h3>
-            <p> {% trans "Goal of this site is..." %} {% trans "So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content." %}
-            {% trans "If this approach is not for you, we respect your choice." %}
-            </p>
-        </div>
-        <div>
-            <h3 class="subtitle">{% trans "Still have questions?" %}</h3>
-            <p>{% blocktrans %}Please ask your question at {{ask_question_url}}, help make our community better!{% endblocktrans %} 
-            <!--
-            <a href="{% url tags %}faq" class="big">{{ settings.APP_TITLE }} {% trans "questions" %}</a>{% trans "." %}
-            -->
-            </p>
-        </div>
-</div>
-<script type="text/javascript">
-    //highlihts section if url has matching #anchor_name
-    $(document).ready(function (){
-        var hash = window.location.hash;
-        if (hash.length > 1){
-            $(hash).parent().addClass('highlight');
-            window.location.hash = hash;
-        }
-    })
-</script>
-{% endblock %}
-<!-- end template faq.html -->
diff --git a/forum/templates/fbconnect/xd_receiver.html b/forum/templates/fbconnect/xd_receiver.html
deleted file mode 100755
index a03c61bc..00000000
--- a/forum/templates/fbconnect/xd_receiver.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> 

-<html xmlns="http://www.w3.org/1999/xhtml" > 

-{% load i18n %}

-    <head>

-        <title>{% blocktrans %}Connect to {{APP_SHORT_NAME}} with Facebook!{% endblocktrans %}

-    </head>

-    <body> 

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

-    </body> 

-</html> 

diff --git a/forum/templates/feedback.html b/forum/templates/feedback.html
deleted file mode 100644
index 38bb48ff..00000000
--- a/forum/templates/feedback.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template about.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Feedback" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-{% trans "Give us your feedback!" %}
-</div>
-<div class="content">
-    <form method="post" action="{% url feedback %}" accept-charset="utf-8">
-        {% if user.is_authenticated %}
-            <p class="message">
-            {% blocktrans with user.username as user_name %}
-            <span class='big strong'>Dear {{user_name}}</span>, we look forward to hearing your feedback. 
-            Please type and send us your message below.
-            {% endblocktrans %}
-            <p>
-        {% else %}
-            <p class="message">
-            {% blocktrans %}
-            <span class='big strong'>Dear visitor</span>, we look forward to hearing your feedback.
-            Please type and send us your message below.
-            {% endblocktrans %}
-            </p>
-            <div class="form-row"><label>{{form.name.label}}</label><br/>{{form.name}}</div>
-            <div class="form-row">
-                <label>{{form.email.label}} 
-                    {% if form.errors.email %}
-                        <span class='red'>(please enter a valid email)</span>
-                    {% endif %}
-                </label><br/>{{form.email}}
-            </div>
-        {% endif %}
-        <div class="form-row">
-            <label>{{form.message.label}}
-            {% if form.errors.message %}
-            <span class="red">{% trans "(this field is required)" %}</span>
-            </label>
-            {% endif %}
-            <br/>
-            {{form.message}}
-        </div>
-        {{form.next}}
-        <div class="submit-row">
-            <input type="submit" class="submit" value="{% trans "Send Feedback" %}"/>
-            <input type="submit" class="submit" name="cancel" value="{% trans "Cancel" %}"/>
-        </div>
-    </form>
-</div>
-{% endblock %}
-<!-- end template about.html -->
diff --git a/forum/templates/feedback_email.txt b/forum/templates/feedback_email.txt
deleted file mode 100644
index df768180..00000000
--- a/forum/templates/feedback_email.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{% load i18n %}
-{% spaceless %}
-{% blocktrans with settings.APP_TITLE|safe as site_title %}
-Hello, this is a {{site_title}} forum feedback message
-{% endblocktrans %}
-{% endspaceless %}
-
-{% spaceless %}
-{% trans "Sender is" %}
-{% if user.is_authenticated %}
-    {{user.username|safe}} {% trans "email" %}:{{user.email|safe}} 
-{% else %}
-    {% if name %}{{name|safe}}{% else %}{% trans "anonymous" %}{% endif %}
-    {% if email %}{% trans "email" %}:{{email|safe}}{% endif %}
-{% endif %}
-    ip:{{request.META.REMOTE_ADDR}}
-{% endspaceless %}
-
-{% trans "Message body:" %} {{message|safe}}
diff --git a/forum/templates/feeds/rss_description.html b/forum/templates/feeds/rss_description.html
deleted file mode 100644
index fa781907..00000000
--- a/forum/templates/feeds/rss_description.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.html|safe }}
\ No newline at end of file
diff --git a/forum/templates/feeds/rss_title.html b/forum/templates/feeds/rss_title.html
deleted file mode 100644
index 7899fce3..00000000
--- a/forum/templates/feeds/rss_title.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ obj.title }}
\ No newline at end of file
diff --git a/forum/templates/footer.html b/forum/templates/footer.html
deleted file mode 100644
index 89d4801f..00000000
--- a/forum/templates/footer.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- template footer.html -->
-{% load extra_tags %}
-{% load i18n %}
-<!-- 页面底部开始： -->
-    <div id="ground">
-		<div>
-			<div class="footerLinks" >
-				<a href="{% url about %}">{% trans "about" %}</a><span class="link-separator"> |</span>
-				<a href="{% url faq %}">{% trans "faq" %}</a><span class="link-separator"> |</span>
-				<a href="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-                {% spaceless %}
-				<a href=
-                    {% if settings.FEEDBACK_SITE_URL %}
-                        "{{settings.FEEDBACK_SITE_URL}}"
-                        target="_blank">
-                    {% else %}
-                        "{% url feedback %}?next={{request.path}}">
-                    {% endif %}
-                    {% trans "give feedback" %}
-                </a>
-                {% endspaceless %}
-			</div>
-		  <p>
-			 <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
-				powered by cnprog platform
-			 </a>
-		  </p>
-	   </div>
-		 <div id="licenseLogo">
-		  <a href="http://creativecommons.org/licenses/by/3.0/">
-					<img src="{% media  "/media/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
-		  </a>
-		 </div>
-	</div>
-	<!-- 页面底部结束： -->
-    {% if settings.GOOGLE_ANALYTICS_KEY %}
-    <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-        <script type="text/javascript">
-        try {
-        var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
-        pageTracker._trackPageview();
-        } catch(err) {}
-    </script>
-    {% endif %}
-<!-- end template footer.html -->
diff --git a/forum/templates/header.html b/forum/templates/header.html
deleted file mode 100644
index 3afc46c5..00000000
--- a/forum/templates/header.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- template header.html -->
-{% load extra_tags %}
-{% load i18n %}
-	<div id="roof">
-		<div id="navBar">
-			<div id="top">
-                {% if request.user.is_authenticated %}
-                    <a href="{% url users %}{{ request.user.id }}/{{ request.user.username }}/">{{ request.user.username }}</a> {% get_score_badge request.user %} 
-                    <a href="{% url logout %}">{% trans "logout" %}</a>
-                {% else %}
-                    <a href="{% url user_signin %}">{% trans "login" %}</a>
-                {% endif %}
-                <a href="{% url about %}">{% trans "about" %}</a>
-                <a href="{% url faq %}">{% trans "faq" %}</a>
-			</div>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-			  <tr>
-				<td width="23%">
-					<div id="logo">
-						<a href="{% url index %}">
-							<img src="{% media  "/media/images/logo.png" %}" title="{% trans "back to home page" %}" alt="{{settings.APP_TITLE}} logo"/>
-						</a>
-					</div>
-            	</td>
-				<td width="77%" valign="bottom">
-                <div class="nav">
-                    <a id="nav_questions" href="{% url questions %}" >{% trans "questions" %}</a>
-                    <a id="nav_tags" href="{% url tags %}">{% trans "tags" %}</a>
-                    <a id="nav_users" href="{% url users %}">{% trans "users" %}</a>
-                    {% if settings.BOOKS_ON %}
-                    <a id="nav_books" href="{% url books %}">{% trans "books" %}</a>
-                    {% endif %}
-                    <a id="nav_badges" href="{% url badges %}">{% trans "badges" %}</a>
-                    <a id="nav_unanswered" href="{% url unanswered %}">{% trans "unanswered questions" %}</a>
-                    <div class="focus">
-                    <a id="nav_ask" href="{% url ask %}" class="special">{% trans "ask a question" %}</a>
-                    </div>
-                </div>
-
-              </td>
-			  </tr>
-			</table>
-		</div>
-		<div id="searchBar">
-			<table width="100%" border="0" cellpadding="0" cellspacing="0" class="content">
-            <tr>
-                <td align="center" valign="middle">
-                    <form action="{% url search %}" method="get">
-                        <div>
-                            <input type="text" class="searchInput" value="{{ keywords }}" name="q" id="keywords" />
-                            <input type="submit" name="Submit" value="{% trans "search" %}" class="searchBtn" />
-                        </div>
-                        <div class="options">
-                            <input id="type-question" type="radio" value="question" name="t" 
-                                checked="checked" /><label for="type-question">{% trans "questions" %}</label>
-                            <input id="type-tag" type="radio" value="tag" name="t" /><label for="type-tag">{% trans "tags" %}</label>
-                            <input id="type-user" type="radio" value="user" name="t" /><label for="type-user">{% trans "users" %}</label>
-                        </div>
-                    </form>
-                </td>
-            </tr>
-			</table>
-		</div>
-	</div>
-<!-- end template header.html -->
diff --git a/forum/templates/index.html b/forum/templates/index.html
deleted file mode 100644
index df2814d6..00000000
--- a/forum/templates/index.html
+++ /dev/null
@@ -1,164 +0,0 @@
-{% extends "base.html" %}
-<!-- index.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% load extra_filters %}
-{% load smart_if %}
-{% block title %}{% spaceless %}{% trans "Home" %}{% endspaceless %}{% endblock %}
-{% block meta %}<meta name="keywords" content="{{ settings.APP_KEYWORDS }}" />
-        <meta name="description" content="{{ settings.APP_DESCRIPTION }}" />{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-           var tags = {{ tags_autocomplete|safe }};
-           $().ready(function(){
-               var tab_id = "{{ tab_id }}";
-               $("#"+tab_id).attr('className',"on");
-               $("#nav_questions").attr('className',"on");
-           });
-       </script>
-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.tag_selector.js" %}'></script>
-{% endblock %}
-{% block content %}
-<div class="tabBar">
-    <div class="headQuestions">{% trans "Questions" %}</div>
-    <div class="tabsA">
-    	 <a id="latest" href="{% url questions %}?sort=latest" title="{% trans "last updated questions" %}" >{% trans "newest" %}</a>
-        <a id="hottest" href="{% url questions %}?sort=hottest" title="{% trans "hottest questions" %}" >{% trans "hottest" %}</a>
-        <a id="mostvoted" href="{% url questions %}?sort=mostvoted" title="{% trans "most voted questions" %}" >{% trans "most voted" %}</a>
-        <a id="all" href="{% url questions %}" title="{% trans "all questions" %}" >{% trans "all questions" %}</a>
-    </div>
-</div>
-<!-- 问题列表 -->
-<div id="listA">
-    {% for question in questions %}
-    <div class="qstA">
-        <h2>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
-        </h2>
-        <div class="stat">
-            <table>
-                <tr>
-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-                </tr>  
-                <tr>
-                    <td><span class="unit">{% trans "answers" %}</span></td>
-                    <td><span class="unit">{% trans "votes" %}</span></td>
-                    <td><span class="unit">{% trans "views" %}</span></td>
-                </tr> 
-            </table>
-        </div>
-        
-        <div class="summary">
-            {{ question.summary }}...                
-        </div>
-        
-        {% ifequal tab_id 'active'%}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-            <span class="score">{% get_score_badge question.last_activity_by %} </span>
-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-        </div>
-        {% endif %}
-        {% else %}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            {% if question.last_activity_at != question.added_at %}
-                {% if question.author.id != question.last_activity_by.id %}
-                    {% trans "Posted:" %}
-                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-                    <span class="score">{% get_score_badge question.author %} </span>
-                    / {% trans "Updated:" %}
-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-                {% else %}
-                    {% trans "Updated:" %}
-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>
-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-                {% endif %}
-            {% else %}
-                {% trans "Posted:" %}
-                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-                <span class="score">{% get_score_badge question.author %} </span>
-                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-            {% endif %}
-        </div>
-        {% endif %}
-        {% endifequal %}
-        
-        <div class="tags">
-        {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endblock %}
-
-{% block sidebar %}
-{% if not request.user.is_authenticated %}
-<div class="boxA">
-	<h3>{% trans "welcome to website" %}</h3>
-	<div class="body">
-      {{ settings.APP_INTRO|safe }}
-	  <div class="more"><a href="{% url about %}">{% trans "about" %} »</a></div>
-	  <div class="more"><a href="{% url faq %}">{% trans "faq" %} »</a></div>
-	</div>
-</div>
-{% else %}
-{% include "tag_selector.html" %}
-{% endif %}
-<div class="boxC">
-	<h3>{% trans "Recent tags" %}</h3>
-	<div class="body">
-         <div class="tags">
-        {% for tag in tags %}
-            <a rel="tag" 
-				title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>
-        {% endfor %}
-        </div>
-        <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div>
-    </div>
-</div>
-{% if awards %}
-<div class="boxC">
-    <h3>{% trans "Recent awards" %}</h3>
-        <div class="body">
-             <ul class="badge-list">
-             {% for award in awards %}
-                <li>
-                <a href="{% url badges %}{{award.badge_id}}/{{award.badge_name}}" title="{{ award.badge_description }}" class="medal">
-                <span class="badge{{ award.badge_type }}">&#9679;</span>&nbsp;{{ award.badge_name }}</a> {% trans "given to" %}
-                <a href="{% url users %}{{award.user_id}}/{{award.user_name}}">{{ award.user_name }}</a>
-                </li>
-            {% endfor %}
-            </ul>
-        	<div class="more"><a href="{% url badges %}">{% trans "all awards" %} »</a> </div>
-         </div>
-</div>
-{% endif %}
-<div id="feeds">
-<a href="{% media  "/feeds/rss" %}" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a>
-</div>
-{% endblock %}
-{% block tail %}
-<div style="padding:5px 0 5px 5px;">
-<span class="evenMore">{% trans "Still looking for more? See" %} <a href="{% url questions %}">{% trans "complete list of questions" %}</a> {% trans "or" %} <a href="{% url tags %}">{% trans "popular tags" %}</a>{% trans "." %} {% trans "Please help us answer" %} <a href="{% url questions %}unanswered">{% trans "list of unanswered questions" %}</a>{% trans "." %}</span>
-</div>
-{% endblock %}
-<!-- index.html -->
diff --git a/forum/templates/logout.html b/forum/templates/logout.html
deleted file mode 100644
index 650ba044..00000000
--- a/forum/templates/logout.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template logout.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Logout" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-    <script type="text/javascript">
-    $().ready(function(){
-        $('#btLogout').bind('click', function(){ window.location.href='{% url user_signout %}?next={{ next }}'; });
-    });
-    </script>
-{% endblock %}
-{% block content %}
-<div  class="headNormal">
-    {% trans "Logout" %} 
-</div>
-<div id="main-body" style="width:100%">
-    <p>{% trans "As a registered user you can login with your OpenID, log out of the site or permanently remove your account." %}</p>
-    <input id="btLogout" type="button" class="submit" value="{% trans "Logout now" %}"><!-- style="width:150px">-->
-</div>
-{% endblock %}
-<!-- end logout.html -->
diff --git a/forum/templates/notarobot.html b/forum/templates/notarobot.html
deleted file mode 100644
index 698c5696..00000000
--- a/forum/templates/notarobot.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "base_content.html" %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Please prove that you are a Human Being" %}{% endspaceless %}{% endblock %}
-{% block content %}
-{% comment %} this form is set up to be used in wizards {% endcomment %}
-<form name="notarobot" action="." method="POST">
-    <div>
-    {{form}}
-    </div>
-    <input type="submit" value="{% trans "I am a Human Being" %}" class="submit" style="float:left"/>
-    <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
-    {{ previous_fields|safe }}
-    </form>
-</form>
-{% endblock %}
diff --git a/forum/templates/pagesize.html b/forum/templates/pagesize.html
deleted file mode 100644
index 5037f1f6..00000000
--- a/forum/templates/pagesize.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- template pagesize.html -->
-{% spaceless %}
-{% load i18n %}
-{% if is_paginated %}
-<div class="paginator">
-    <span class="text">{% trans "posts per page" %}</span>
-    {% ifequal pagesize 10 %}
-        <span class="curr">10</span>
-    {% else %}
-        <span class="page"><a href="{{base_url}}pagesize=10">10</a></span>
-    {% endifequal %}
-    
-    {% ifequal pagesize 30 %}
-        <span class="curr">30</span>
-    {% else %}
-        <span class="page"><a href="{{base_url}}pagesize=30">30</a></span>
-    {% endifequal %}
-    
-    {% ifequal pagesize 50 %}
-        <span class="curr">50</span>
-    {% else %}
-        <span class="page"><a href="{{base_url}}pagesize=50">50</a></span>
-    {% endifequal %}
-</div> 
-{% endif %}
-{% endspaceless %}
-<!-- end template pagesize.html -->
diff --git a/forum/templates/paginator.html b/forum/templates/paginator.html
deleted file mode 100644
index 2fba5425..00000000
--- a/forum/templates/paginator.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!-- paginator.html -->
-{% spaceless %}
-{% load i18n %}
-{% if is_paginated %}
-<div class="paginator">
-{% if has_previous %}<span class="prev"><a href="{{base_url}}page={{ previous }}{{ extend_url }}" title="{% trans "previous" %}">
-&laquo; {% trans "previous" %}</a></span>{% endif %}
-{% if not in_leading_range %}
-	{% for num in pages_outside_trailing_range %}
-		<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" >{{ num }}</a></span>
-	{% endfor %}
-	...
-{% endif %}
- 
-{% for num in page_numbers %}
-  {% ifequal num page %}
-    {% ifequal pages 1 %}
-    {% else %}
-    <span class="curr" title="{% trans "current page" %}">{{ num }}</span>
-    {% endifequal %}
-  {% else %}
-  	<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="{% trans "page number " %}{{ num }}{% trans "number - make blank in english" %}">{{ num }}</a></span>
-  {% endifequal %}
-{% endfor %}
- 
-{% if not in_trailing_range %}
-	...
-	{% for num in pages_outside_leading_range reversed %}
-		<span class="page"><a href="{{base_url}}page={{ num }}{{ extend_url }}" title="{% trans "page number " %}{{ num }}{% trans "number - make blank in english" %}">{{ num }}</a></span>
-	{% endfor %}
-{% endif %}
- 
-{% if has_next %}<span class="next"><a href="{{base_url}}page={{ next }}{{ extend_url }}" title="{% trans "next page" %}">{% trans "next page" %} &raquo;</a></span>{% endif %}
-</div> 
-{% endif %}
- 
-{% endspaceless %}
-<!-- end paginator.html -->
diff --git a/forum/templates/post_contributor_info.html b/forum/templates/post_contributor_info.html
deleted file mode 100644
index 9997be5f..00000000
--- a/forum/templates/post_contributor_info.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% load i18n %}
-{% load smart_if %}
-{% load extra_tags %}
-<div class='post-update-info'>
-{% ifequal contributor_type "original_author" %}
-    {% if wiki %}
-        <p>{% trans "community wiki" %}</p>
-        <p>
-            {% blocktrans count post.revisions.all|length as rev_count %}
-                one revision
-            {% plural %}
-                {{rev_count}} revisions
-            {% endblocktrans %}
-        </p>
-        <p>{{post.author.get_profile_link}}</p>
-    {% else %}
-        <p style="line-height:12px;">
-            {% ifequal post_type "question" %}
-                {% trans "asked" %}
-            {% else %}
-                {% ifequal post_type "answer" %}
-                    {% trans "answered" %}
-                {% else %}
-                    {% trans "posted" %}
-                {% endifequal %}
-            {% endifequal %}
-            {% ifequal post_type "revision" %}
-                <strong>{% diff_date post.revised_at %}</strong>
-            {% else %}
-                <strong>{% diff_date post.added_at %}</strong>
-            {% endifequal %}
-        </p>
-        {% gravatar post.author 32 %}
-        <p>{{post.author.get_profile_link}}<br/>
-        {% get_score_badge post.author %}</p>
-    {% endif %}
-{% else %}
-    {% if post.last_edited_at %}
-        <p style="line-height:12px;">
-        {% ifequal post_type 'question' %}
-        <a href="{% url question_revisions post.id %}">
-        {% else %}
-        <a href="{% url answer_revisions post.id %}">
-        {% endifequal %}
-        {% trans "updated" %} <strong>{% diff_date post.last_edited_at %}</strong>
-        </a>
-        </p>
-        {% if post.author != post.last_edited_by or wiki %}
-            {% gravatar post.last_edited_by 32 %}
-            <p style="float:left">{{post.last_edited_by.get_profile_link}}<br/>
-            {% get_score_badge post.last_edited_by %}</p>
-        {% endif %}
-    {% endif %}
-{% endifequal %}
-</div>
diff --git a/forum/templates/privacy.html b/forum/templates/privacy.html
deleted file mode 100644
index e66086dd..00000000
--- a/forum/templates/privacy.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "base_content.html" %}
-<!-- privacy.html -->
-{% load extra_tags %}
-{% load i18n %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Privacy policy" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
-{% block content %}
-<div class="headNormal">
-	{% trans "Privacy policy" %}
-</div>
-<div id="main-body" style="width:100%">
-    <p>
-		{% trans "general message about privacy" %}
-    </p>
-    
-        <h3 class="subtitle">{% trans "Site Visitors" %}</h3>
-    <p>    
-	{% trans "what technical information is collected about visitors" %}
-    </p>
-    
-        <h3 class="subtitle">{% trans "Personal Information" %}</h3>
-    <p>   
-		{% trans "details on personal information policies" %}
-    </p>
-   
-        <h3 class="subtitle">{% trans "Other Services" %}</h3>
-     <p>   
-	 {% trans "details on sharing data with third parties" %}
-    </p>
-    
-        <h3 class="subtitle">Cookies</h3>
-    <p>
-		{% trans "cookie policy details" %}
-    </p>
-        <h3 class="subtitle">{% trans "Policy Changes" %}</h3>
-    <p>{% trans "how privacy policies can be changed" %}
-    </p>
-</div>
-{% endblock %}
-<!-- end privacy.html -->
diff --git a/forum/templates/question.html b/forum/templates/question.html
deleted file mode 100644
index 048c2d64..00000000
--- a/forum/templates/question.html
+++ /dev/null
@@ -1,510 +0,0 @@
-{% extends "base.html" %}

-<!-- question.html -->

-{% load extra_tags %}

-{% load extra_filters %}

-{% load smart_if %}

-{% load humanize %}

-{% load i18n %}

-{% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}

-{% block forejs %}

-        <meta name="description" content="{{question.summary}}" />

-        <meta name="keywords" content="{{question.tagname_meta_generator}}" />

-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />

-        {% if not question.closed %}

-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>

-        <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>

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

-        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />

-        {% endif %}

-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>

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

-

-        <script type="text/javascript">

-        // define reputation needs for comments

-        var repNeededForComments = 50;

-        $().ready(function(){

-            $("#nav_questions").attr('className',"on");

-            var answer_sort_tab = "{{ tab_id }}";

-            $("#" + answer_sort_tab).attr('className',"on");

-            

-            Vote.init({{ question.id }}, '{{ question.title|slugify }}', '{{ question.author.id }}','{{ request.user.id }}');

-            

-            {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}

-            

-            lanai.highlightSyntax();

-            $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )

-        });

-        

-        function initEditor(){

-            $('#editor').TextAreaResizer();

-            //highlight code synctax when editor has new text

-            $("#editor").typeWatch({highlight: false, wait: 3000,

-                             captureLength: 5, callback: lanai.highlightSyntax});

-                             

-            var display = true;

-            var txt = "[{% trans "hide preview" %}]";

-            $('#pre-collapse').text(txt);

-            $('#pre-collapse').bind('click', function(){

-                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";

-                display = !display;

-                $('#previewer').toggle();

-                $('#pre-collapse').text(txt);

-            });

-            

-            setupFormValidation("#fmanswer", CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());

-        }

-         

-        </script>

-{% endblock %}

-        

-{% block content %}

-<div class="headNormal">

-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>

-</div>

-<div id="main-body" class="">

-    <div id="askform">

-            <table style="width:100%;" id="question-table" {% if question.deleted %}class="deleted"{%endif%}>

-                <tr>

-                    <td style="width:30px;vertical-align:top">

-                        <div class="vote-buttons">

-                            {% if question_vote %}

-                            <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 

-                                {% if question_vote.is_upvote %}

-								    src="{% media  "/media/images/vote-arrow-up-on.png" %}" 

-                                {% else %}

-								    src="{% media  "/media/images/vote-arrow-up.png" %}" 

-                                {% endif %}

-                                alt="{% trans "i like this post (click again to cancel)" %}"

-								title="{% trans "i like this post (click again to cancel)" %}" />

-                            <div id="question-vote-number-{{ question.id }}" class="vote-number" 

-								title="{% trans "current number of votes" %}">

-                                {{ question.score }}

-                            </div>

-                            <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 

-                                {% if question_vote.is_downvote %}

-								    src="{% media  "/media/images/vote-arrow-down-on.png" %}" 

-                                {% else %}

-								    src="{% media  "/media/images/vote-arrow-down.png" %}" 

-                                {% endif %}

-                                alt="{% trans "i dont like this post (click again to cancel)" %}"

-								title="{% trans "i dont like this post (click again to cancel)" %}" />

-                           

-                            {% else %}

-                            <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 

-                                alt="{% trans "i like this post (click again to cancel)" %}"

-								src="{% media  "/media/images/vote-arrow-up.png" %}" 

-								title="{% trans "i like this post (click again to cancel)" %}" />

-                            <div id="question-vote-number-{{ question.id }}" class="vote-number" 

-								title="{% trans "current number of votes" %}">

-                                {{ question.score }}

-                            </div>

-                            <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 

-								src="{% media  "/media/images/vote-arrow-down.png" %}"

-                                alt="{% trans "i dont like this post (click again to cancel)" %}"

-                                title="{% trans "i dont like this post (click again to cancel)" %}" />

-          

-                            {% endif %}

-                            {% if favorited %}

-                            <img class="question-img-favorite" src="{% media  "/media/images/vote-favorite-on.png" %}"

-								alt="{% trans "mark this question as favorite (click again to cancel)" %}"

-								title="{% trans "mark this question as favorite (click again to cancel)" %}" />

-                            <div id="favorite-number" class="favorite-number my-favorite-number">

-                                {{ question.favourite_count }}

-                            </div>

-                            {% else %}

-                            <img class="question-img-favorite" src="{% media  "/media/images/vote-favorite-off.png" %}"

-								alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"

-								title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />

-                            <div id="favorite-number" class="favorite-number">

-                               {% ifnotequal question.favourite_count 0 %}{{ question.favourite_count }}{% endifnotequal %}

-                            </div>

-                        

-                            {% endif %}

-                            

-                        </div>

-                    </td>

-                    <td>

-                        <div id="item-right">

-                            <div class="question-body">

-                                {{ question.html|safe }}

-                            </div>

-                            <div id="question-controls" class="post-controls">

-                                <div id="question-tags" class="tags">

-                                    {% for tag in question.tagname_list %}

-                                        <a href="{% url forum.views.tag tag|urlencode %}" class="post-tag" 

-                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>

-                                    {% endfor %}

-                                </div>

-                                {% joinitems using '<span class="action-link-separator">|</span>' %}    

-                                    {% if request.user|can_edit_post:question %}

-                                    <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>

-                                    {% endif %}

-                                {% separator %}

-                                    {% if question.closed %}

-                                    {% if request.user|can_reopen_question:question %}

-                                    <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>

-                                    {% endif %}

-                                    {% else %}

-                                    {% if request.user|can_close_question:question %}

-                                    <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>

-                                    {% endif %}

-                                    {% endif %}

-                                {% separator %}

-                                    {% if request.user|can_flag_offensive %}

-                                    <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 

-                                        title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">

-                                        <a>{% trans "flag offensive" %}</a>

-                                        {% if request.user|can_view_offensive_flags and question.offensive_flag_count %}

-                                        <span class="darkred">({{ question.offensive_flag_count }})</span>

-                                        {% endif %}

-                                    </span>

-                                    {% endif %}

-                                {% separator %}

-                                    {% if request.user|can_delete_post:question %}

-                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>

-                                    {% endif %}

-                                {% endjoinitems %}

-                            </div>

-                            <div class="post-update-info-container">

-                                {% post_contributor_info question "original_author" %}

-                                {% post_contributor_info question "last_updater" %}

-                            </div>

-                            <div class="comments-container" id="comments-container-question-{{question.id}}">

-                            {% for comment in question.get_comments|slice:":5" %}

-                                <p class="comment" id="comment-{{comment.id}}">

-                                    {{comment.comment}} 

-                                    - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>

-                                    {% spaceless %}

-                                    <span class="comment-age">({% diff_date comment.added_at %})</span>

-                                    {% if request.user|can_delete_comment:comment %}

-                                        <img class="delete-icon" 

-                                            src="{% media  "/media/images/close-small.png" %}"

-                                            title="{% trans "delete this comment" %}"/>

-                                    {% endif %}

-                                    {% endspaceless %}

-                                </p>

-                            {% endfor %}

-                            </div>

-                            <div class="post-comments" style="margin-bottom:20px">

-                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments:question }}"/>

-                                {% if request.user|can_add_comments:question or question.comment_count > 5 %}

-                                    <a id="comments-link-question-{{question.id}}" class="comments-link">

-                                    {% if request.user|can_add_comments:question %}

-                                        {% trans "add comment" %}

-                                    {% endif %}

-                                    {% if question.comment_count > 5 %}

-                                        {% if request.user|can_add_comments:question %}/

-                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}

-                                            see <strong>one</strong> more 

-                                            {% plural %}

-                                            see <strong>{{counter}}</strong> more

-                                            {% endblocktrans %}

-                                        {% else %}

-                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}

-                                            see <strong>one</strong> more comment

-                                            {% plural %}

-                                            see <strong>{{counter}}</strong> more comments

-                                            {% endblocktrans %}

-                                        {% endif %}

-                                    {% endif %}</a>

-                                {% endif %}

-                            </div>

-                        </div>

-                        

-                    </td>

-                </tr>

-            </table>

-            {% if question.closed %}

-            <div class="question-status" style="margin-bottom:15px">

-            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} 

-			<a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 

-			{% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>

-            </div>

-            {% endif %}

-            {% if answers %}

-                <hr/>

-                <div class="tabBar">

-                    <a name="sort-top"></a>

-                    <div class="headQuestions">

-                    {% blocktrans count answers|length as counter %}

-                    One Answer:

-                    {% plural %}

-                    {{counter}} Answers:

-                    {% endblocktrans %}

-                    </div>

-                    <div class="tabsA">

-                         <a id="oldest" href="{% url question question.id %}?sort=oldest#sort-top" 

-                            title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>

-                        <a id="latest" href="{% url question question.id %}?sort=latest#sort-top" 

-                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>

-                        <a id="votes" href="{% url question question.id %}?sort=votes#sort-top" 

-                            title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   

-                    </div>

-                </div>

-                {% cnprog_paginator context %}

-  

-                {% for answer in answers %}

-                    <a name="{{ answer.id }}"></a>

-                    <div id="answer-container-{{ answer.id }}" class="answer {% if answer.accepted %}accepted-answer{% endif %} {% ifequal answer.author_id question.author_id %} answered-by-owner{% endifequal %} {% if answer.deleted %}deleted{% endif %}">

-                        <table style="width:100%;">

-                            <tr>

-                                <td style="width:30px;vertical-align:top">

-                                    <div class="vote-buttons">

-                                        <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" 

-                                                src="{% blockmedia %}/media/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockmedia %}" 

-                                                alt="{% trans "i like this answer (click again to cancel)" %}"

-                                                title="{% trans "i like this answer (click again to cancel)" %}"/>

-                                        <div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">

-                                            {{ answer.score }}

-                                        </div>

-                                        <img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote" 

-											src="{% blockmedia %}/media/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockmedia %}" 

-											alt="{% trans "i dont like this answer (click again to cancel)" %}"

-											title="{% trans "i dont like this answer (click again to cancel)" %}" />

-                                     

-                                        {% ifequal request.user question.author  %}

-                                        <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 

-											src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}" 

-											alt="{% trans "mark this answer as favorite (click again to undo)" %}"

-											title="{% trans "mark this answer as favorite (click again to undo)" %}" />

-                                        {% else %}

-                                            {% if answer.accepted %}

-                                            <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 

-												src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}" 

-												alt="{% trans "the author of the question has selected this answer as correct" %}"

-												title="{% trans "the author of the question has selected this answer as correct" %}" />

-                                            {% endif %}

-                                        {% endifequal %}

-                                    </div>

-                                </td>

-                                <td>

-                                    <div class="item-right">

-                                        <div class="answer-body">

-                                            {{ answer.html|safe }}

-                                        </div>

-                                        <div class="answer-controls post-controls">

-                                            {% joinitems using '<span class="action-link-separator">|</span>' %}    

-                                                <span class="linksopt">

-                                                    <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">

-                                                        {% trans "permanent link" %}

-                                                    </a>

-                                                </span>

-                                            {% separator %}

-                                                {% if request.user|can_edit_post:answer %}

-                                                <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>

-                                                {% endif %}

-                                            {% separator %}

-                                                {% if request.user|can_flag_offensive %}

-                                                <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 

-                                                    title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">

-                                                    <a>{% trans "flag offensive" %}</a>

-                                                    {% if request.user|can_view_offensive_flags and answer.offensive_flag_count %}

-                                                    <span class="darkred">({{ answer.offensive_flag_count }})</span>

-                                                    {% endif %}

-                                                </span>

-                                                {% endif %}

-                                            {% separator %}

-                                                {% if request.user|can_delete_post:answer %}

-                                                    {% spaceless %}

-                                                    <span class="action-link">

-                                                        <a id="answer-delete-link-{{answer.id}}">

-                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>

-                                                    </span>

-                                                    {% endspaceless %}

-                                                {% endif %}

-                                            {% endjoinitems %}

-                                        </div>

-                                        <div class="post-update-info-container">

-                                            {% post_contributor_info answer "original_author" %}

-                                            {% post_contributor_info answer "last_updater" %}

-                                        </div>

-                                        <div class="comments-container" id="comments-container-answer-{{answer.id}}">

-                                        {% for comment in answer.get_comments|slice:":5" %}

-                                            <p id="comment-{{comment.id}}" class="comment">

-                                                {{comment.comment}} 

-                                                - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>

-                                                {% spaceless %}

-                                                <span class="comment-age">({% diff_date comment.added_at %})</span>

-                                                {% if request.user|can_delete_comment:comment %}

-                                                    <img class="delete-icon" 

-                                                        src="{% media  "/media/images/close-small.png" %}"

-                                                        title="{% trans "delete this comment" %}"/>

-                                                {% endif %}

-                                                {% endspaceless %}

-                                            </p>

-                                        {% endfor %}

-                                        </div>

-                                        <div class="post-comments" style="margin-bottom:20px">

-                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments:answer}}"/>

-                                            {% if request.user|can_add_comments:answer or answer.comment_count > 5 %}

-                                                <a id="comments-link-answer-{{answer.id}}" class="comments-link">

-                                                {% if request.user|can_add_comments:answer %}

-                                                    {% trans "add comment" %}

-                                                {% endif %}

-                                                {% if answer.comment_count > 5 %}

-                                                    {% if request.user|can_add_comments:answer %}/

-                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}

-                                                        see <strong>one</strong> more 

-                                                        {% plural %}

-                                                        see <strong>{{counter}}</strong> more

-                                                        {% endblocktrans %}

-                                                    {% else %}

-                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}

-                                                        see <strong>one</strong> more comment

-                                                        {% plural %}

-                                                        see <strong>{{counter}}</strong> more comments

-                                                        {% endblocktrans %}

-                                                    {% endif %}

-                                                {% endif %}</a>

-                                            {% endif %}

-                                        </div>

-                                    </div>

-                                    

-                                </td>

-                            </tr>

-                        </table>

-                    </div>

-                {% endfor %}

-                <div class="paginator-container-left">

-                    {% cnprog_paginator context %}

-                </div>

-            {% endif %}

-        <form id="fmanswer" action="{% url answer question.id %}" method="post">

-            {% if request.user.is_authenticated %}

-                <p style="padding-left:3px">

-                {{ answer.email_notify }} 

-                <label for="question-subscribe-updates">

-                {% ifequal request.user.get_q_sel_email_feed_frequency 'n' %}

-                    {% trans "Notify me once a day when there are any new answers" %}

-                {% else %}

-                    {% ifequal request.user.get_q_sel_email_feed_frequency 'd' %}

-                        {% trans "Notify me once a day when there are any new answers" %}

-                    {% else %}

-                        {% ifequal request.user.get_q_sel_email_feed_frequency 'w' %}

-                            {% trans "Notify me weekly when there are any new answers" %}

-                        {% endifequal %}

-                    {% endifequal %}

-                {% endifequal %}

-                </label>

-                {% blocktrans with request.user.get_profile_url as profile_url %}

-                You can always adjust frequency of email updates from your {{profile_url}}

-                {% endblocktrans %}

-                </p>

-            {% else %}

-                <p style="padding-left:3px">

-                    <input class="nomargin" type="checkbox" disabled="disabled" />

-                    <label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>

-                </p>

-            {% endif %}

-            <div style="clear:both">

-            </div>

-            

-            {% if not question.closed %}

-                <div style="padding:10px 0 0 0;">

-                    {% spaceless %}

-                    <div class="headNormal">

-                        {% if answers %}

-                            {% trans "Your answer" %}

-                        {% else %}

-                            {% trans "Be the first one to answer this question!" %}

-                        {% endif %}

-                    </div>

-                    {% endspaceless %}

-                </div>

-                {% if not request.user.is_authenticated %}

-                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>

-                {% else %}

-                    <p class="message">

-                        {% ifequal request.user question.author  %}

-                            {% trans "answer your own question only to give an answer" %}

-                        {% else %}

-                            {% trans "please only give an answer, no discussions" %}

-                        {% endifequal %}

-                    </p>

-                {% endif %}

-

-                <div id="description" class="" >

-                    <div id="wmd-button-bar" class="wmd-panel"></div>

-                    {{ answer.text }}

-                    <div class="preview-toggle">

-                        <table width="100%">

-                            <tr>

-                                <td>

-                                    <span id="pre-collapse" 

-                                        title="{% trans "Toggle the real time Markdown editor preview" %}">

-                                            {% trans "toggle preview" %}

-                                    </span>

-                                </td>

-                                {% if settings.WIKI_ON %}

-                                <td style="text-align:right;">

-                                    {{ answer.wiki }} 

-                                    <span style="font-weight:normal;cursor:help" 

-                                        title="{{answer.wiki.help_text}}">

-                                            {{ answer.wiki.label_tag }} 

-                                    </span>

-                                </td>

-                                {% endif %}

-                            </tr>

-                        

-                        </table>  

-                    </div>

-                    <div id="previewer" class="wmd-preview"></div>

-                    {{ answer.text.errors }}

-                </div>

-                <p><span class="form-error"></span></p>

-                <input type="submit" 

-                    {% if user.is_anonymous %}

-                        value="{% trans "Login/Signup to Post Your Answer" %}" 

-                    {% else %}

-                        {% if user == question.author %}

-                        value="{% trans "Answer Your Own Question" %}" 

-                        {% else %}

-                        value="{% trans "Answer the question" %}" 

-                        {% endif %}

-                    {% endif %}

-                    class="submit" style="float:left"/>

-            {% endif %}

-        </form>

-    </div>

-</div>

-{% endblock %}

-

-{% block sidebar %}

-<div class="boxC">

-    <p>

-		{% trans "Question tags" %}:

-    </p>

-    <p class="tags" >

-        {% for tag in tags %}

-        	<a href="{% url forum.views.tag tag.name|urlencode %}" 

-			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 

-			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>

-        {% endfor %}

-    </p>

-    <p>

-        {% trans "question asked" %}: <strong title="{{ question.added_at }}">{% diff_date question.added_at %}</strong>

-    </p>

-    <p> 

-     	{% trans "question was seen" %}: <strong>{{ question.view_count|intcomma }} {% trans "times" %}</strong>

-    </p>

-    <p> 

-        {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>

-    </p>

-</div>

-

-<div class="boxC">

-    <h3 class="subtitle">{% trans "Related questions" %}</h3>

-    <div class="questions-related">

-        {% for question in similar_questions %}

-        <p>

-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>

-        </p>

-        {% endfor %}

-    </div>

-</div>

-

-{% endblock %}

-

-{% block endjs %}

-{% endblock %}

-<!-- end question.html -->

diff --git a/forum/templates/question_edit.html b/forum/templates/question_edit.html
deleted file mode 100644
index fe711849..00000000
--- a/forum/templates/question_edit.html
+++ /dev/null
@@ -1,131 +0,0 @@
-{% extends "base.html" %}
-<!-- question_edit.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% block title %}{% spaceless %}{% trans "Edit question" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
-        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
-        <script type="text/javascript">
-		//todo move javascript out        
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('#editor').TextAreaResizer();
-            
-            //highlight code synctax when editor has new text
-            $("#editor").typeWatch({highlight: false, wait: 3000,
-                             captureLength: 5, callback: lanai.highlightSyntax});
-                             
-            //toggle preview of editor
-            var display = true;
-            var txt = "[{% trans "hide preview" %}]";
-            $('#pre-collapse').text(txt);
-            $('#pre-collapse').bind('click', function(){
-                txt = display ? "[{% trans "show preview" %}]" : "[{% trans "hide preview" %}]";
-                display = !display;
-                $('#previewer').toggle();
-                $('#pre-collapse').text(txt);
-            });
-            
-            //Tags autocomplete action
-            var tags = {{ tags|safe }};
-        	$("#id_tags").autocomplete(tags, {
-        		matchContains: true,
-                max: 20,
-                multiple: true,
-                multipleSeparator: " ",
-                highlightItem: true,
-                scroll: true,
-                scrollHeight: 300,
-        		formatItem: function(row, i, max) {
-        			return row.n + " ("+ row.c +")";
-        		},
-                formatResult: function(row, i, max){
-                    return row.n;
-                }
-                
-            });
-            
-            setupFormValidation("#fmedit", CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
-            
-            $('#id_revision').unbind().change(function(){
-                $("#select_revision").click();
-            });
-            lanai.highlightSyntax();
-            
-        });
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Edit question" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="ask-body">
-    <div id="askform">
-        <form id="fmedit" action="{% url edit_question question.id %}" method="post" >
-            <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
-            {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
-            <div style="vertical-align:middle">
-            {{ revision_form.revision }} <input type="submit" style="display:none" id="select_revision" name="select_revision" 
-											value="{% trans "select revision"%}">
-            </div> 
-            <div class="form-item">
-                <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/> 
-                {{ form.title }} {{ form.title.errors }}  
-                <div class="title-desc">
-                    {{ form.title.help_text }}
-                </div>     
-            </div>
-            <div class="form-item">
-                <div id="wmd-button-bar" class="wmd-panel"></div>
-                {{ form.text }}
-                <span class="form-error"></span>
-                <div class="preview-toggle">
-                    <table width="100%">
-                        <tr>
-                            <td>
-                                <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
-                            </td>
-                            {% if settings.WIKI_ON %}
-                            <td style="text-align:right;">
-                                {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
-                            </td>
-                            {% endif %}
-                        </tr>
-                    
-                    </table>   
-                </div>
-                <div id="previewer" class="wmd-preview"></div>
-            </div>
-            <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br/>
-                {{ form.tags }}  {{ form.tags.errors }}
-                <div class="title-desc">
-                    {{ form.tags.help_text }}
-                </div>
-            </div>
-            <strong>{{ form.summary.label_tag }}</strong> <br/>
-            {{ form.summary }}  {{ form.summary.errors }}
-            <div class="title-desc">
-                {{ form.summary.help_text }}
-            </div>
-            <div class="error" ></div>
-            <input type="submit" value="{% trans "Save edit" %}" class="submit" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-{% include "question_edit_tips.html" %}
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end question_edit.html -->
diff --git a/forum/templates/question_edit_tips.html b/forum/templates/question_edit_tips.html
deleted file mode 100644
index 4cabea79..00000000
--- a/forum/templates/question_edit_tips.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!-- question_edit_tips.html -->
-{% load i18n %}
-<div class="boxC">
-    <p class="subtitle darkred">{% trans "question tips" %}</p>
-    <div>
-        <ul class="list-item">
-            <li> <b>{% trans "please ask a relevant question" %}</b>
-            </li>
-            <li>
-                {% trans "please try provide enough details" %}
-            </li>
-            <li>
-				{% trans "be clear and concise" %}
-            </li>
-        </ul>
-        <p class='info-box-follow-up-links'>
-            <a href="{% url faq %}" target="_blank" title="{% trans "see frequently asked questions" %}">{% trans "faq" %} »</a>
-        </p>
-    </div>
-</div>
-
-<div class="boxC">
-    <p class="subtitle">{% trans "Markdown tips" %}</p>
-    <ul class="list-item">
-        <li>
-            {% trans "*italic* or __italic__" %}
-        </li>
-        <li>
-			{% trans "**bold** or __bold__" %}
-        </li>
-        <li>
-            <b>{% trans "link" %}</b>:[{% trans "text" %}](http://url.com/ "{% trans "title" %}")
-
-        </li>
-        
-        <li>
-            <b>{% trans "image" %}</b>：![alt {% trans "text" %}](/path/img.jpg "{% trans "title" %}")
-
-        </li>
-        <li>
-			{% trans "numbered list:" %}
-            1.  Foo
-            2.  Bar
-        </li>
-        <li>
-			{% trans "basic HTML tags are also supported" %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-        <a href="http://en.wikipedia.org/wiki/Markdown" target="_blank">{% trans "learn more about Markdown" %} »</a>
-    </p>
-</div>
-<!-- end question_edit_tips.html -->
diff --git a/forum/templates/question_retag.html b/forum/templates/question_retag.html
deleted file mode 100644
index 03f3da04..00000000
--- a/forum/templates/question_retag.html
+++ /dev/null
@@ -1,106 +0,0 @@
-{% extends "base.html" %}
-<!-- question_retag.html -->
-{% load extra_tags %}
-{% block title %}{% spaceless %}{% trans "Change tags" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>
-        <script type="text/javascript">
-        
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            //Tags autocomplete action
-            var tags = {{ tags|safe }};
-        	$("#id_tags").autocomplete(tags, {
-                minChars: 1,
-        		matchContains: true,
-                max: 20,
-                multiple: true,
-                multipleSeparator: " ",
-        		formatItem: function(row, i, max) {
-        			return row.n + " ("+ row.c +")";
-        		},
-                formatResult: function(row, i, max){
-                    return row.n;
-                }
-                
-            });
-           
-             $("#fmretag").validate({
-                rules: {
-        			tags: {
-        				required: true,
-        				maxength: 105
-        			}
-        		},
-                messages: {
-        			tags: {
-                        required: "{% trans "tags are required" %}",
-                        maxlength: "{% trans "up to 5 tags, less than 20 characters each" %}
-                    }
-                }
-                
-            });
-            lanai.highlightSyntax();
-
-        });
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Change tags" %} [<a href="{{ question.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="ask-body">
-    <div id="askform">
-        <form id="fmretag" action="{% url edit_question question.id %}" method="post" >
-            <h3>
-                {{ question.get_question_title }}
-            </h3>
-            <div id="description" class="edit-content-html">
-                {{ question.html|safe }}
-            </div>
-           
-            
-            <div class="form-item">
-                <strong>{{ form.tags.label_tag }}:</strong> <span class="form-error"></span><br/>
-                {{ form.tags }}  {{ form.tags.errors }}
-                <div class="title-desc">
-                    {{ form.tags.help_text }}
-                </div>
-            </div>
-            <div class="error" ></div>
-            <input type="submit" value="{% trans "Save edit" %}" class="submit" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);" />
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block sidebar %}
-<div class="boxC">
-    <p class="subtitle">{% trans "Why use and modify tags?" %}</p>
-    <ul class="list-item">
-        <li>
-            {% trans "tags help us keep Questions organized" %}
-        </li>
-        {% comment %}
-        <li>
-            修改完整问题需要用户的积分达到一定条件（比如：积分 >= 3000分，自己发布的问题除外），而用户积分达到比较低的时候，就可以修改问题的标签（比如：积分 >= 500, 这里指所有问题的标签）。
-        </li>
-        {% endcomment %}
-        <li>
-            {% trans "tag editors receive special awards from the community" %}
-        </li>
-    </ul>
-    <p class='info-box-follow-up-links'>
-        <a href="{% url faq %}">faq »</a>
-    </p>
-</div>
-
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end question_retag.html -->
diff --git a/forum/templates/question_summary_list_roll.html b/forum/templates/question_summary_list_roll.html
deleted file mode 100644
index 7312dca9..00000000
--- a/forum/templates/question_summary_list_roll.html
+++ /dev/null
@@ -1,55 +0,0 @@
-    <div class="qstA">
-        <h2>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
-        </h2>
-        <div class="stat">
-            <table>
-                <tr>
-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>
-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>
-                </tr>  
-                <tr>
-                    <td><span class="unit">{% trans "answers" %}</span></td>
-                    <td><span class="unit">{% trans "votes" %}</span></td>
-                    <td><span class="unit">{% trans "views" %}</span></td>
-                </tr> 
-            </table>
-        </div>
-        
-        <div class="summary">
-            {{ question.summary }}...                
-        </div>
-        
-        {% ifequal tab_id 'active'%}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>
-            <span class="score">{% get_score_badge question.last_activity_by %} </span>
-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>
-        </div>
-        {% endif %}
-        {% else %}
-        {% if question.wiki and settings.WIKI_ON %}
-        <span class="from wiki">{% trans "community wiki" %}</span>
-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        {% else %}
-        <div class="from">
-            {% comment %}{% gravatar question.author 24 %}{% endcomment %}
-            <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>
-            <span class="score">{% get_score_badge question.author %} </span>
-            <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>
-        </div>
-        {% endif %}
-        {% endifequal %}
-        
-        <div class="tags">
-        {% for tag in question.tagname_list %}
-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>
-        {% endfor %}
-        </div>
-    </div>
diff --git a/forum/templates/questions.html b/forum/templates/questions.html
deleted file mode 100644
index 77802efc..00000000
--- a/forum/templates/questions.html
+++ /dev/null
@@ -1,235 +0,0 @@
-{% extends "base.html" %}

-<!-- questions.html -->

-{% load extra_tags %}

-{% load i18n %}

-{% load humanize %}

-{% load extra_filters %}

-{% load smart_if %}

-{% block title %}{% spaceless %}{% trans "Questions" %}{% endspaceless %}{% endblock %}

-{% block forejs %}

-       <script type="text/javascript">

-           var tags = {{ tags_autocomplete|safe }};

-           $().ready(function(){

-               var tab_id = "{{ tab_id }}";

-               $("#"+tab_id).attr('className',"on");

-               var on_tab = {% if is_unanswered %}'#nav_unanswered'{% else %}'#nav_questions'{% endif %};

-               $(on_tab).attr('className','on');

-               Hilite.exact = false;

-               Hilite.elementid = "listA";

-               Hilite.debug_referrer = location.href;

-           });

-       </script>

-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>

-       <script type='text/javascript' src='{% media  "/media/js/com.cnprog.tag_selector.js" %}'></script>

-{% endblock %}

-{% block content %}

-<div class="tabBar">

-    <div class="headQuestions">

-        {% if searchtag %}

-            {% trans "Found by tags" %}

-        {% else %}

-            {% if searchtitle %}

-                {% if settings.USE_SPHINX_SEARCH %}

-                    {% trans "Search results" %}

-                {% else %}

-                    {% trans "Found by title" %}

-                {% endif %}

-            {% else %}

-                {% if is_unanswered %}

-                    {% trans "Unanswered questions" %}

-                {% else %}

-                    {% trans "All questions" %}

-                {% endif %}

-            {% endif %}

-        {% endif %}

-    </div>

-    <div class="tabsA">

-        <a id="latest" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=latest" class="off" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a>

-        <a id="active" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=active" class="off" title="{% trans "most recently updated questions" %}">{% trans "active" %}</a>

-        <a id="hottest" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=hottest" class="off" title="{% trans "hottest questions" %}">{% trans "hottest" %}</a>

-        <a id="mostvoted" href="{% if is_search %}{{ search_uri }}&{% else %}?{% endif %}sort=mostvoted" class="off" title="{% trans "most voted questions" %}">{% trans "most voted" %}</a>    

-    </div>

-</div>

-<div id="listA">

-    {% for question in questions.object_list %}

-    <div class="qstA"

-        {% if request.user.is_authenticated %}

-            {% if question.interesting_score > 0 %}

-                    style="background:#ffff99;"

-            {% else %}

-                {% if not request.user.hide_ignored_questions %}

-                    {% if question.ignored_score > 0 %}

-                    style="background:#f3f3f3;"

-                    {% endif %}

-                {% endif %}

-            {% endif %}

-        {% endif %}

-    >

-        <h2>

-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>

-        </h2>

-        <div class="stat">

-            <table>

-                <tr>

-                    <td><span class="num">{{ question.answer_count|intcomma }}</span> </td>

-                    <td><span class="num">{{ question.score|intcomma }}</span> </td>

-                    <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td>

-                </tr>  

-                <tr>

-                    <td><span class="unit">{% trans "answers" %}</span></td>

-                    <td><span class="unit">{% trans "votes" %}</span></td>

-                    <td><span class="unit">{% trans "views" %}</span></td>

-                </tr> 

-            </table>

-        </div>

-        

-        <div class="summary">

-            {{ question.summary }}...                

-        </div>

-        

-        {% ifequal tab_id 'active'%}

-        {% if question.wiki and settings.WIKI_ON %}

-        <span class="from wiki">{% trans "community wiki" %}</span>

-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>

-        {% else %}

-        <div class="from">

-            {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %}

-            <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>

-            <span class="score">{% get_score_badge question.last_activity_by %} </span>

-            <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>

-        </div>

-        {% endif %}

-        {% else %}

-        {% if question.wiki and settings.WIKI_ON %}

-        <span class="from wiki">{% trans "community wiki" %}</span>

-        <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>

-        {% else %}

-        <div class="from">

-            {% comment %}{% gravatar question.author 24 %}{% endcomment %}

-            {% if question.last_activity_at != question.added_at %}

-                {% if question.author.id != question.last_activity_by.id %}

-                    {% trans "Posted:" %}

-                    <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>

-                    <span class="score">{% get_score_badge question.author %} </span>

-                    / {% trans "Updated:" %}

-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>

-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>

-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>

-                {% else %}

-                    {% trans "Updated:" %}

-                    <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span>

-                    <span class="score">{% get_score_badge question.last_activity_by %} </span>

-                    <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span>

-                {% endif %}

-            {% else %}

-                {% trans "Posted:" %}

-                <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span>

-                <span class="score">{% get_score_badge question.author %} </span>

-                <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span>

-            {% endif %}

-        </div>

-        {% endif %}

-        {% endifequal %}

-        

-        <div class="tags">

-        {% for tag in question.tagname_list %}

-        <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a>

-        {% endfor %}

-        </div>

-    </div>

-    {% endfor %}

-    {% if searchtitle %}

-        {% if questions_count == 0 %}

-        <p class="evenMore" style="padding-top:30px;text-align:center;">

-            {% trans "Did not find anything?" %}

-        {% else %}

-        <p class="evenMore" style="padding-left:9px">

-            {% trans "Did not find what you were looking for?" %} 

-        {% endif %}

-        <a href="{% url ask %}">{% trans "Please, post your question!" %}</a>

-        </p>

-    {% endif %}

-</div>

-{% endblock %}

-

-{% block tail %}

-    <div class="pager">{% cnprog_paginator context %}</div>

-    <div class="pagesize">{% cnprog_pagesize context %}</div>

-{% endblock %}

-

-{% block sidebar %}

-<div class="boxC">

-		{% if searchtag %}

-            {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num and searchtag as tagname %}

-            have total {{q_num}} questions tagged {{tagname}}

-            {% plural %}

-            have total {{q_num}} questions tagged {{tagname}}

-            {% endblocktrans %}

-		{% else %}

-			{% if searchtitle %}

-                {% if settings.USE_SPHINX_SEARCH %}

-                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}

-                    have total {{q_num}} questions containing {{searchtitle}} in full text

-                    {% plural %}

-                    have total {{q_num}} questions containing {{searchtitle}} in full text

-                    {% endblocktrans %}

-                {% else %}

-                    {% blocktrans count questions_count as cnt with questions_count|intcomma as q_num %}

-                    have total {{q_num}} questions containing {{searchtitle}}

-                    {% plural %}

-                    have total {{q_num}} questions containing {{searchtitle}}

-                    {% endblocktrans %}

-                {% endif %}

-			{% else %}

-                {% if is_unanswered %}

-                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}

-                    have total {{q_num}} unanswered questions

-                    {% plural %}

-                    have total {{q_num}} unanswered questions

-                    {% endblocktrans %}

-                {% else %}

-                    {% blocktrans count questions as cnt with questions_count|intcomma as q_num %}

-                    have total {{q_num}} questions

-                    {% plural %}

-                    have total {{q_num}} questions

-                    {% endblocktrans %}

-                {% endif %}

-			{% endif %}

-		{% endif %}

-        <p class="nomargin">

-        {% ifequal tab_id "latest" %}

-			{% trans "latest questions info" %}

-        {% endifequal %}

-        

-        {% ifequal tab_id "active" %}

-            {% trans "Questions are sorted by the <strong>time of last update</strong>." %} 

-			{% trans "Most recently answered ones are shown first." %}

-        {% endifequal %}

-        

-        {% ifequal tab_id "hottest" %}

-			{% trans "Questions sorted by <strong>number of responses</strong>." %}

-            {% trans "Most answered questions are shown first." %}

-        {% endifequal %}

-        

-        {% ifequal tab_id "mostvoted" %}

-			{% trans "Questions are sorted by the <strong>number of votes</strong>." %}

-            {% trans "Most voted questions are shown first." %}

-        {% endifequal %}

-        </p>

-</div>

-{% if request.user.is_authenticated %} 

-{% include "tag_selector.html" %}

-{% endif %}

-<div class="boxC">

-	<h3 class="subtitle">{% trans "Related tags" %}</h3>

-    <div class="tags">

-        {% for tag in tags %}

-            <a rel="tag" title="{% blocktrans with tag.name as tag_name %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"  href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a>

-            <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>

-            <br />

-        {% endfor %}

-    </div>

-</div>

-

-{% endblock %}

-<!-- end questions.html -->

diff --git a/forum/templates/reopen.html b/forum/templates/reopen.html
deleted file mode 100644
index 37fb69c1..00000000
--- a/forum/templates/reopen.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "base_content.html" %}
-<!-- reopen.html -->
-{% load extra_tags %}
-{% load i18n %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Reopen question" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $('#btBack').bind('click', function(){ history.back(); });
-        });
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-	{% trans "Reopen question" %}
-</div>
-<div id="main-body" style="width:100%">
-    <p>{% trans "Open the previously closed question" %}: <a href="{{ question.get_absolute_url }}"><span class="big">{{ question.get_question_title }}</span></a>
-    
-    </p>   
-    <p><strong>{% trans "The question was closed for the following reason " %}"{{ question.get_close_reason_display }}"{% trans "reason - leave blank in english" %} <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> {% trans "on "%} {% diff_date question.closed_at %}<font class="darkred">{% trans "date closed" %}</font>
-        </strong>
-    </p>
-    
-    <form id="fmclose" action="{% url reopen question.id %}" method="post" >
-
-        <div id="" style="padding:20px 0 20px 0">
-            <input type="submit" value="{% trans "Reopen this question" %}" class="submit" />
-            <input id="btBack" type="button" value="{% trans "Cancel" %}"  class="submit"  />
-            
-        </div>
-        
-    </form>
-</div>
-{% endblock %}
-<!-- end reopen.html -->
diff --git a/forum/templates/revisions_answer.html b/forum/templates/revisions_answer.html
deleted file mode 100644
index b2e33dfe..00000000
--- a/forum/templates/revisions_answer.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "base_content.html" %}
-<!-- revisions_answer.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type="text/javascript">
-        //todo - take this out into .js file 
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('div.revision div[id^=rev-header-]').bind('click', function(){
-                var revId = this.id.substr(11);
-                toggleRev(revId); 
-            
-            });
-            lanai.highlightSyntax();
-        });
-        
-        function toggleRev(id) {
-            var arrow = $("#rev-arrow-" + id);
-            var visible = arrow.attr("src").indexOf("hide") > -1;
-
-            var path = $.i18n._('/') + "media/images/expander-arrow-" + 
-                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
-            arrow.attr("src", path);
-            $("#rev-body-" + id).slideToggle("fast");
-        }
-        
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Revision history" %} [<a href="{{ post.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="">
-    <div id="revisions">
-    {% for revision in revisions %}
-      <div class="revision">
-        <div id="rev-header-{{ revision.revision }}" class="header {% ifequal post.author_id revision.author_id %}author{% endifequal %}">
-          <div class="header-controls">
-            <table width="100%">
-                <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
-                                                                    src="{% media  "/media/images/expander-arrow-show.gif" %}"
-                                                                    alt="{% trans "click to hide/show revision" %}"/>
-                    </td>
-                    <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
-                    <td width="200px" style="vertical-align:middle">
-                        {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}</span></div>
-                        {% endif %}
-                        {% if request.user|can_edit_post:post %}
-                        <a href="{% url edit_answer post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
-                        {% endif %}
-  
-                    </td>
-                    <td align="right">
-                        <div class="revision-mark" >
-                            {% post_contributor_info revision %}
-                        </div>
-                    </td>
-                </tr>
-    	            
-            </table>
-          </div>
-        </div>
-        <div id="rev-body-{{ revision.revision }}" class="answerbody">
-            {{ revision.diff|safe }}
-        </div>
-      </div>
-    {% endfor %}
-    </div>
-</div>
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end revisions_answer.html -->
diff --git a/forum/templates/revisions_question.html b/forum/templates/revisions_question.html
deleted file mode 100644
index 86d52a36..00000000
--- a/forum/templates/revisions_question.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "base_content.html" %}
-<!-- revisions_question.html -->
-<!--somehow very similar to revisions_answer.html-->
-{% load extra_tags %}
-{% load i18n %}
-{% load extra_filters %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Revision history" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type="text/javascript">
-        //todo - take this out into .js file 
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('div.revision div[id^=rev-header-]').bind('click', function(){
-                var revId = this.id.substr(11);
-                toggleRev(revId); 
-            
-            });
-            lanai.highlightSyntax();
-        });
-        
-        function toggleRev(id) {
-            var arrow = $("#rev-arrow-" + id);
-            var visible = arrow.attr("src").indexOf("hide") > -1;
-
-            var path = $.i18n._('/') + "media/images/expander-arrow-" + 
-                        (visible ? "show" : "hide") + ".gif" + "?v={{settings.RESOURCE_REVISION}}";
-            arrow.attr("src", path);
-            $("#rev-body-" + id).slideToggle("fast");
-        }
-        </script>
-{% endblock %}
-        
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {% trans "Revision history" %}[<a href="{{ post.get_absolute_url }}">{% trans "back" %}</a>]
-</div>
-<div id="main-body" class="">
-    <div id="revisions">
-    {% for revision in revisions %}
-      <div class="revision">
-        <div id="rev-header-{{ revision.revision }}" class="header {% ifequal post.author_id revision.author_id %}author{% endifequal %}">
-          <div class="header-controls">
-            <table width="100%">
-                <tr>
-                    <td width="20" style="vertical-align:middle"><img id="rev-arrow-{{ revision.revision }}" 
-                                                                src="{% media  "/media/images/expander-arrow-show.gif" %}"
-                                                                alt="{% trans "click to hide/show revision" %}"/>
-                    </td>
-                    <td width="30px" style="vertical-align:middle"><span class="revision-number" title="{% trans "revision" %} {{ revision.revision }}">{{ revision.revision }}</span></td>
-                    <td width="200px" style="vertical-align:middle">
-                        {% if revision.summary %}
-                        <div class="summary"><span>{{ revision.summary }}</span></div>
-                        {% endif %}
-                        {% if request.user|can_edit_post:post %}
-                        <a href="{% url edit_question post.id %}?revision={{ revision.revision }}">{% trans "edit" %}</a>
-                        {% endif %}
-  
-                    </td>
-                    <td align="right">
-                        <div class="revision-mark" >
-                            {% post_contributor_info revision %}
-                        </div>
-                    </td>
-                </tr>
-    	            
-            </table>
-          </div>
-        </div>
-        <div id="rev-body-{{ revision.revision }}" class="diff body">
-            {{ revision.diff|safe }}
-        </div>
-      </div>
-    {% endfor %}
-    </div>
-</div>
-{% endblock %}
-
-{% block endjs %}
-{% endblock %}
-<!-- end revisions_question.html -->
diff --git a/forum/templates/tag_selector.html b/forum/templates/tag_selector.html
deleted file mode 100644
index 7686d717..00000000
--- a/forum/templates/tag_selector.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load i18n %}
-{% load extra_tags %}
-<div id="tagSelector" class="boxC">
-	<h3 class="subtitle">{% trans "Interesting tags" %}</h3>
-    <div class="tags interesting marked-tags">
-    {% for tag_name in interesting_tag_names %}
-        {% spaceless %}
-        <span class="deletable-tag" id="interesting-tag-{{tag_name}}">
-            <a rel="tag" 
-                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
-                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
-            <img class="delete-icon" 
-                src="{% media  "/media/images/close-small-dark.png" %}"
-                title="{% blocktrans %}remove '{{tag_name}}' from the list of interesting tags{% endblocktrans %}"/>
-        </span>
-        {% endspaceless %}
-    {% endfor %}
-    </div>
-    <input id="interestingTagInput" autocomplete="off" type="text"/>
-    <input id="interestingTagAdd" type="submit" value="{% trans "Add" %}"/>
-	<h3 class="subtitle">{% trans "Ignored tags" %}</h3>
-    <div class="tags ignored marked-tags">
-    {% for tag_name in ignored_tag_names %}
-        {% spaceless %}
-        <span class="deletable-tag" id="ignored-tag-{{tag_name}}">
-            <a rel="tag" 
-                title="{% blocktrans with tag as tagname %}see questions tagged '{{ tag_name }}'{% endblocktrans %}"
-                href="{% url tag_questions tag_name|urlencode %}">{{tag_name}}</a>
-            <img class="delete-icon" 
-                src="{% media  "/media/images/close-small-dark.png" %}"
-                title="{% blocktrans %}remove '{{tag_name}}' from the list of ignored tags{% endblocktrans %}"/>
-        </span>
-        {% endspaceless %}
-    {% endfor %}
-    </div>
-    <input id="ignoredTagInput" autocomplete="off" type="text"/>
-    <input id="ignoredTagAdd" type="submit" value="{% trans "Add" %}"/>
-    <p id="hideIgnoredTagsControl">
-    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
-    <label id="hideIgnoredTagsLabel" for="hideIgnoredTagsCb">{% trans "keep ingored questions hidden" %}</label>
-    <p>
-</div>
diff --git a/forum/templates/tags.html b/forum/templates/tags.html
deleted file mode 100644
index 1bde187f..00000000
--- a/forum/templates/tags.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "base_content.html" %}
-<!-- tags.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-{% block title %}{% spaceless %}{% trans "Tag list" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-       /*<![CDATA[*/
-        $().ready(function(){
-            $("#nav_tags").attr('className',"on");
-            $("#ipSearchTag").focus();
-
-            var orderby = "{{ tab_id }}";
-            if(orderby != "used" && orderby != "name")
-                orderby = "used";
-            $("#sort_" + orderby).attr('className',"on");
-            $("#type-tag").attr('checked',true);
-
-            Hilite.exact = false;
-            Hilite.elementid = "searchtags";
-            Hilite.debug_referrer = location.href;
-        });
-        /*]]>*/
-        </script>
-{% endblock %}
-{% block content %}
-<!-- Tabs -->
-<div class="tabBar">
-    <div class="headQuestions">{% trans "Tag list" %}</div>
-    <div class="tabsA">
-        <a id="sort_name" href="{% url tags %}?sort=name" class="off" title="{% trans "sorted alphabetically" %}">{% trans "by name" %}</a>
-        <a id="sort_used" href="{% url tags %}?sort=used" class="off" title="{% trans "sorted by frequency of tag use" %}">{% trans "by popularity" %}</a>
-    </div>
-</div>
-<div id="searchtags">
-<p>
-{% if stag %}
-    {% trans "All tags matching query" %} '<span class="darkred"><strong>{{ stag }}</strong></span>' {% trans "all tags - make this empty in english" %}:
-{% endif %}
-{% if not tags.object_list %}
-    <span>{% trans "Nothing found" %}</span>
-{% endif %}
-</p>
-{% if tags.object_list %}
-<ul class="tagsList tags">
-{% for tag in tags.object_list %}
-   <li>
-    <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">
-        {{ tag }}
-    </a>&nbsp;
-    <span class="tag-number">&#215; {{ tag.used_count|intcomma }}</span>
-    <br/>
-
-    </li>
-{% endfor %}
-</ul>
-{% endif %}
-</div>
-
-{% endblock %}
-{% block tail %}
-<div class="pager">
-    {% cnprog_paginator context %}
-</div>              
-{% endblock %}
-<!-- end tags.html -->
diff --git a/forum/templates/user.html b/forum/templates/user.html
deleted file mode 100644
index 5931f31c..00000000
--- a/forum/templates/user.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base_content.html" %}
-<!-- user.html -->
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
-{% block forestyle%}
-    <style type="text/css">
- 		.history-table td { padding: 5px; }
- 		.user-stats-table { margin-left:50px; }
-	</style>
-{% endblock %}
-{% block forejs %}
-    {% if request.user|can_moderate_users %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.admin.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.form.js" %}'></script>
-    {% endif %}
-    <script type="text/javascript">
-        var viewUserID = {{view_user.id}};
-        $().ready(function(){
-            {% ifequal view_user request.user%}
-                $("#nav_profile").attr('className',"on");
-            {% else %}
-                $("#nav_users").attr('className',"on");
-            {% endifequal %}
-        }); 
-    </script>
-    {% block userjs %}
-    {% endblock %}
-{% endblock %}
-{% block content %}
-    <div id="mainbar-full">
-        {% include "user_info.html" %}
-        {% include "user_tabs.html" %}
-        {% block usercontent %}
-        {% endblock %}
-        {%comment%}{% include "user_footer.html" %}{%endcomment%}
-	</div>
-{% endblock %}<!-- end user.html -->
diff --git a/forum/templates/user_edit.html b/forum/templates/user_edit.html
deleted file mode 100644
index 040ebff4..00000000
--- a/forum/templates/user_edit.html
+++ /dev/null
@@ -1,95 +0,0 @@
-{% extends "base_content.html" %}

-<!-- user_edit.html -->

-{% load extra_tags %}

-{% load humanize %}

-{% load i18n %}

-{% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}

-{% block forejs %}

-        <script type="text/javascript">

-            $().ready(function(){

-                $("#nav_profile").attr('className',"on");

-                $("#cancel").bind('click', function(){history.go(-1);})

-            });     

-        </script>

-        {% block userjs %}

-        {% endblock %}

-{% endblock %}

-{% block content %}

-<div id="main-bar" class="headNormal">

-    {{ request.user.username }} - {% trans "edit profile" %}

-</div>

-<div id="main-body" style="width:100%;padding-top:10px">

-    <form name="" action="{% url edit_user request.user.id %}" method="post">

-        <div id="left" style="float:left;width:180px">

-            {% if request.user.email %}

-            {% gravatar request.user 128 %}

-            {% else %}

-            <img src="{% media  "/media/images/nophoto.png" %}">

-            {% endif %}

-            <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">

-                <a href="http://www.gravatar.com/" target="_blank" 

-					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>

-            </div>

-        </div>

-        

-        <div id="askform" style="float:right;width:750px;text-align:left;">

-            <h2>{% trans "Registered user" %}</h2>

-            <table class="user-details">

-                <tr>

-                    <th width="100px"></th>

-                    <th></th>

-                </tr>

-                <tr style="height:35px">

-	            	<td>{% trans "Screen Name" %}:</td>

-	            	<td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>

-	            </tr>

-                

-	            <tr style="height:35px">

-	            	<td>{{ form.email.label_tag }}:</td>

-	            	<td>{{ form.email }} <span class="form-error"></span> {{ form.email.errors }} </td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td></td>

-	            	<td class="title-desc">{{ form.email.help_text }}</td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td>{{ form.realname.label_tag }}:</td>

-	            	<td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td>{{ form.website.label_tag }}:</td>

-	            	<td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td>{{ form.city.label_tag }}:</td>

-	            	<td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td>{{ form.birthday.label_tag }}:</td>

-	            	<td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td>

-	            </tr>

-                <tr style="height:35px">

-	            	<td></td>

-	            	<td class="title-desc">{{ form.birthday.help_text }}</td>

-	            </tr>

-                <tr style="height:10px">

-                    <td colspan="2">

-                    </td>

-                </tr>

-                <tr>

-	            	<td style="vertical-align:top">{{ form.about.label_tag }}:</td>

-	            	<td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td>

-	            </tr>

-	            

-            </table>

-            <div style="margin:30px 0 60px 0">

-                <input type="submit" value="{% trans "Update" %}" class="submit" >

-                <input id="cancel" type="button" value="{% trans "Cancel" %}" class="submit" >

-          

-            </div>

-        </div>

-    </form>

-    

-</div>

-{% endblock %}

-<!-- end user_edit.html -->

diff --git a/forum/templates/user_email_subscriptions.html b/forum/templates/user_email_subscriptions.html
deleted file mode 100644
index c0204cbc..00000000
--- a/forum/templates/user_email_subscriptions.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "user.html" %}
-<!-- user_email_subscriptions.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load humanize %}
-
-{% block usercontent %}
-    <h2>{% trans "Email subscription settings" %}</h2>
-    <p class="message">{% trans "email subscription settings info" %}</p>
-    <div class='inline-block'>
-    {% if action_status %}
-    <p class="action-status"><span>{{action_status}}</span></p>
-    {% endif %}
-    <form method="POST"> 
-        {% include "edit_user_email_feeds_form.html" %}
-        <table class='form-as-table'>
-        {{tag_filter_selection_form}}
-        </table>
-        <div class="submit-row text-align-right">
-            <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>
-            <input type="submit" class="submit" name="stop_email" value="{% trans "Stop sending email" %}"/>
-        </div>
-    </form>
-    </div>
-{% endblock %}
-<!-- end user_email_subscriptions.html -->
diff --git a/forum/templates/user_favorites.html b/forum/templates/user_favorites.html
deleted file mode 100644
index 9db01e9a..00000000
--- a/forum/templates/user_favorites.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "user.html" %}
-<!-- user_favorites.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% block usercontent %}
-		{% include "users_questions.html" %}
-{% endblock %}
-<!-- end user_favorites.html -->
diff --git a/forum/templates/user_footer.html b/forum/templates/user_footer.html
deleted file mode 100644
index ee347742..00000000
--- a/forum/templates/user_footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- user_footer.html -->
-<div id="mainbar-footer">
-
-</div><!-- end user_footer.html -->
diff --git a/forum/templates/user_info.html b/forum/templates/user_info.html
deleted file mode 100644
index c550e13f..00000000
--- a/forum/templates/user_info.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!-- user_info.html -->
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% load smart_if %}
-{% load i18n %}
-<div id="subheader" class="headUser">
-    {{view_user.username}}
-</div>
-<table class="user-info-table">
-    <tr>
-        <td width="180" style="vertical-align:middle;text-align:center;">
-            <table width="100%">
-                <tr>
-                    <td>
-                        {% gravatar view_user 128 %}
-                    </td>
-                </tr>
-                <tr>
-                    <td align="center">
-                        <div class="scoreNumber">{{view_user.reputation|intcomma}}</div>
-                        <p><b style="color:#777;">{% trans "reputation" %}</b></p>
-                    </td>
-                </tr>
-            </table>
-        </td>
-        <td width="360" style="vertical-align: top;">
-            <table class="user-details">
-                {% if view_user != request.user and request.user|can_moderate_users %}
-                <tr>
-                    <td class="admin" align="left" colspan="2">
-                        <h3>{% trans "Moderate this user" %}</h3>
-                        <form id="moderate_user_form" method="post">
-                            {{moderate_user_form.as_p}}
-                        </form>
-                        <p id="action_status"></p>
-                    </td>
-                </tr>
-                {% endif %}
-                {% if request.user|can_view_user_edit:view_user %}
-                <tr>
-                    <td class="user-profile-tool-links" align="left" colspan="2">
-                        {% joinitems using ' | ' %}
-                            {% if request.user|can_view_user_edit:view_user %}
-                            <span class="user-edit-link"><a href="{% url users %}{{ view_user.id }}/{% trans "edit/" %}">{% trans "update profile" %}</a></span>
-                            {% endif %}
-                        {% separator %}
-                            {% if request.user.has_usable_password %}
-                                <a href="{% url user_changepw %}">change password</a>
-                            {% endif %}
-                        {% endjoinitems %}
-                    </td>
-                </tr>  
-                {% endif %}
-                <tr>
-                    <th colspan="2" align="left"><h3>{% trans "Registered user" %}</h3></th>
-                </tr>
-                {% if view_user.real_name %}
-                <tr>
-                    <td>{% trans "real name" %}</td>
-                    <td><b>{{view_user.real_name}}</b></td>
-                </tr>
-                {% endif %}
-                <tr>
-                    <td>{% trans "member for" %}</td>
-                    <td><strong>{% diff_date view_user.date_joined %}</strong></td>
-                </tr>
-                {% if view_user.last_seen %}
-                <tr>
-                    <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_seen }}">{% diff_date view_user.last_seen %}</strong></td>
-                </tr>
-                {% endif %}
-                {% if view_user.website %}
-                <tr>
-                    <td>{% trans "user website" %}</td>
-                    <td><a rel="nofollow" target="_blank" href="{{view_user.website}}">{{view_user.website}}</a></td>
-                </tr>
-                {% endif  %}
-                {% if view_user.location %}
-                <tr>
-                    <td>{% trans "location" %}</td>
-                    <td>{{view_user.location}}</td>
-                </tr>
-                {% endif %}
-                {% if view_user.date_of_birth%}
-                <tr>
-					<!--todo  - redo this with blocktrans -->
-                    <td>{% trans "age" %}</td>
-                    <td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
-                </tr>
-                {% endif %}
-				<!--
-                {% if votes_today_left %}
-                <tr>
-                    <td>{% trans "todays unused votes" %}</td>
-                    <td><strong class="darkred">{{ votes_today_left }}</strong> {% trans "votes left" %}</td>
-                </tr>
-                {% endif %}
-				-->
-            </table>
-        </td>
-        <td width="380">
-            <div class="user-about">
-            {% if view_user.about %}
-                {{view_user.about|safe|linebreaks}}
-            {% endif %}
-            </div>
-        </td>
-    </tr>
-</table>
-<!-- end user_info.html -->
diff --git a/forum/templates/user_recent.html b/forum/templates/user_recent.html
deleted file mode 100644
index b704ab25..00000000
--- a/forum/templates/user_recent.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "user.html" %}
-<!-- user_recent.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% block usercontent %}
-        <div style="padding-top:5px;font-size:13px;">
-        {% for act in activities %}
-            <div style="clear:both;line-height:20px" >
-                <div style="width:180px;float:left">{% diff_date act.time 3 %}</div>
-                <div style="width:150px;float:left">
-                <span class="user-action-{{ act.type_id }}">{{ act.type }}</span>
-                </div>
-                <div style="float:left;overflow:hidden;">
-                    {% ifequal act.type_id 7 %}
-                    <a href="{{act.badge.get_absolute_url}}" title="{{ act.badge.get_type_display }} : {{ act.badge.description }}" class="medal"><span class="badge{{ act.badge.type }}">&#9679;</span>&nbsp;{{ act.badge.name }}</a>
-                    {% else %}
-                    <span class="post-type-{{ act.type_id }}"><a href="{{ act.title_link }}">{{ act.title }}</a></span>
-                    {% if act.summary %}<span class="revision-summary">{{ act.summary }}</span>{% endif %}
-                    {% endifequal %}
-                    <div style="height:5px"></div>
-                </div>
-            </div>
-        {% endfor %}
-        </div>
-{% endblock %}
-<!-- end user_recent.html -->
diff --git a/forum/templates/user_reputation.html b/forum/templates/user_reputation.html
deleted file mode 100644
index 776935ae..00000000
--- a/forum/templates/user_reputation.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% extends "user.html" %}
-<!-- user_reputation.html -->
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% block userjs %}
-       <script type='text/javascript' src='{% media  "/media/js/excanvas.pack.js" %}'></script>
-       <script type='text/javascript' src='{% media  "/media/js/jquery.flot.pack.js" %}'></script>
-       
-       <script type="text/javascript">
-        $().ready(function(){
-            var d = {{ reps }};
-            var placeholder = $("#diagram");
-
-            var plot = $.plot(placeholder, [d], {
-                xaxis: { mode: "time" },
-                points: { show: true },
-                lines: { show: true }
-            });
-        });
-
-        </script>
-{% endblock %}
-{% block usercontent %}
-        <div style="padding:5px;font-size:13px;">
-            <div id="diagram" style="width:550px;height:250px;float:left">
-
-            </div>
-            <div style="float:right; width:385px; height:300px; overflow-y:auto;word-wrap:break-word;" >
-                {% for rep in reputation %}
-                <p style="clear:both">
-                    <div style="float:left;text-align:right;font-family:arial;font-weight:bold;background:#eee;padding:2px 10px 2px 10px;margin-right:5px">
-                        <div style="float:left;width:20px;color:green;padding-right:5px">{{ rep.positive }}</div>
-                        <div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
-                        
-                    </div>
-                    <a href="{% url question rep.question_id %}{{ rep.title|slugify }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span>                    
-                </p>
-                {% endfor %}
-            </div>
-        </div>
-{% endblock %}<!-- end user_reputation.html -->
diff --git a/forum/templates/user_responses.html b/forum/templates/user_responses.html
deleted file mode 100644
index c4f4ffed..00000000
--- a/forum/templates/user_responses.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "user.html" %}
-<!-- user_responses.html -->
-{% load extra_tags %}
-{% load humanize %}
-
-{% block usercontent %}
-        <div style="padding-top:5px;font-size:13px;">
-        {% for response in responses %}
-            <div style="clear:both;line-height:18px">
-                <div style="width:150px;float:left">{% diff_date response.time 3 %}</div>
-                <div style="width:100px;float:left"><a href="{{ response.userlink }}">{{ response.username }}</a></div>
-                <div style="float:left;overflow:hidden;width:680px">
-                    <strong {% ifequal response.type "question_answered" %}class="user-action-2"{% endifequal %}{% ifequal response.type "answer_accepted" %}class="user-action-8"{% endifequal %}>{{ response.type }}</strong>：
-                    <a href="{{ response.titlelink }}">{{ response.title }}</a><br/>
-                    {{ response.content|safe }}
-                    <div style="height:10px"></div>
-                </div>
-
-            </div>
-        {% endfor %}
-        </div>
-{% endblock %}
-<!-- end user_responses.html -->
diff --git a/forum/templates/user_stats.html b/forum/templates/user_stats.html
deleted file mode 100644
index 933764d9..00000000
--- a/forum/templates/user_stats.html
+++ /dev/null
@@ -1,138 +0,0 @@
-{% extends "user.html" %}
-<!-- user_stats.html -->
-{% load i18n %}
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-		{% block usercontent %}
-	
-        <a name="questions"></a>
-        {% spaceless %}
-            <h2>
-                {% blocktrans count questions|length as counter %}
-                <span class="count">1</span> Question
-                {% plural %}
-                <span class="count">{{counter}}</span> Questions
-                {% endblocktrans %}
-            </h2>
-        {% endspaceless %}
-		{% include "users_questions.html" %}
-        <a name="answers"></a>
-        {% spaceless %}
-            <h2>
-                {% blocktrans count answered_questions|length as counter %}
-                <span class="count">1</span> Answer
-                {% plural %}
-                <span class="count">{{counter}}</span> Answers
-                {% endblocktrans %}
-            </h2>
-        {% endspaceless %}
-        <div class="user-stats-table">
-            {% for answered_question in answered_questions %}
-            <div class="answer-summary">
-                <a title="{{answered_question.summary|collapse}}" 
-                    href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">
-                    <span class="answer-votes {% if answered_question.accepted %}answered-accepted{% endif %}" 
-						title="{% blocktrans with answered_question.vote_count as vote_count %}the answer has been voted for {{ vote_count }} times{% endblocktrans %} {% if answered_question.accepted %}{% trans "this answer has been selected as correct" %}{%endif%}">
-                        {{ answered_question.vote_count }}
-                    </span>
-                </a>
-                <div class="answer-link">
-                    {% spaceless %}
-                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
-                    {% endspaceless %}
-                    {% if answered_question.comment_count %}
-                    <span>
-				    {% blocktrans count answered_question.comment_count as comment_count %}
-                    (one comment)
-                    {% plural %}
-                    the answer has been commented {{comment_count}} times
-                    {% endblocktrans %}
-                    </span> 
-                    {% endif %}
-                </div>
-            </div>
-            {% endfor %}
-        </div>
-        <br/>
-        <a name="votes"></a>
-        {% spaceless %}
-            <h2>
-                {% blocktrans count total_votes as cnt %}
-                    <span class="count">1</span> Vote
-                {% plural %}
-                    <span class="count">{{cnt}}</span> Votes
-                {% endblocktrans %}
-            </h2>
-        {% endspaceless %}
-        <div class="user-stats-table">
-            <table>
-                <tr>
-                    <td width="60">
-                        <img style="cursor: default;" src="{% media  "/media/images/vote-arrow-up-on.png" %}" alt="{% trans "thumb up" %}" />
-                            <span title="{% trans "user has voted up this many times" %}" class="vote-count">{{up_votes}}</span>
-
-                    </td>
-                    <td width="60">
-                        <img style="cursor: default;" src="{% media  "/media/images/vote-arrow-down-on.png" %}" alt="{% trans "thumb down" %}" />
-                            <span title="{% trans "user voted down this many times" %}" class="vote-count">{{down_votes}}</span>
-
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <a name="tags"></a>
-        {% spaceless %}
-            <h2>
-                {% blocktrans count user_tags|length as counter %}
-                    <span class="count">1</span> Tag
-                {% plural %}
-                    <span class="count">{{counter}}</span> Tags
-                {% endblocktrans %}
-            </h2>
-        {% endspaceless %}
-        <div class="user-stats-table">
-            <table class="tags">
-                <tr>
-                    <td width="180" valign="top">
-                        {% for tag in user_tags%}
-                        <a rel="tag" 
-							title="{% blocktrans with tag.name as tag_name %}see other questions with {{view_user}}'s contributions tagged '{{ tag_name }}' {% endblocktrans %}" 
-							href="{% url forum.views.tag tag|urlencode %}?user={{view_user.username}}">{{tag.name}}</a>
-                        <span class="tag-number">&#215; {{ tag.user_tag_usage_count|intcomma }}</span><br/>
-                            {% if forloop.counter|divisibleby:"10" %}
-                                </td>
-                                <td width="180"  valign="top">
-                            {% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <a name="badges"></a>
-        {% spaceless %}
-        <h2>
-            {% blocktrans count total_awards as counter %}
-            <span class="count">1</span> Badge
-            {% plural %}
-            <span class="count">{{counter}}</span> Badges
-            {% endblocktrans %}
-        </h2>
-        {% endspaceless %}
-        <div class="user-stats-table">
-            <table>
-                <tr>
-                    <td width="180" style="line-height:35px">
-                        {% for award in awards %}
-                            <a href="{% url badges %}{{award.id}}/{{award.name}}" title="{{ award.description }}" class="medal"><span class="badge{{ award.type }}">&#9679;</span>&nbsp;{{ award.name }}</a><span class="tag-number"> &#x2715; {{ award.count|intcomma }}</span><br/>
-                            {% if forloop.counter|divisibleby:"6" %}
-                                </td>
-                                <td width="180" style="line-height:35px">
-                            {% endif %}
-                        {% endfor %}
-                    </td>
-                </tr>
-            </table>
-        </div>
-{% endblock %}
-<!-- end user_stats.html -->
diff --git a/forum/templates/user_tabs.html b/forum/templates/user_tabs.html
deleted file mode 100644
index 908e8430..00000000
--- a/forum/templates/user_tabs.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- user_tabs.html -->
-{% load extra_filters %}
-{% load i18n %}
-<div class="tabBar">
-    <div class="tabsA">
-        <a id="stats" {% ifequal tab_name "stats" %}class="on"{% endifequal %} 
-			title="{% trans "User profile" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %}</a>
-        <a id="recent" {% ifequal tab_name "recent" %}class="on"{% endifequal %} 
-			title="{% trans "recent activity" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %}</a>
-        {% if request.user|is_user_self:view_user %}
-        <a id="responses" {% ifequal tab_name "responses" %}class="on"{% endifequal %} 
-			title="{% trans "comments and answers to others questions" %}" 
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %}</a>
-        {% endif %}
-        <a id="reputation" {% ifequal tab_name "reputation" %}class="on"{% endifequal %} 
-			title="{% trans "graph of user reputation" %}" 
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %}</a>
-        {% if request.user|can_view_user_votes:view_user %}
-        <a id="votes" {% ifequal tab_name "votes" %}class="on"{% endifequal %} 
-			title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %}</a>
-        {% endif %}
-        <a id="favorites" {% ifequal tab_name "favorites" %}class="on"{% endifequal %} 
-			title="{% trans "questions that user selected as his/her favorite" %}"
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %}</a>
-        {% if request.user|can_view_user_preferences:view_user %}
-        <a id="email_subscriptions" {% ifequal tab_name "email_subscriptions" %}class="on"{% endifequal %} 
-			title="{% trans "email subscription settings" %}" 
-			href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=email_subscriptions">{% trans "email subscriptions" %}</a>
-        {% endif %}  
-    </div>
-</div>
-<!-- end user_tabs.html -->
diff --git a/forum/templates/user_votes.html b/forum/templates/user_votes.html
deleted file mode 100644
index b56aab01..00000000
--- a/forum/templates/user_votes.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "user.html" %}
-<!-- user_votes.html -->
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% load i18n %}
-
-{% block usercontent %}
-        <div style="padding-top:5px;font-size:13px;">
-        {% for vote in votes %}
-            <div style="clear:both;line-height:20px" >
-                <div style="width:150px;float:left">{% diff_date vote.voted_at 3 %}</div>
-                <div style="width:30px;float:left">
-                {% ifequal vote.vote 1 %}
-                    <img src="{% media  "/media/images/vote-arrow-up-on.png" %}" title="{% trans "upvote" %}">
-                {% else %}
-                    <img src="{% media  "/media/images/vote-arrow-down-on.png" %}" title="{% trans "downvote" %}">
-                {% endifequal %}
-                </div>
-                <div style="float:left;overflow:hidden;width:750px">
-                    {% ifequal vote.answer_id 0 %}
-                    <span class="question-title-link"><a href="{% url question vote.question_id %}{{ vote.title|slugify }}">{{ vote.title }}</a></span>
-                    {% else %}
-                    <span class="answer-title-link" ><a href="{% url question vote.question_id %}{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span>
-                    {% endifequal %}
-                    <div style="height:5px"></div>
-                </div>          
-            </div>
-        {% endfor %}
-        </div>
-{% endblock %}
-<!-- end user_votes.html -->
diff --git a/forum/templates/users.html b/forum/templates/users.html
deleted file mode 100644
index 3a59b0c0..00000000
--- a/forum/templates/users.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{% extends "base_content.html" %}
-<!-- users.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Users" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-	   //todo move javascript out
-        $().ready(function(){
-            $("#nav_users").attr('className',"on");
-            $("#type-user").attr('checked',true);
-            var orderby = "{{ tab_id }}";
-            $("#sort_" + orderby).attr('className',"on");
-            
-            Hilite.exact = false;
-            Hilite.elementid = "main-body";
-            Hilite.debug_referrer = location.href;
-        });
-        </script>
-{% endblock %}
-{% block content %}
-<div class="tabBar">
-    <div class="headUsers">{% trans "Users" %}</div>
-    <div class="tabsA">
-        <a id="sort_reputation" href="{% url users %}?sort=reputation" class="off" title="{% trans "reputation" %}">{% trans "reputation" %}</a>
-        <a id="sort_newest" href="{% url users %}?sort=newest" class="off" title="{% trans "recent" %}">{% trans "recent" %}</a>
-        <a id="sort_last" href="{% url users %}?sort=last" class="off" title="{% trans "oldest" %}">{% trans "oldest" %}</a>
-        <a id="sort_user" href="{% url users %}?sort=user" class="off" title="{% trans "by username" %}">{% trans "by username" %}</a>
-    </div>
-</div>
-<div id="main-body" style="width:100%">
-    <p>        
-        {% if suser %}
-			{% blocktrans %}users matching query {{suser}}:{% endblocktrans %}
-        {% endif %}
-    
-        {% if not users.object_list %}
-            <span>{% trans "Nothing found." %}</span>
-        {% endif %}
-    </p>
-    <div class="userList">
-        <table class="list-table">
-            <tr>    
-                <td class="list-td">
-                    {% for user in users.object_list %}
-                    
-                    <div class="user">
-                        <ul>
-                                <li class="thumb"><a href="{{ user.get_profile_url }}">{% gravatar user 32 %}</a></li>
-                                <li><a href="{{ user.get_profile_url }}">{{user.username}}</a></li>
-                                <li>{% get_score_badge user %}</li>
-                            </ul>
-                    </div>
-                    
-            {% if forloop.counter|divisibleby:"7" %}
-                </td>
-                <td>
-            {% endif %}
-
-                    {% endfor %}
-                </td>
-            </tr>   
-        </table>
-    </div>
-</div>
-{% endblock %}
-{% block tail %}
-<div class="pager">
-    {% cnprog_paginator context %}
-</div>              
-{% endblock %}
-<!-- end users.html -->
diff --git a/forum/templates/users_questions.html b/forum/templates/users_questions.html
deleted file mode 100644
index eb1be4ee..00000000
--- a/forum/templates/users_questions.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- users_questions.html -->
-{% load extra_tags %}
-{% load extra_filters %}
-{% load humanize %}
-{% load i18n %}
-<div class="user-stats-table">
-    {% for question in questions %}
-        {% if question.favourite_count %}
-            {% if question.favorited_myself %}
-                <div class="favorites-count">
-                    <img title="{% trans "this questions was selected as favorite" %} {{question.favourite_count}} {% trans "number of times" %}" 
-                        alt="{% trans "thumb-up on" %}"
-						src="{% media  "/media/images/vote-favorite-on.png" %}"/>
-                    <div><b>{{question.favourite_count|intcomma}}</b></div>
-                </div>
-            {% else %}
-                <div class="favorites-count-off">
-                    <img title="{% trans "this question was selected as favorite" %}{{question.favourite_count}} {% trans "number of times" %}" 
-                        alt="{% trans "thumb-up off" %}"
-						src="{% media  "/media/images/vote-favorite-off.png" %}"/>
-                    <div><b>{{question.favourite_count|intcomma}}</b></div>
-                </div>
-            {% endif %}
-        {% else %}
-            <div class="favorites-empty"> </div>
-        {% endif %}
-    <div id="question-summary-{{question.id}}" class="question-summary narrow">
-        <a style="text-decoration: none;" href="{% url question id=question.id %}{{question.title|slugify}}">
-            <div class="stats">
-                <div class="votes">
-                    <span class="vote-count-post">{{question.vote_count|intcomma}}</span>
-                    {% trans "votes" %}
-                </div >
-                <div title="{% if question.answer_accepted %}{% trans "this answer has been accepted to be correct" %}{% endif %}" class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}">
-                    <span class="answer-count-post">{{question.answer_count|intcomma}}</span>
-                    {% trans "answers" %}
-                </div>
-                <div class="views">
-                     <span class="views-count-post">{{question.view_count|cnprog_intword|safe}}</span>
-					 {% trans "views" %}
-                </div>
-            </div>
-        </a>
-        <div class="summary">
-            <div class="question-title">
-                <a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a>
-            </div>
-            <div class="tags">
-                {% convert2tagname_list question %}
-                {% for tag in question.tagnames %}
-					<!--todo - move trans below to blocktrans -->
-                    <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }}</a>
-                {% endfor %}
-            </div>
-            <div class="started">
-                <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span>
-                {% if question.la_username %}
-                    <a href="{% url users %}{{question.la_user_id}}/{{question.la_username}}">{{question.la_username}}</a> {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%}
-                {% endif %}
-            </div>
-        </div>
-    </div>
-    <br clear="all"/>
-    {% endfor %}
-</div>
-<!-- end users_questions.html -->