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, 55 insertions, 0 deletions

diff --git a/templates/post_contributor_info.html b/templates/post_contributor_info.html
new file mode 100644
index 00000000..9997be5f
--- /dev/null
+++ b/templates/post_contributor_info.html
@@ -0,0 +1,55 @@
+{% load i18n %}
+{% load smart_if %}
+{% load extra_tags %}
+<div class='post-update-info'>
+{% ifequal contributor_type "original_author" %}
+    {% if wiki %}
+        <p>{% trans "community wiki" %}</p>
+        <p>
+            {% blocktrans count post.revisions.all|length as rev_count %}
+                one revision
+            {% plural %}
+                {{rev_count}} revisions
+            {% endblocktrans %}
+        </p>
+        <p>{{post.author.get_profile_link}}</p>
+    {% else %}
+        <p style="line-height:12px;">
+            {% ifequal post_type "question" %}
+                {% trans "asked" %}
+            {% else %}
+                {% ifequal post_type "answer" %}
+                    {% trans "answered" %}
+                {% else %}
+                    {% trans "posted" %}
+                {% endifequal %}
+            {% endifequal %}
+            {% ifequal post_type "revision" %}
+                <strong>{% diff_date post.revised_at %}</strong>
+            {% else %}
+                <strong>{% diff_date post.added_at %}</strong>
+            {% endifequal %}
+        </p>
+        {% gravatar post.author 32 %}
+        <p>{{post.author.get_profile_link}}<br/>
+        {% get_score_badge post.author %}</p>
+    {% endif %}
+{% else %}
+    {% if post.last_edited_at %}
+        <p style="line-height:12px;">
+        {% ifequal post_type 'question' %}
+        <a href="{% url question_revisions post.id %}">
+        {% else %}
+        <a href="{% url answer_revisions post.id %}">
+        {% endifequal %}
+        {% trans "updated" %} <strong>{% diff_date post.last_edited_at %}</strong>
+        </a>
+        </p>
+        {% if post.author != post.last_edited_by or wiki %}
+            {% gravatar post.last_edited_by 32 %}
+            <p style="float:left">{{post.last_edited_by.get_profile_link}}<br/>
+            {% get_score_badge post.last_edited_by %}</p>
+        {% endif %}
+    {% endif %}
+{% endifequal %}
+</div>