[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit ed1f332b5835ecccf70185b0b151c6301926a6d4
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 10:57:50 2010 -0400

    Add support for messaging.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/config/settings/defaults/apps.py b/config/settings/defaults/apps.py
index ed9639d..b05ef0e 100644
--- a/config/settings/defaults/apps.py
+++ b/config/settings/defaults/apps.py
@@ -4,6 +4,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
+    'django.contrib.messages',
 
     'live_studio_www.auth',
     'live_studio_www.utils',
diff --git a/config/settings/defaults/middleware.py b/config/settings/defaults/middleware.py
index 39b8aaa..e2077c5 100644
--- a/config/settings/defaults/middleware.py
+++ b/config/settings/defaults/middleware.py
@@ -1,6 +1,7 @@
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 
     'live_studio_www.auth.middleware.RequireLoginMiddleware',
diff --git a/config/settings/defaults/templates.py b/config/settings/defaults/templates.py
index f2bb7a9..e4f18da 100644
--- a/config/settings/defaults/templates.py
+++ b/config/settings/defaults/templates.py
@@ -5,4 +5,5 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.request',
+    'django.contrib.messages.context_processors.messages',
 )
diff --git a/templates/base.html b/templates/base.html
index e76001c..4a960e7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,6 +10,14 @@
 <h1 id="title"><a href="{% url static:welcome %}">Debian Live Studio</a></h1>
 <h2 id="subtitle"><a href="{% url static:welcome %}">Live Debian systems!</a></h2>
 
+{% if messages %}
+<ul>
+    {% for message in messages %}
+    <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+    {% endfor %}
+</ul>
+{% endif %}
+
 <div id="body">
 <div id="content">
   {% block content %}{% endblock %}

-- 
live-studio