Merge branch 'evgenyfadeev/master'

Conflicts:
	.gitignore
	INSTALL
	TODO
	cnprog.wsgi
	django_authopenid/urls.py
	django_authopenid/views.py
	drop-all-tables.sh
	forum/auth.py
	forum/managers.py
	forum/models.py
	forum/templatetags/extra_tags.py
	forum/views.py
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	settings.py
	settings_local.py.dist
	sql_scripts/update_2009_01_25_001.sql
	sql_scripts/update_2009_02_26_001.sql
	sql_scripts/update_2009_04_10_001.sql
	templates/authopenid/confirm_email.txt
	templates/authopenid/sendpw_email.txt
	templates/content/js/compress.bat
	templates/content/js/flot-build.bat
	templates/content/style/style.css
	templates/footer.html
	templates/question.html
	templates/user_reputation.html
	templates/user_stats.html
	templates/user_votes.html
	templates/users_questions.html
	urls.py

1 files changed, 33 insertions, 19 deletions

diff --git a/templates/footer.html b/templates/footer.html
index 34064fd5..9d19b41e 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -3,33 +3,47 @@
 {% load i18n %}
 <!-- 页面底部开始： -->
     <div id="ground">
-       <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="{{ 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="{% url 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>
+			<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="{{ 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="{% url privacy %}">{% trans "privacy policy" %}</a><span class="link-separator"> |</span>
+                {% spaceless %}
+				<a href=
+                    {% if settings.FEEDBACK_SITE_URL %}
+                        "{{settings.FEEDBACK_SITE_URL}}"
+                        target="_blank">
+                    {% else %}
+                        "{% url feedback %}?next={{request.path}}">
+                    {% endif %}
+                    {% trans "give feedback" %}
+                </a>
+                {% endspaceless %}
+			</div>
+		  <p>
+			 <a href="http://github.com/cnprog/CNPROG/network" target="_blank">
+				powered by cnprog platform
+				<!--<img src="{% href "/content/images/djangomade124x25_grey.gif" %}" border="0" alt="Made with Django." title="Made with Django." >-->
+			 </a>
+		  </p>
+	   </div>
+		 <div id="licenseLogo">
+		  <a href="http://creativecommons.org/licenses/by/3.0/">
+					<img src="{% href "/content/images/cc-wiki.png" %}" title="Creative Commons: Attribution - Share Alike" alt="cc-wiki" width="50" height="68" />
+		  </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 }}");
+            var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
             pageTracker._trackPageview();
             } catch(err) {}
         </script>
-    {% endif %}
-<!-- end footer.html -->
+<!-- end template footer.html -->