Merge pull request #320 from edx/dsjen/soapbox

Added soapbox announcements to display per-page messages.

analytics_dashboard/settings/base.py

@@ -230,6 +230,7 @@
     'courses',
     'django_rjs',
     'help',
+    'soapbox',
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps

analytics_dashboard/templates/_announcement.html

@@ -0,0 +1,34 @@
+{% load i18n %}
+
+<div class="announcement-container"
+     data-dismiss-url="{{ dismiss_url }}"
+     data-view="announcement">
+    <div class="container">
+        <div class="row">
+            <div class="hidden-xs col-sm-1">
+                <div class="icon"><i class="fa fa-bullhorn"></i></div>
+            </div>
+
+            <div class="col-xs-10">
+                {% if message %}
+                    {{ message|safe }}
+                {% else %}
+                    <div class="message">
+                        <h1>{{ title }}</h1>
+                        <p>{{ body|safe }}</p>
+                    </div>
+                {% endif %}
+            </div>
+
+            {% if dismiss_url %}
+                <div class="col-xs-2 col-sm-1">
+                    {% csrf_token %}
+                    <a class="dismiss">
+                        <span aria-hidden="true"><i class="fa fa-times"></i></span>
+                        <span class="sr-only">{% trans "Close" %}</span>
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+    </div>
+</div>

analytics_dashboard/templates/announcements.html

@@ -1,32 +1,14 @@
-{% load announcements_tags i18n %}
+{% load soapbox %}
+{% load announcements_tags %}
 
-{% announcements as announcements_list %}
+{% get_messages_for_page view.page_name as soapbox_messages %}
+{% for message in soapbox_messages %}
+  {% include "_announcement.html" with message=message %}
+{% endfor %}
 
+{% announcements as announcements_list %}
 {% with announcements_list|first as announcement %}
   {% if announcement %}
-    <div class="announcement-container" data-dismiss-url="{{ announcement.dismiss_url }}"
-         data-view="announcement">
-      <div class="container">
-        {% csrf_token %}
-        <a class="dismiss">
-          <span aria-hidden="true"><i class="fa fa-times"></i></span><span class="sr-only">{% trans "Close" %}</span>
-        </a>
-
-        <div class="container">
-          <div class="row">
-            <div class="col-xs-1 col-md-1">
-              <div class="icon"><i class="fa fa-bullhorn"></i></div>
-            </div>
-
-            <div class="col-xs-9 col-md-9">
-              <div class="message">
-                <div class="title">{{ announcement.title }}</div>
-                <div class="body">{{ announcement.content|safe }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
+    {% include "_announcement.html" with body=announcement.content title=announcement.title dismiss_url=announcement.dismiss_url %}
   {% endif %}
 {% endwith %}

requirements/base.txt

@@ -7,6 +7,7 @@ django_compressor==1.4		# MIT
 django-countries==3.1.1     # MIT
 django-libsass==0.2			# BSD
 django-model-utils==1.5.0 	# BSD
+django-soapbox==1.1         # BSD
 django-waffle==0.10			# BSD
 
 # other versions cause a segment fault when running compression