From bb801f2bbd9f26bebca846b71e8947a1951f86a5 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:11:34 -0400
Subject: english translation

---
 templates/footer.html | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'templates/footer.html')

diff --git a/templates/footer.html b/templates/footer.html
index 46649b9f..61e6e6bb 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,28 +1,33 @@
-{% load extra_tags %}
+<!-- template footer.html -->
+{% load extra_tags %}
 {% load i18n %}
+<!-- 页面底部开始： -->
     <div id="ground">
         <div class="footerLinks" >
-            <a href="/about">{% trans "About us" %}</a><span class="link-separator"> |</span>
+            <a href="/about">{% trans "about" %}</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="/privacy">{% trans "Privacy" %}</a><span class="link-separator"> |</span>
-            <a href="http://cnprog.uservoice.com" target="_blank">{% trans "Feedback" %}</a>
+            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
+            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
+            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+            <a href="{{ feedback_url }}" target="_blank">{% trans "give 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 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>
+	  <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("UA-248512-5");
+            var pageTracker = _gat._getTracker({{ google_analytics_key }});
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
+<!-- end template footer.html -->
-- 
cgit v1.2.3-1-g7c22


From 5b45e526c74faf55110ff0afdcba19797d7e0f4d Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:14:09 -0400
Subject: deleted all

---
 templates/footer.html | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 templates/footer.html

(limited to 'templates/footer.html')

diff --git a/templates/footer.html b/templates/footer.html
deleted file mode 100644
index 61e6e6bb..00000000
--- a/templates/footer.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- template footer.html -->
-{% load extra_tags %}
-{% load i18n %}
-<!-- 页面底部开始： -->
-    <div id="ground">
-        <div class="footerLinks" >
-            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
-            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
-            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-            <a href="{{ feedback_url }}" target="_blank">{% trans "give 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({{ google_analytics_key }});
-            pageTracker._trackPageview();
-            } catch(err) {}
-        </script>
-<!-- end template footer.html -->
-- 
cgit v1.2.3-1-g7c22


From 35b666224a05fbd249b1c51a0a48fb95b246fe9a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:15:28 -0400
Subject: adding all files again

---
 templates/footer.html | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 templates/footer.html

(limited to 'templates/footer.html')

diff --git a/templates/footer.html b/templates/footer.html
new file mode 100644
index 00000000..61e6e6bb
--- /dev/null
+++ b/templates/footer.html
@@ -0,0 +1,33 @@
+<!-- template footer.html -->
+{% load extra_tags %}
+{% load i18n %}
+<!-- 页面底部开始： -->
+    <div id="ground">
+        <div class="footerLinks" >
+            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
+            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
+            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
+            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+            <a href="{{ feedback_url }}" target="_blank">{% trans "give 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({{ google_analytics_key }});
+            pageTracker._trackPageview();
+            } catch(err) {}
+        </script>
+<!-- end template footer.html -->
-- 
cgit v1.2.3-1-g7c22


From 3b8b4293ee9f029235526fdef8f68883e52a4a32 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:25:57 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages

---
 templates/footer.html | 66 +++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'templates/footer.html')

diff --git a/templates/footer.html b/templates/footer.html
index 61e6e6bb..207104ce 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -1,33 +1,33 @@
-<!-- template footer.html -->
-{% load extra_tags %}
-{% load i18n %}
-<!-- 页面底部开始： -->
-    <div id="ground">
-        <div class="footerLinks" >
-            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
-            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
-            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
-            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
-            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
-            <a href="{{ feedback_url }}" target="_blank">{% trans "give 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({{ google_analytics_key }});
-            pageTracker._trackPageview();
-            } catch(err) {}
-        </script>
-<!-- end template footer.html -->
+<!-- template footer.html -->
+{% load extra_tags %}
+{% load i18n %}
+<!-- 页面底部开始： -->
+    <div id="ground">
+        <div class="footerLinks" >
+            <a href="/about">{% trans "about" %}</a><span class="link-separator"> |</span>
+            <a href="/faq">{% trans "faq" %}</a><span class="link-separator"> |</span>
+            <a href="{{ blog_url }}">{% trans "blog" %}</a><span class="link-separator"> |</span>
+            <a href="{{ webmaster_email }}">{% trans "contact us" %}</a><span class="link-separator"> |</span>
+            <a href="/privacy">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+            <a href="{{ feedback_url }}" target="_blank">{% trans "give 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({{ google_analytics_key }});
+            pageTracker._trackPageview();
+            } catch(err) {}
+        </script>
+<!-- end template footer.html -->
-- 
cgit v1.2.3-1-g7c22


From 56f02677940a00f04780cfb361fc65950e910bf8 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 templates/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/footer.html')

diff --git a/templates/footer.html b/templates/footer.html
index 207104ce..637ca0d8 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -26,7 +26,7 @@
             </script>
             <script type="text/javascript">
             try {
-            var pageTracker = _gat._getTracker({{ google_analytics_key }});
+            var pageTracker = _gat._getTracker({{ settings.GOOGLE_ANALYTICS_KEY }});
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-- 
cgit v1.2.3-1-g7c22