diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:16:42 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:24:19 -0600 |
| commit | d62ae70552d2981a23010967bf80a7b68ca8b6a6 (patch) | |
| tree | 4c64217507c4a63b0a9973923259b362cc2b8eed /templates/footer.html | |
| parent | bf85bd2b1fd05126010b9384edcb086303bbeddf (diff) | |
| parent | cc378999abd39e070dbc87b482f022201a86b7fa (diff) | |
| download | askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.tar.gz askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.tar.bz2 askbot-d62ae70552d2981a23010967bf80a7b68ca8b6a6.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.po
templates/authopenid/sendpw.html
templates/authopenid/signin.html
templates/header.html
templates/index.html
templates/question_edit.html
Diffstat (limited to 'templates/footer.html')
| -rw-r--r-- | templates/footer.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/footer.html b/templates/footer.html index 66345cd6..08420563 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -13,13 +13,14 @@ </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." > + <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> <!-- 页面底部结束： --> + {% 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")); @@ -30,4 +31,5 @@ pageTracker._trackPageview(); } catch(err) {} </script> -<!-- end template footer.html --> + {% endif %} +<!-- end footer.html --> |