Merge commit 'osqa/master'

Conflicts:
	forum/skins/default/media/js/wmd/wmd.js
	forum/skins/default/templates/base.html
	forum/skins/default/templates/base_content.html
	forum/views.py
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	settings_local.py.dist

1 files changed, 0 insertions, 83 deletions

diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html
deleted file mode 100644
index 974e589c..00000000
--- a/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='{% href "/content/js/com.cnprog.editor.js" %}'></script>
-        <script type='text/javascript' src='{% href "/content/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._('/') + "content/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="{% href "/content/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 -->