Added a new optional setting for "support" URL that gets shown in the footer

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

diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 66ea2bc537f93f84346ce90916f9a572a70ab1e5..b92f06b873901bb01ddd1f43ba3e86b890196336 100644 (file)
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -1,27 +1,29 @@
-<!-- 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>
+                               <a href="{% url privacy %}">{% trans "privacy" %}</a><span class="link-separator"> |</span>
+                {% if settings.SUPPORT_URL %}
+                    <a href="{{settings.SUPPORT_URL}}" target="_blank">{% trans "support" %}</a><span class="link-separator"> |</span>
+                {% endif %}
                 {% spaceless %}
                                <a href=
-                    {% if settings.FEEDBACK_SITE_URL %}
-                        "{{settings.FEEDBACK_SITE_URL}}"
+                    {% if settings.CONTACT_URL %}
+                        "{{settings.CONTACT_URL}}"
                         target="_blank">
                     {% else %}
                         "{% url feedback %}?next={{request.path}}">
                     {% endif %}
-                    {% trans "give feedback" %}
+                    {% trans "contact us" %}
                 </a>
                 {% endspaceless %}
                        </div>
                  <p>
-                        <a href="http://osqa.net" target="_blank">
+                        <a href="http://osqa.net" target="_blank" title="OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})">
                                powered by OSQA
                         </a>
                  </p>
@@ -32,7 +34,6 @@
                  </a>
                 </div>
        </div>
-       <!-- 页面底部结束： -->
     {% if settings.GOOGLE_ANALYTICS_KEY %}
     <script type="text/javascript">
         var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
@@ -45,4 +46,4 @@
         } catch(err) {}
     </script>
     {% endif %}
-<!-- end template footer.html -->
+