Merging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all...

[osqa.git] / forum / skins / default / templates / 404.html

diff --git a/forum/skins/default/templates/404.html b/forum/skins/default/templates/404.html
index 227de3ae33a3ac7da6b134ffe3030aa31bbce5bb..ad2ac68cdbf563856385e5acba9e2d0432fd16ee 100644 (file)
--- a/forum/skins/default/templates/404.html
+++ b/forum/skins/default/templates/404.html
@@ -1,7 +1,7 @@
 {% extends "base_content.html" %}
 <!-- template 404.html -->
 {% load i18n %}
 {% extends "base_content.html" %}
 <!-- template 404.html -->
 {% load i18n %}

-{% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
+{% block title %}{% trans "404 Error" %}{% endblock %}

 {% block forestyle%}
     <style type="text/css">
                form input { margin-right: 5px; }
 {% block forestyle%}
     <style type="text/css">
                form input { margin-right: 5px; }


@@ -17,20 +17,19 @@
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
 {% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">

-    404 Not Found
+    {% trans "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/>
 </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>
+            <ul>

             <li>{% trans "this question or answer has been deleted;" %}</li>
             <li>{% trans "url has error - please check it;" %}</li>
             <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>
+            <li>{% trans "if you believe this error 404 should not have occurred, please" %} 
+                               <a href="{% if settings.CONTACT_URL %}{{ settings.CONTACT_URL }}{% else %}{% url feedback %}{% endif %}">{% trans "report this problem" %}</a></li>
+            </ul>

         </div>
         <script type="text/javascript">
             var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
         </div>
         <script type="text/javascript">
             var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';


@@ -38,10 +37,10 @@
         </script>
         <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
         <ul>
         </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>
+            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} &raquo;</a></li>
+            <li><a href="{% url questions %}">{% trans "see all questions" %} &raquo;</a></li>
+            <li><a href="{% url tags %}">{% trans "see all tags" %} &raquo;</a></li>
+        </ul>

     </div>
 
 </div>
     </div>
 
 </div>