Download as
Browse Code »

Commit c7545686d5b35a03739ed8fc2a4ea8cc87b975ec

Authored by Zambom
1 parent 35a9a0b8
Exists in master and in 2 other branches amadeus_univasf, refactoring

Standardizing subject views

Showing 11 changed files with 116 additions and 129 deletions   Show diff stats
amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
View file @c754568
No preview for this file type
amadeus/static/css/base/amadeus.css
  Diff comments   View file @c754568
@@ -1573,7 +1573,7 @@ div.dataTables_wrapper div.dataTables_paginate { @@ -1573,7 +1573,7 @@ div.dataTables_wrapper div.dataTables_paginate {
1573 } 1573 }
1574 1574
1575 .chat-panel .chat-collapse { 1575 .chat-panel .chat-collapse {
1576 - padding: 15px 0px; 1576 + padding: 0px 0px;
1577 } 1577 }
1578 1578
1579 .participants-list { 1579 .participants-list {
amadeus/static/css/themes/green.css
  Diff comments   View file @c754568
@@ -135,9 +135,6 @@ a, a:focus, a:hover { @@ -135,9 +135,6 @@ a, a:focus, a:hover {
135 .pendencies-content { 135 .pendencies-content {
136 background: #FFFFFF; } 136 background: #FFFFFF; }
137 137
138 -.pendencies-content .core-subjects-options li {  
139 - background: #F5F5F5; }  
140 -  
141 .category-header i { 138 .category-header i {
142 color: white; } 139 color: white; }
143 140
@@ -459,6 +456,9 @@ a.add-row { @@ -459,6 +456,9 @@ a.add-row {
459 .suggestions { 456 .suggestions {
460 background: #FFFFFF; } 457 background: #FFFFFF; }
461 458
  459 +.subject-related-panel {
  460 + background: #F5F5F5 !important; }
  461 +
462 .mural-ungeneral { 462 .mural-ungeneral {
463 background: #EEE; } 463 background: #EEE; }
464 464
amadeus/static/css/themes/green.css.map
  Diff comments   View file @c754568
1 { 1 {
2 "version": 3, 2 "version": 3,
3 -"mappings": "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", 3 +"mappings": "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",
4 "sources": ["green.sass"], 4 "sources": ["green.sass"],
5 "names": [], 5 "names": [],
6 "file": "green.css" 6 "file": "green.css"
amadeus/static/css/themes/green.sass
  Diff comments   View file @c754568
@@ -194,10 +194,6 @@ a, a:focus, a:hover @@ -194,10 +194,6 @@ a, a:focus, a:hover
194 background: $white 194 background: $white
195 195
196 196
197 -.pendencies-content .core-subjects-options li  
198 - background: $default-white  
199 -  
200 -  
201 .category-header i 197 .category-header i
202 color: white 198 color: white
203 199
@@ -628,6 +624,8 @@ a.add-row @@ -628,6 +624,8 @@ a.add-row
628 .suggestions 624 .suggestions
629 background: $white 625 background: $white
630 626
  627 +.subject-related-panel
  628 + background: #F5F5F5 !important
631 629
632 .mural-ungeneral 630 .mural-ungeneral
633 background: #EEE 631 background: #EEE
chat/templates/chat/subject_view.html
  Diff comments   View file @c754568
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="row"> 24 <div class="row">
25 <div class="col-md-12 category-header"> 25 <div class="col-md-12 category-header">
26 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> 26 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
27 - <span>{{subject.name}}</span> 27 + <span>{{subject.name}} / {% trans 'Messages' %}</span>
28 </h4> 28 </h4>
29 29
30 <div class="col-md-5 pull-right category-card-items"> 30 <div class="col-md-5 pull-right category-card-items">
@@ -46,31 +46,31 @@ @@ -46,31 +46,31 @@
46 </div> 46 </div>
47 </div> 47 </div>
48 </div> 48 </div>
49 - <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse">  
50 - <div class="panel panel-default">  
51 - <div class="panel-body">  
52 - <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">  
53 - <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">  
54 - <div class="form-group">  
55 - <div class="col-md-10 col-sm-9 col-xs-10">  
56 - <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 49 + <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse subject-related-panel">
  50 + <div class="panel category-panel-content panel-body">
  51 + <div class="panel panel-default">
  52 + <div class="panel-body">
  53 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
  54 + <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">
  55 + <div class="form-group">
  56 + <div class="col-md-10 col-sm-9 col-xs-10">
  57 + <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
  58 + </div>
  59 + <div class="col-md-1 col-sm-1 col-xs-1">
  60 + <button type="submit" class="btn btn-fab btn-fab-mini">
  61 + <i class="fa fa-search"></i>
  62 + </button>
  63 + </div>
57 </div> 64 </div>
58 - <div class="col-md-1 col-sm-1 col-xs-1">  
59 - <button type="submit" class="btn btn-fab btn-fab-mini">  
60 - <i class="fa fa-search"></i>  
61 - </button>  
62 - </div>  
63 - </div>  
64 - </form>  
65 - </div>  
66 - <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">  
67 - <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 65 + </form>
  66 + </div>
  67 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
  68 + <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
  69 + </div>
68 </div> 70 </div>
69 </div> 71 </div>
70 - </div>  
71 72
72 - {% if conversations.count > 0 %}  
73 - <div class="panel category-panel-content panel-body"> 73 + {% if conversations.count > 0 %}
74 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2> 74 <h2 class="my-subjects-title"><b>{% trans 'Conversations' %}</b></h2>
75 75
76 <div class="talks-group"> 76 <div class="talks-group">
@@ -80,13 +80,13 @@ @@ -80,13 +80,13 @@
80 </div> 80 </div>
81 81
82 {% pagination request paginator page_obj %} 82 {% pagination request paginator page_obj %}
83 - </div>  
84 - {% else %}  
85 - <div class="text-center no-subjects">  
86 - <i class="fa fa-envelope-o"></i>  
87 - <h4>{% trans 'You do not posses messages in this space yet.' %}</h4>  
88 - </div>  
89 - {% endif %} 83 + {% else %}
  84 + <div class="text-center no-subjects">
  85 + <i class="fa fa-envelope-o"></i>
  86 + <h4>{% trans 'You do not posses messages in this space yet.' %}</h4>
  87 + </div>
  88 + {% endif %}
  89 + </div>
90 </div> 90 </div>
91 </div> 91 </div>
92 92
chat/templates/chat/subject_view_participants.html
  Diff comments   View file @c754568
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="row"> 28 <div class="row">
29 <div class="col-md-12 category-header"> 29 <div class="col-md-12 category-header">
30 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> 30 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
31 - <span>{{subject.name}}</span> 31 + <span>{{subject.name}} / {% trans 'Messages' %}</span>
32 </h4> 32 </h4>
33 33
34 <div class="col-md-5 pull-right category-card-items"> 34 <div class="col-md-5 pull-right category-card-items">
@@ -51,30 +51,30 @@ @@ -51,30 +51,30 @@
51 </div> 51 </div>
52 </div> 52 </div>
53 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse"> 53 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse">
54 - <div class="panel panel-default">  
55 - <div class="panel-body">  
56 - <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">  
57 - <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">  
58 - <div class="form-group">  
59 - <div class="col-md-10 col-sm-9 col-xs-10">  
60 - <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 54 + <div class="panel category-panel-content panel-body">
  55 + <div class="panel panel-default">
  56 + <div class="panel-body">
  57 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
  58 + <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">
  59 + <div class="form-group">
  60 + <div class="col-md-10 col-sm-9 col-xs-10">
  61 + <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
  62 + </div>
  63 + <div class="col-md-1 col-sm-1 col-xs-1">
  64 + <button type="submit" class="btn btn-fab btn-fab-mini">
  65 + <i class="fa fa-search"></i>
  66 + </button>
  67 + </div>
61 </div> 68 </div>
62 - <div class="col-md-1 col-sm-1 col-xs-1">  
63 - <button type="submit" class="btn btn-fab btn-fab-mini">  
64 - <i class="fa fa-search"></i>  
65 - </button>  
66 - </div>  
67 - </div>  
68 - </form>  
69 - </div>  
70 - <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">  
71 - <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 69 + </form>
  70 + </div>
  71 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
  72 + <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
  73 + </div>
72 </div> 74 </div>
73 </div> 75 </div>
74 - </div>  
75 76
76 - {% if participants.count > 0 %}  
77 - <div class="panel category-panel-content panel-body"> 77 + {% if participants.count > 0 %}
78 <h2 class="my-subjects-title"><b>{% trans 'Participants' %}</b></h2> 78 <h2 class="my-subjects-title"><b>{% trans 'Participants' %}</b></h2>
79 79
80 <div class="talks-group"> 80 <div class="talks-group">
@@ -84,13 +84,13 @@ @@ -84,13 +84,13 @@
84 </div> 84 </div>
85 85
86 {% pagination request paginator page_obj %} 86 {% pagination request paginator page_obj %}
87 - </div>  
88 - {% else %}  
89 - <div class="text-center no-subjects">  
90 - <i class="fa fa-envelope-o"></i>  
91 - <h4>{% trans 'There is no other participants in this space yet.' %}</h4>  
92 - </div>  
93 - {% endif %} 87 + {% else %}
  88 + <div class="text-center no-subjects">
  89 + <i class="fa fa-envelope-o"></i>
  90 + <h4>{% trans 'There is no other participants in this space yet.' %}</h4>
  91 + </div>
  92 + {% endif %}
  93 + </div>
94 </div> 94 </div>
95 </div> 95 </div>
96 96
mural/templates/mural/subject_view.html
  Diff comments   View file @c754568
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="row"> 24 <div class="row">
25 <div class="col-md-12 category-header"> 25 <div class="col-md-12 category-header">
26 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> 26 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
27 - <span>{{subject.name}}</span> 27 + <span>{{subject.name}} / {% trans 'Mural' %}</span>
28 </h4> 28 </h4>
29 29
30 <div class="col-md-5 pull-right category-card-items"> 30 <div class="col-md-5 pull-right category-card-items">
@@ -41,16 +41,11 @@ @@ -41,16 +41,11 @@
41 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li> 41 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
42 </ul> 42 </ul>
43 {% endif %} 43 {% endif %}
44 -  
45 - <a href="{% url 'mural:subject_view' subject.slug %}" class="pull-right action_icon">  
46 - <i class="fa fa-list" aria-hidden="true"></i>  
47 - {% mural_number subject request.user %}  
48 - </a>  
49 </div> 44 </div>
50 </div> 45 </div>
51 </div> 46 </div>
52 </div> 47 </div>
53 - <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral"> 48 + <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse mural-ungeneral subject-related-panel">
54 <div class="col-md-12 cards-content mural" data-url="{% url 'mural:subject_view' subject.slug %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}"> 49 <div class="col-md-12 cards-content mural" data-url="{% url 'mural:subject_view' subject.slug %}" data-pages="{{ paginator.num_pages }}" data-page="{{ page_obj.number }}" data-fav="{{ favorites }}" data-mine="{{ mines }}">
55 <div class="col-md-9 col-sm-9 col-xs-9 mural-list"> 50 <div class="col-md-9 col-sm-9 col-xs-9 mural-list">
56 <div class="post_make panel panel-default"> 51 <div class="post_make panel panel-default">
notifications/templates/notifications/subject.html
  Diff comments   View file @c754568
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
10 {% endblock %} 10 {% endblock %}
11 11
12 {% block content %} 12 {% block content %}
13 - <h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}</h5>  
14 {% if subject.visible %} 13 {% if subject.visible %}
15 <div class="panel panel-info subject-panel"> 14 <div class="panel panel-info subject-panel">
16 <div class="panel-heading"> 15 <div class="panel-heading">
@@ -21,12 +20,13 @@ @@ -21,12 +20,13 @@
21 <div class="row"> 20 <div class="row">
22 <div class="col-md-12 category-header"> 21 <div class="col-md-12 category-header">
23 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px"> 22 <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
24 - <span>{% trans 'Pendencies' %}</span> 23 + <span>{{ subject }} / {% trans 'Pendencies' %}</span>
25 </h4> 24 </h4>
26 </div> 25 </div>
27 </div> 26 </div>
28 </div> 27 </div>
29 - <div id="{{subject.slug}}" class="panel-collapse in collapse pendencies-content"> 28 + <div id="{{subject.slug}}" class="panel-collapse in collapse pendencies-content subject-related-panel">
  29 + <h5>{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}</h5>
30 <div id="core-subjects-options-div"> 30 <div id="core-subjects-options-div">
31 <ul class="core-subjects-options"> 31 <ul class="core-subjects-options">
32 <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a> 32 <a href="{% url 'notifications:view' subject.slug %}"><li {% if not history %} class="active" {% endif %}>{% trans "Actual Pendencies" %} ({{ total }})</li></a>
reports/templates/reports/create.html
  Diff comments   View file @c754568
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{ block.super }} 8 {{ block.super }}
9 {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %} 9 {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
10 {% breadcrumb subject 'subjects:view' subject.slug %} 10 {% breadcrumb subject 'subjects:view' subject.slug %}
11 - {% breadcrumb 'analytics' '' %} 11 + {% breadcrumb 'Analytics' '' %}
12 {% endblock %} 12 {% endblock %}
13 13
14 {% block javascript %} 14 {% block javascript %}
@@ -20,33 +20,33 @@ @@ -20,33 +20,33 @@
20 {% block content %} 20 {% block content %}
21 21
22 <div class="panel panel-info topic-panel"> 22 <div class="panel panel-info topic-panel">
23 - <div class="panel-heading" id="analytics-panel">  
24 - <div class="row">  
25 - <div class="col-md-12 category-header">  
26 - <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">  
27 - <span>{% trans "Analytics" %}</span>  
28 - </h4>  
29 - </div> 23 + <div class="panel-heading" id="analytics-panel">
  24 + <div class="row">
  25 + <div class="col-md-12 category-header">
  26 + <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
  27 + <span>{{ subject }} / {% trans "Analytics" %}</span>
  28 + </h4>
30 </div> 29 </div>
31 </div> 30 </div>
  31 + </div>
  32 + <div id="{{ subject.slug }}" class="panel-collapse panel-body in collapse subject-related-panel">
  33 + <div id="core-subjects-options-div">
  34 + <ul class="core-subjects-options report-menu-choice">
  35 + <li class="active">
  36 + {% trans "Interaction Data" %}
  37 + </li>
  38 + <li>
  39 + {% trans "Report Card" %}
  40 + </li>
  41 + <li>
  42 + {% trans "Participation" %}
  43 + </li>
  44 + </ul>
  45 + </div>
  46 + {% include "reports/_form.html" %}
  47 + </div>
32 </div> 48 </div>
33 -  
34 - <div id="core-subjects-options-div">  
35 - <ul class="core-subjects-options report-menu-choice">  
36 - <li class="active">  
37 - {% trans "Interaction Data" %}  
38 - </li>  
39 - <li>  
40 - {% trans "Report Card" %}  
41 - </li>  
42 - <li>  
43 - {% trans "Participation" %}  
44 - </li>  
45 - </ul>  
46 - </div>  
47 -  
48 - {% include "reports/_form.html" %}  
49 - 49 +
50 <script type="text/javascript" src="{% static "reports/js/report.js" %}"></script> 50 <script type="text/javascript" src="{% static "reports/js/report.js" %}"></script>
51 <script> 51 <script>
52 52
subjects/templates/subjects/home.html
  Diff comments   View file @c754568
@@ -4,52 +4,46 @@ @@ -4,52 +4,46 @@
4 4
5 {% block content %} 5 {% block content %}
6 {% if messages %} 6 {% if messages %}
7 - {% for message in messages %}  
8 - <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">  
9 - <button type="button" class="close" data-dismiss="alert" aria-label="Close">  
10 - <span aria-hidden="true">&times;</span>  
11 - </button>  
12 - <p>{{ message }}</p>  
13 - </div>  
14 - {% endfor %}  
15 - {% endif %} 7 + {% for message in messages %}
  8 + <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
  9 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  10 + <span aria-hidden="true">&times;</span>
  11 + </button>
  12 + <p>{{ message }}</p>
  13 + </div>
  14 + {% endfor %}
  15 + {% endif %}
16 16
17 17
18 18
19 19
20 <!-- Wrapper for slides --> 20 <!-- Wrapper for slides -->
21 - <div id="myCarousel" class="carousel slide " data-ride="carousel"> 21 + <div id="myCarousel" class="carousel slide " data-ride="carousel">
22 <!-- Indicators --> 22 <!-- Indicators -->
23 <ol class="carousel-indicators"> 23 <ol class="carousel-indicators">
24 - <li data-target="#myCarousel" data-slide-to="0" class="active"></li>  
25 - <li data-target="#myCarousel" data-slide-to="1"></li>  
26 - <li data-target="#myCarousel" data-slide-to="2"></li>  
27 - <li data-target="#myCarousel" data-slide-to="3"></li> 24 + <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
  25 + <li data-target="#myCarousel" data-slide-to="1"></li>
  26 + <li data-target="#myCarousel" data-slide-to="2"></li>
  27 + <li data-target="#myCarousel" data-slide-to="3"></li>
28 </ol> 28 </ol>
29 29
30 <div class="carousel-inner" role="listbox"> 30 <div class="carousel-inner" role="listbox">
31 {% for new in news %} 31 {% for new in news %}
32 - {% if forloop.first %}  
33 - <div class="item active" style="text-align:center">  
34 - <span><a href="{% url 'news:view' new.slug %}"> <img src="{{ new.image.url }}" alt="Image"> </a></span>  
35 - </div>  
36 - {% else %}  
37 - <div class="item" style="text-align:center">  
38 - <span><a href="{% url 'news:view' new.slug %}"> <img src="{{ new.image.url }}" alt="Image"> </a></span>  
39 - </div>  
40 - {% endif%} 32 + <div class="item {% if forloop.first %}active{% endif %}" style="text-align:center">
  33 + <span><a href="{% url 'news:view' new.slug %}"> <img src="{% if new.image %}{{ new.image.url }}{% endif %}" alt="Image"> </a></span>
  34 + </div>
41 {% endfor %} 35 {% endfor %}
42 36
43 </div> 37 </div>
44 38
45 <!-- Left and right controls --> 39 <!-- Left and right controls -->
46 <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev"> 40 <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
47 - <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>  
48 - <span class="sr-only">Previous</span> 41 + <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
  42 + <span class="sr-only">Previous</span>
49 </a> 43 </a>
50 <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next"> 44 <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
51 - <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>  
52 - <span class="sr-only">Next</span> 45 + <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
  46 + <span class="sr-only">Next</span>
53 </a> 47 </a>
54 </div> 48 </div>
55 49
@@ -62,7 +56,7 @@ @@ -62,7 +56,7 @@
62 <h2 class=" my-subjects-title"><b><i>{% trans "My Subjects" %} ({{ total_subs }})</i></b></h2> 56 <h2 class=" my-subjects-title"><b><i>{% trans "My Subjects" %} ({{ total_subs }})</i></b></h2>
63 57
64 {% if subjects|length > 0 %} 58 {% if subjects|length > 0 %}
65 - <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true"> 59 + <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
66 {% for subject in subjects %} 60 {% for subject in subjects %}
67 {% include "subjects/subject_card.html" with accordion_id="subject-accordion" %} 61 {% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
68 {% endfor %} 62 {% endfor %}