promoted a wiki article to the homepage

bhaugen · Jan 8, 2010 · 49de4e9 · 49de4e9
1 parent bfc5ad3
commit 49de4e9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/apps/wiki/templatetags/feature_tags.py b/apps/wiki/templatetags/feature_tags.py
@@ -0,0 +1,11 @@
+from django import template
+
+register = template.Library()
+
+from wiki.models import *
+
+@register.inclusion_tag('wiki/welcome_message.html')
+def show_welcome():
+    article = Article.objects.all().get_by("WelcomeMessage", None)
+    return {'article': article}
+
diff --git a/templates/homepage.html b/templates/homepage.html
@@ -1,5 +1,6 @@
 {% extends "site_base.html" %}
 
+{% load feature_tags %}
 {% load i18n %}
 
 {% block head_title %}Homepage{% endblock %}
@@ -8,19 +9,8 @@
 
 
 	{% if user.is_authenticated %}
-		<h1>Welcome to the Southwest Wisconsin Community Bio-fuel Site</h1>
-
-		<h3>
-			where we will keep each other up to date on the progress of our initiative and share knowledge. 
-		</h3>
-
-
-		<h2>{% trans "About this site" %}</h2>
-
-		<p>
-		    This site includes discussion topics, tasks, wikis, bookmarks, profiles and event notification options.
-		</p>
 
+		{% show_welcome %}
 
 
 	{% else %}

diff --git a/templates/wiki/welcome_message.html b/templates/wiki/welcome_message.html
@@ -0,0 +1,6 @@
+{% load markup_tags %}
+
+<div>
+{{ article.content|apply_markup:article.markup }}
+</div>
+