no more "bellow"

[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 89d4801fc53f928365b0ff4199805b2ee88e7c38..1650315ddc60acf4c5f4e3f6ab4ff6ebe3f0a597 100644 (file)
--- a/forum/skins/default/templates/footer.html
+++ b/forum/skins/default/templates/footer.html
@@ -1,28 +1,30 @@
-<!-- template footer.html -->

 {% load extra_tags %}
 {% load i18n %}
 {% 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>
     <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=
                 {% 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 %}
                         target="_blank">
                     {% else %}
                         "{% url feedback %}?next={{request.path}}">
                     {% endif %}

-                    {% trans "give feedback" %}
+                    {% trans "contact us" %}

                 </a>
                 {% endspaceless %}
                        </div>
                  <p>
                 </a>
                 {% endspaceless %}
                        </div>
                  <p>

-                        <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
-                               powered by cnprog platform
+                        <a href="http://osqa.net" target="_blank" title="OSQA {{ settings.OSQA_VERSION }} ({{ settings.SVN_REVISION }})">
+                               powered by OSQA

                         </a>
                  </p>
           </div>
                         </a>
                  </p>
           </div>


@@ -32,17 +34,4 @@
                  </a>
                 </div>
        </div>
                  </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 -->
+