Download as
Browse Code »

Commit 7a7f56e2e7277a55c871f3313babf4b77a314663

Authored by Gustavo Bernardo
1 parent 3549f475
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Changed items colors and topics only appear if there are any items [Issue:#251]

Showing 1 changed file with 30 additions and 36 deletions   Show diff stats
users/templates/users/search.html
  Diff comments   View file @7a7f56e
... ... @@ -5,7 +5,6 @@
5 5 <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
6 6 <script src="{% static 'js/file.js' %}"></script>
7 7 <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
8   - <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
9 8 <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
10 9 <script src="{% static 'js/modals_requisitions.js'%}"></script>
11 10 <script src="{% static 'js/modal_poll.js'%}"></script>
... ... @@ -21,47 +20,48 @@
21 20 {% block content %}
22 21 <div class="jumbotron">
23 22 <h3>Search Result:</h3> {{qtd}} items found
  23 +
  24 +{% if link_list %}
24 25 <div class="panel-group">
25 26 <div class="panel panel-default">
26 27 <div class="panel-heading">
27 28 <h4 class="panel-title">
28   - <a data-toggle="collapse" href="#Link" id="bot"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>
  29 + <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>
29 30 </h4>
30 31 </div>
31 32 <div id="Link" class="panel-collapse collapse">
32 33 <div class="panel-body">
33 34  
34   - {% if link_list %}
  35 +
35 36 {% for link in link_list %}
36 37 <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>
37 38 {% endfor %}
38 39 <div class = 'row' id ="divModalLink">
39 40  
40 41 </div>
41   - {% else %}
42   - {% trans 'No results found'%}
43   - {% endif%}
  42 +
44 43 </div>
45 44  
46 45 </div>
47 46 </div>
48 47 </div>
  48 +{% endif%}
  49 +
  50 +{% if file_list %}
49 51 <div class="panel-group">
50 52 <div class="panel panel-default">
51 53 <div class="panel-heading">
52 54 <h4 class="panel-title">
53   - <a data-toggle="collapse" href="#File" id="bot1"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>
  55 + <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>
54 56 </h4>
55 57 </div>
56 58 <div id="File" class="panel-collapse collapse">
57 59 <div class="panel-body">
58   - {% if file_list %}
  60 +
59 61 {% for file in file_list %}
60 62 <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>
61 63 {% endfor%}
62   - {% else %}
63   - {% trans 'No results found' %}
64   - {% endif %}
  64 +
65 65  
66 66 <div class="row" id="divModalFile">
67 67  
... ... @@ -72,65 +72,65 @@
72 72 </div>
73 73 </div>
74 74 </div>
  75 +{% endif %}
75 76  
  77 +{% if forum_list %}
76 78 <div class="panel-group">
77 79 <div class="panel panel-default">
78 80 <div class="panel-heading">
79 81 <h4 class="panel-title">
80   - <a data-toggle="collapse" href="#Forum" id="bot2"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>
  82 + <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>
81 83 </h4>
82 84 </div>
83 85 <div id="Forum" class="panel-collapse collapse">
84 86 <div class="panel-body">
85   - {% if forum_list %}
86 87 {% for forum in forum_list %}
87 88 <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>
88 89 {% endfor %}
89   - {% else %}
90   -
91   - {% trans 'No results found' %}
92 90  
93   - {% endif %}
94 91 </div>
95 92  
96 93 </div>
97 94 </div>
98 95 </div>
  96 +{% endif %}
  97 +
  98 +{% if exam_list %}
99 99 <div class="panel-group">
100 100 <div class="panel panel-default">
101 101 <div class="panel-heading">
102 102 <h4 class="panel-title">
103   - <a data-toggle="collapse" href="#Exam" id="bot3"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>
  103 + <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>
104 104 </h4>
105 105 </div>
106 106 <div id="Exam" class="panel-collapse collapse">
107 107 <div class="panel-body">
108   - {% if exam_list %}
  108 + {% for exam in exam_list %}
  109 + {{exam.name}}
  110 + {% endfor %}
109 111  
110   - {% else %}
111   - {% trans 'No results found' %}
112   - {% endif %}
113 112 </div>
114 113  
115 114 </div>
116 115 </div>
117 116 </div>
  117 +{% endif %}
  118 +
  119 +{% if poll_list %}
118 120 <div class="panel-group">
119 121 <div class="panel panel-default">
120 122 <div class="panel-heading">
121 123 <h4 class="panel-title">
122   - <a data-toggle="collapse" href="#Poll" id="bot4"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>
  124 + <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>
123 125 </h4>
124 126 </div>
125 127 <div id="Poll" class="panel-collapse collapse">
126 128 <div class="panel-body">
127   - {% if poll_list %}
  129 +
128 130 {% for poll in poll_list %}
129 131 <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>
130 132 {% endfor %}
131   - {% else %}
132   - {% trans 'No results found' %}
133   - {% endif %}
  133 +
134 134 <div class="row" id="modal_poll">
135 135  
136 136 </div>
... ... @@ -138,16 +138,10 @@
138 138 </div>
139 139 </div>
140 140 </div>
  141 +{% endif %}
141 142 </div>
142 143  
143   -<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
144   -<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
145   -<script>
146   - // set up all (import templates, set up navbar and set environment variables)
147   - Amadeus.load(function() {
148   - // set data to breadcrumb
149   - Amadeus.setBreadcrumb(null,'Home');
150   - });
151   -</script>
152 144  
  145 +<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
  146 +<script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>
153 147 {% endblock %}
... ...