Download as
Browse Code »

Commit f2d885cd92c02b1ac476e0e86c88f741d86ad2f5

Authored by Felipe Henrique de Almeida Bormann
1 parent e8c4deca
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

fixed breadcrumbs past links and category card is now updated and listing coordinators horizontally

Showing 3 changed files with 26 additions and 3 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @f2d885c
@@ -49,6 +49,10 @@ @@ -49,6 +49,10 @@
49 font-size: 15px; 49 font-size: 15px;
50 } 50 }
51 51
  52 +.category-panel-content{
  53 + padding:10px;
  54 +}
  55 +
52 /* category app ends */ 56 /* category app ends */
53 57
54 .clearfix{ 58 .clearfix{
@@ -103,8 +107,13 @@ @@ -103,8 +107,13 @@
103 margin: 10% 10% 5% 5%; 107 margin: 10% 10% 5% 5%;
104 } 108 }
105 .breadcrumb{ 109 .breadcrumb{
  110 + font-size: 16px;
106 margin-bottom: 25px; 111 margin-bottom: 25px;
107 } 112 }
  113 +
  114 +.breadcrumb > li > a{
  115 + color: #26A69A;
  116 +}
108 .courseHome{ 117 .courseHome{
109 text-align: center; 118 text-align: center;
110 } 119 }
categories/templates/categories/category_card.html
  Diff comments   View file @f2d885c
1 {% load static i18n permission_tags %} 1 {% load static i18n permission_tags %}
2 -<div class="group course-card " id="course_{{course.slug}}"> 2 +<div class="group course-card " id="category_{{category.slug}}">
3 <div class="panel panel-info"> 3 <div class="panel panel-info">
4 <div class="panel-heading course"> 4 <div class="panel-heading course">
5 <div class="row"> 5 <div class="row">
categories/templates/categories/list.html
  Diff comments   View file @f2d885c
@@ -80,15 +80,29 @@ @@ -80,15 +80,29 @@
80 </div> 80 </div>
81 </div> 81 </div>
82 </div> 82 </div>
  83 +
  84 +
  85 + {% if user.is_staff %}
  86 + <div id="{{category.slug}}" class="panel-collapse collapse category-panel-content">
  87 + <h4> {% trans "Coordinator(s): " %}
  88 + {% for coordinator in category.coordinators.all %}
  89 + {{coordinator.username}}
  90 + {% endfor %}
  91 + </h4>
  92 + <p> {{category.description}}</p>
  93 + </div>
  94 + {% endif %}
83 {% comment %} 95 {% comment %}
84 96
85 - 97 +
86 <div id="{{category.slug}}" class="panel-collapse collapse"> 98 <div id="{{category.slug}}" class="panel-collapse collapse">
  99 +
87 {% for subject in subjects %} 100 {% for subject in subjects %}
88 {% include "categories/category_card.html" %} 101 {% include "categories/category_card.html" %}
89 {% endfor %} 102 {% endfor %}
90 </div> 103 </div>
91 - {% endcomment %} 104 + {% endcomment %}
  105 +
92 </div> 106 </div>
93 </div> 107 </div>
94 {% endfor %} 108 {% endfor %}