Merge branch 'chinito/master'

3 files changed, 20 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index b929b531..759a0451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 settings_local.py
 nbproject
 settings_local.py
+log
+*.log
diff --git a/INSTALL b/INSTALL
index 35683147..0c5e76dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,9 +1,16 @@
 PRE-REQUIREMENTS:
 -----------------------------------------------
-1. Python2.5, MySQL, Django v1.0+
+0. We recommend you to use python-setuptools to install pre-requirement libraries.
+If you haven't installed it, please try to install it first.
+e.g, sudo apt-get install python-setuptools
+
+1. Python2.5/2.6, MySQL, Django v1.0/1.1
+Make sure mysql for python provider has been installed.
+sudo easy_install mysql-python
 
 2. Python-openid v2.2
 http://openidenabled.com/python-openid/
+sudo easy_install python-openid
 
 3. django-authopenid(Included in project already)
 http://code.google.com/p/django-authopenid/
@@ -11,21 +18,29 @@ http://code.google.com/p/django-authopenid/
 4. html5lib
 http://code.google.com/p/html5lib/
 Used for HTML sanitizer
+sudo easy_install html5lib
 
 5. Markdown2
 http://code.google.com/p/python-markdown2/
+sudo easy_install markdown2
 
 6. Django Debug Toolbar
 http://github.com/robhudson/django-debug-toolbar/tree/master
 
 INSTALL STEPS:
 -----------------------------------------------
+0. Make sure you have all above python libraries installed.
+
 1. Copy settings_local.py.dist to settings_local.py and 
 update all your settings. Check settings.py and update 
 it as well if necessory.
 
 2. Prepare your database by using the same database/account 
 configuration from above.
+e.g,
+create database cnprog DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
+grant all on cnprog.* to 'cnprog'@'localhost';
+And then run "python manage.py syncdb" to synchronize your database.
 
 3. Run "python manager.py runserver" to startup django 
 development environment.
diff --git a/templates/user_stats.html b/templates/user_stats.html
index bc49222f..b9c33e9f 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -22,12 +22,8 @@
                     </span>
                 </a>
                 <div class="answer-link">
-                    <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> 
-                    {% if answered_question.comment_count %}
-                    <span>
-				    {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %}
-                    </span> 
-                    {% endif %}
+                    <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span 
+					title="{% blocktrans with answered_question.comment_count as count %}the answer has been commented {{count}} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %}
                 </div>
             </div>
             {% endfor %}