Fixed #416 — removed announcements completely from cms_project_*

googletorp · Aug 27, 2009 · 4505512 · 4505512
1 parent 89cf40c
commit 4505512
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 28 deletions.
diff --git a/pinax/projects/cms_project_company/settings.py b/pinax/projects/cms_project_company/settings.py
@@ -113,7 +113,6 @@
     "pinax.core.context_processors.pinax_settings",
 
     "notification.context_processors.notification",
-    "announcements.context_processors.site_wide_announcements",
     "account.context_processors.openid",
     "account.context_processors.account",
 )

diff --git a/pinax/projects/cms_project_company/templates/base.html b/pinax/projects/cms_project_company/templates/base.html
@@ -16,19 +16,6 @@
 <body>
 <div id="color-wrapper">
 
-    {% if site_wide_announcements %}
-    <div id="site_wide_announcements">
-        <ul>
-            {% for announcement in site_wide_announcements %}
-            <li>
-                <a href="{{ announcement.get_absolute_url }}">{{ announcement }}</a> -
-                <a href="{% url announcement_hide announcement.pk %}?next={{ request.path }}">{% trans "Hide announcement" %}</a>
-            </li>
-            {% endfor %}
-        </ul>
-    </div>
-    {% endif %}
-
     {% block website_title %}{% endblock %}
 
     <div id="outline">

diff --git a/pinax/projects/cms_project_holidayhouse/settings.py b/pinax/projects/cms_project_holidayhouse/settings.py
@@ -113,7 +113,6 @@
     "pinax.core.context_processors.pinax_settings",
 
     "notification.context_processors.notification",
-    "announcements.context_processors.site_wide_announcements",
     "account.context_processors.openid",
     "account.context_processors.account",
 )

diff --git a/pinax/projects/cms_project_holidayhouse/templates/base.html b/pinax/projects/cms_project_holidayhouse/templates/base.html
@@ -16,19 +16,6 @@
 <body>
 <div id="color-wrapper">
 
-    {% if site_wide_announcements %}
-    <div id="site_wide_announcements">
-        <ul>
-            {% for announcement in site_wide_announcements %}
-            <li>
-                <a href="{{ announcement.get_absolute_url }}">{{ announcement }}</a> -
-                <a href="{% url announcement_hide announcement.pk %}?next={{ request.path }}">{% trans "Hide announcement" %}</a>
-            </li>
-            {% endfor %}
-        </ul>
-    </div>
-    {% endif %}
-
     {% block website_title %}{% endblock %}
 
     <div id="outline">