From 7a7f56e2e7277a55c871f3313babf4b77a314663 Mon Sep 17 00:00:00 2001
From: Gustavo Bernardo <Gustavo Bernardo>
Date: Thu, 10 Nov 2016 09:05:29 -0300
Subject: [PATCH] Changed items colors and topics only appear if there are any items [Issue:#251]

---
 users/templates/users/search.html | 66 ++++++++++++++++++++++++++++++------------------------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/users/templates/users/search.html b/users/templates/users/search.html
index 256504a..a760525 100644
--- a/users/templates/users/search.html
+++ b/users/templates/users/search.html
@@ -5,7 +5,6 @@
    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
    <script src="{% static 'js/file.js' %}"></script>
    <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
-   <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
    <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
    <script src="{% static 'js/modals_requisitions.js'%}"></script>
    <script src="{% static 'js/modal_poll.js'%}"></script>
@@ -21,47 +20,48 @@
 {% block content %}
 <div class="jumbotron">
 <h3>Search Result:</h3> {{qtd}} items found
+
+{% if link_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Link" id="bot"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>
+        <a data-toggle="collapse" href="#Link" id="bot" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>
       </h4>
     </div>
     <div id="Link" class="panel-collapse collapse">
       <div class="panel-body">
 
-        {% if link_list %}
+
           {% for link in link_list %}
               <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
           {% endfor %}
           <div class = 'row' id ="divModalLink">
 
           </div>
-        {% else %}
-          {% trans 'No results found'%}
-        {% endif%}
+
       </div>
 
     </div>
   </div>
 </div>
+{% endif%}
+
+{% if file_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#File" id="bot1"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>
+        <a data-toggle="collapse" href="#File" id="bot1" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>
       </h4>
     </div>
     <div id="File" class="panel-collapse collapse">
       <div class="panel-body">
-      {% if file_list %}
+
           {% for file in file_list %}
               <li id="file_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{% url 'course:file_material_view' file.slug %}" target="_blank">{{ file.name }}</a></li>
           {% endfor%}
-      {% else %}
-          {% trans 'No results found' %}
-      {% endif %}
+
 
       <div class="row" id="divModalFile">
 
@@ -72,65 +72,65 @@
     </div>
   </div>
 </div>
+{% endif %}
 
+{% if forum_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Forum" id="bot2"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>
+        <a data-toggle="collapse" href="#Forum" id="bot2" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>
       </h4>
     </div>
     <div id="Forum" class="panel-collapse collapse">
       <div class="panel-body">
-        {% if forum_list %}
               {% for forum in forum_list %}
               <li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>
               {% endfor %}
-          {% else %}
-
-            {% trans 'No results found' %}
 
-          {% endif %}
       </div>
 
     </div>
   </div>
 </div>
+{% endif %}
+
+{% if exam_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-       <a data-toggle="collapse" href="#Exam" id="bot3"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>
+       <a data-toggle="collapse" href="#Exam" id="bot3" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>
       </h4>
     </div>
     <div id="Exam" class="panel-collapse collapse">
       <div class="panel-body">
-        {% if exam_list %}
+        {% for exam in exam_list %}
+              {{exam.name}}
+        {% endfor %}
 
-        {% else %}
-            {% trans 'No results found' %}
-        {% endif %}
       </div>
 
     </div>
   </div>
 </div>
+{% endif %}
+
+{% if poll_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Poll" id="bot4"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>
+        <a data-toggle="collapse" href="#Poll" id="bot4" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>
       </h4>
     </div>
     <div id="Poll" class="panel-collapse collapse">
       <div class="panel-body">
-            {% if poll_list %}
+
               {% for poll in poll_list %}
                   <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
               {% endfor %}
-            {% else %}
-                {% trans 'No results found' %}
-            {% endif %}
+
             <div class="row" id="modal_poll">
 
             </div>
@@ -138,16 +138,10 @@
     </div>
   </div>
 </div>
+{% endif %}
 </div>
 
-<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
-<script>
-        // set up all (import templates, set up navbar and set environment variables)
-        Amadeus.load(function() {
-          // set data to breadcrumb
-          Amadeus.setBreadcrumb(null,'Home');
-        });
-</script>
 
+<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
+<script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>
 {% endblock %}
--
libgit2 0.21.2