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, 35 insertions, 0 deletions

diff --git a/forum/skins/default/templates/500.html b/forum/skins/default/templates/500.html
new file mode 100644
index 00000000..51e73178
--- /dev/null
+++ b/forum/skins/default/templates/500.html
@@ -0,0 +1,35 @@
+{% 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 -->