X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..07ab188d70f8e090ad79090fb467b7f1c1d72ef9:/forum/skins/default/templates/footer.html?ds=inline

diff --git a/forum/skins/default/templates/footer.html b/forum/skins/default/templates/footer.html
index 89d4801..e8af78f 100644
--- 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 %}
-<!-- 页面底部开始： -->
+
     <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://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>
@@ -32,17 +34,18 @@
 		  </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>
+
+          var _gaq = _gaq || [];
+          _gaq.push(['_setAccount', '{{ settings.GOOGLE_ANALYTICS_KEY }}']);
+          _gaq.push(['_trackPageview']);
+
+          (function() {
+            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+          })();
+        </script>
     {% endif %}
-<!-- end template footer.html -->
+