From 1cbbc10ec680da017745add73b98986197988bd3 Mon Sep 17 00:00:00 2001
From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 25 May 2010 21:28:23 +0000
Subject: [PATCH] Visual indication of community wiki, and made the
 markddown_help use base_content so it can use the entire width of the page.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@329 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 forum/skins/default/media/images/wiki.png     | Bin 0 -> 5349 bytes
 forum/skins/default/media/style/style.css     |  36 +++++++++---------
 .../default/templates/markdown_help.html      |   2 +-
 .../default/templates/node/wiki_symbol.html   |  11 ++++++
 forum/skins/default/templates/question.html   |  15 ++++----
 forum/templatetags/node_tags.py               |  18 ++++++++-
 6 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 forum/skins/default/media/images/wiki.png
 create mode 100644 forum/skins/default/templates/node/wiki_symbol.html

diff --git a/forum/skins/default/media/images/wiki.png b/forum/skins/default/media/images/wiki.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6be55888ebb48fe73c198312b01854a64cf9dfa
GIT binary patch
literal 5349
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
Dh}sVh

literal 0
HcmV?d00001

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index a9d2072..133d8ec 100644
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -638,22 +638,6 @@ a.medal:hover {
 	text-align: center;
 }
 
-.vote-notification {
-	background-color: darkred;
-	color: White;
-	cursor: pointer;
-	display: none;
-	padding: 15px;
-	position: absolute;
-	text-align: center;
-	z-index: 1;
-}
-
-.vote-notification a {
-	color: White;
-	text-decoration: underline;
-}
-
 span.form-error {
 	color: #990000;
 	font-weight: normal;
@@ -1115,13 +1099,21 @@ ul.form-horizontal-rows li input {
 	padding-bottom: 10px;
 }
 
-.post-controls {
+.post-controls, .tags-container {
 	font-size: 11px;
 	line-height: 12px;
 	margin-bottom: 5px;
 	min-width: 200px;
 }
 
+.tags-container {
+    margin: 0 0 16px 0;    
+}
+
+.post-controls {
+    float: left;
+}
+
 #question-controls .tags { margin: 0 0 3px; }
 
 .post-update-info {
@@ -1176,6 +1168,16 @@ a.post-vote.down.on,a.post-vote.down:hover { background: url("../images/vote-arr
 a.accept-answer { background: url("../images/vote-accepted.png") no-repeat scroll center center transparent; }
 a.accept-answer.on,a.accept-answer:hover { background: url("../images/vote-accepted-on.png") no-repeat scroll center center transparent; }
 
+.community-wiki {
+    font-size: 11px;
+    color: #333;
+    background: url("../images/wiki.png") no-repeat left center;
+    padding-left: 46px;
+    margin: 12px 0 32px 0;
+    min-height: 32px;
+    line-height: 14px;
+}
+
 .post-score, .comments-char-left-count {
 	color: #777777;
 	font-family: Arial;
diff --git a/forum/skins/default/templates/markdown_help.html b/forum/skins/default/templates/markdown_help.html
index a54334b..bb646cb 100644
--- a/forum/skins/default/templates/markdown_help.html
+++ b/forum/skins/default/templates/markdown_help.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_content.html" %}
 {% load extra_tags %}
 {% load humanize %}
 {% load i18n %}
diff --git a/forum/skins/default/templates/node/wiki_symbol.html b/forum/skins/default/templates/node/wiki_symbol.html
new file mode 100644
index 0000000..3146a97
--- /dev/null
+++ b/forum/skins/default/templates/node/wiki_symbol.html
@@ -0,0 +1,11 @@
+{% load i18n extra_tags %}
+{% spaceless %}
+{% if is_wiki %}
+    <div class="community-wiki">
+        {% blocktrans %}This {{ post_type }} is marked "community wiki".{% endblocktrans %}
+        {% if can_edit %}
+            <br />{% blocktrans %}Feel free to <a href="{{ edit_url }}">edit it</a>.{% endblocktrans %}
+        {% endif %}
+    </div>
+{% endif %}
+{% endspaceless %}
\ No newline at end of file
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 7fb9d9d..9a33846 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -76,14 +76,15 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-                            <div id="question-controls" class="post-controls">
-                                <div id="question-tags" class="tags">
-                                    {% for tag in question.tagname_list %}
-                                        <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
-                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
-                                    {% endfor %}
-                                </div>
+                            <div id="question-tags" class="tags-container tags">
+                                {% for tag in question.tagname_list %}
+                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
+                                        title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
+                                {% endfor %}
+                            </div>
+                            <div id="question-controls" class="post-controls">                            
                                 {% post_controls question request.user %}
+                                {% wiki_symbol request.user question %}
                             </div>
                             <div class="post-update-info-container">
                                     {% contributors_info question %}
diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 7ade554..f124761 100644
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -26,6 +26,22 @@ def accept_button(answer, user):
         'user': user
     }
 
+@register.inclusion_tag('node/wiki_symbol.html')
+def wiki_symbol(user, post):
+    context = {
+        'is_wiki': post.nis.wiki,
+        'post_type': post.friendly_name
+    }
+
+    if post.nis.wiki:
+        if user.can_edit_post(post):
+            context['can_edit'] = True
+            context['edit_url'] = reverse('edit_' + post.node_type, kwargs={'id': post.id})
+        context['by'] = post.nstate.wiki.by.username
+        context['at'] = post.nstate.wiki.at
+
+    return context
+
 @register.inclusion_tag('node/favorite_mark.html')
 def favorite_mark(question, user):
     try:
@@ -46,7 +62,7 @@ def post_controls(post, user):
     menu = []
 
     if user.is_authenticated():
-        post_type = (post.__class__ is Question) and 'question' or 'answer'
+        post_type = post.node_type
 
         if post_type == "answer":
             controls.append(post_control(_('permanent link'), '#%d' % post.id, title=_("answer permanent link")))
-- 
2.39.5