Merge pull request #1705 from learning-unlimited/hide-announcements

Changed fruitsalad theme to hide announcements box if there are no announcements

Author: jmoldow

esp/esp/themes/theme_data/fruitsalad/templates/main.html

@@ -141,11 +141,10 @@
 {% block content_header %}
 <div id="content_header">
 <div class="corners"><div class="ul"></div><div class="ur"></div></div>
+
+<h1 class="title">{% block content_title %}&nbsp;{% endblock %}</h1>
 {% if request.path|equal:"/teach/index.html" or request.path|equal:"/learn/index.html" %}
 
-{# announcements #}
-<div id="divannouncements">
-<ul>
 {% load preview %}
 
 {% if request.path|equal:"/teach/index.html" %}
@@ -154,6 +153,13 @@
     {% miniblog_for_user AnonymousUser as announcements learn 3 %}
 {% endif %}
 
+{% if not announcements.announcementList|length_is:0 %}
+
+{# announcements #}
+<div id="divannouncements">
+<ul>
+
+
 {% for announce in announcements.announcementList %}
        <li>
         {% with announceUrl=announce.get_absolute_url %}
@@ -174,8 +180,7 @@ <h1>{{ announce.category|default:"" }}</h1>
 <div id="divannouncemore">
   <a href="/myesp/home/">more announcements...</a></div>
 {% endif %}
-{% else %}
-<h1 class="title">{% block content_title %}&nbsp;{% endblock %}</h1>
+{% endif %}
 {% endif %}
 </div>
 {% endblock %}