summaryrefslogtreecommitdiffstats
path: root/templates/footer.html
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:20:28 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:20:28 -0600
commitd9cb7d5a4951fea405affebca6fb66c09bf36364 (patch)
treeb495904bab5b6dbef3454c8534415bf04b3bd892 /templates/footer.html
parente5129d3eb12ebc69fd969a1f6dd307e3cf610f4c (diff)
parent604bd7c1964dfed98c28ddf88bfe6711aef840da (diff)
downloadaskbot-d9cb7d5a4951fea405affebca6fb66c09bf36364.tar.gz
askbot-d9cb7d5a4951fea405affebca6fb66c09bf36364.tar.bz2
askbot-d9cb7d5a4951fea405affebca6fb66c09bf36364.zip
Merge branch 'evgenyfadeev/master' into experimental
Conflicts: forum/models.py templates/footer.html templates/header.html templates/index.html urls.py
Diffstat (limited to 'templates/footer.html')
-rw-r--r--templates/footer.html61
1 files changed, 33 insertions, 28 deletions
diff --git a/templates/footer.html b/templates/footer.html
index 55fe5b1c..d6837577 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,28 +1,33 @@
-{% load extra_tags %}
-{% load i18n %}
- <div id="ground">
- <div class="footerLinks" >
- <a href="/sobre">{% trans "About us" %}</a><span class="link-separator"> |</span>
- <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
- <a href="http://blog.cnprog.com">Blog</a><span class="link-separator"> |</span>
- <a href="mailto:team@cnprog.com">{% trans "Contact" %}</a><span class="link-separator"> |</span>
- <a href="/privacidad">{% trans "Privacy" %}</a><span class="link-separator"> |</span>
- <a href="http://cnprog.uservoice.com" target="_blank">{% trans "Feedback" %}</a>
- </div>
- <!--<p style="margin-top:10px;">
- <a href="http://code.google.com/p/cnprog/" target="_blank">
- <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." >
- </a>
- </p>-->
- <p style="margin-top:-30px; margin-right:15px;" class="fright"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
- </div>
- <!--<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("UA-248512-5");
- pageTracker._trackPageview();
- } catch(err) {}
- </script>-->
+<!-- template footer.html -->
+{% load extra_tags %}
+{% load i18n %}
+<!-- 页面底部开始: -->
+ <div id="ground">
+ <div class="footerLinks" >
+ <a href="/sobre">{% trans "About us" %}</a><span class="link-separator"> |</span>
+ <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+ <a href="http://blog.cnprog.com">Blog</a><span class="link-separator"> |</span>
+ <a href="mailto:team@cnprog.com">{% trans "Contact" %}</a><span class="link-separator"> |</span>
+ <a href="/privacidad">{% trans "Privacy" %}</a><span class="link-separator"> |</span>
+ <a href="http://cnprog.uservoice.com" target="_blank">{% trans "Feedback" %}</a>
+ </div>
+ <!--<p style="margin-top:10px;">
+ <a href="http://code.google.com/p/cnprog/" target="_blank">
+ <img src="/content/images/djangomade124x25_grey.gif" border="0" alt="Made with Django." title="Made with Django." >
+ </a>
+ <!--<div style="font-size:90%;color:#333">{% trans "current revision" %}: R-0120-20090406</div>-->
+ </p>-->
+ <p id="licenseLogo"><img src="/content/images/cc-wiki.png" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" /></p>
+ </div>
+ <!-- 页面底部结束: -->
+ <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>
+<!-- end template footer.html -->