Download as
Browse Code »

Commit bce6287c933058b0429737c03ba6ff57fcdda7e2

Authored by fbormann
1 parent 47ffc2aa
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

task going for review, added support for listgroup collapse #201

Showing 3 changed files with 30 additions and 4 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @bce6287
... ... @@ -418,6 +418,11 @@ ul, li {
418 418 .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
419 419 .course-detail{padding-top: 10px; padding-bottom: 10px;}
420 420  
  421 +.category-course-link{
  422 + font-size: 24px;
  423 + color: black !important;
  424 +}
  425 +
421 426 /* Menu link remove radius */
422 427 .nav-pills > li > a {
423 428 border-radius: 0px;
... ...
courses/templates/course/index.html
  Diff comments   View file @bce6287
... ... @@ -110,7 +110,28 @@
110 110  
111 111 </fieldset>
112 112 <div class="col-md-12 cards-content">
113   - {% if courses|length > 0 %}
  113 + {% for category in categorys_courses %}
  114 + <div class="panel-group">
  115 + <div class="panel panel-default">
  116 + <div class="panel-heading">
  117 + <h4 class="panel-title">
  118 + <a class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
  119 + </h4>
  120 +
  121 + </div>
  122 + <div id="{{category.slug}}" class="panel-collapse collapse">
  123 + {% for course in category.course_category.all %}
  124 + {% if user in course.students.all %}
  125 + {% include "course/course_card.html" %}
  126 + {% endif %}
  127 + {% endfor %}
  128 + </div>
  129 + </div>
  130 + </div>
  131 +
  132 +
  133 + {% endfor %}
  134 + <!--{% if courses|length > 0 %}
114 135 {% if request.GET.category == '' or aparece or request.GET.q == '' %}
115 136 {% for course in list_courses %}
116 137 {% include "course/course_card.html" %}
... ... @@ -123,7 +144,7 @@
123 144 {% endif %}
124 145 {% else %}
125 146 {% trans 'No courses found' %}
126   - {% endif %}
  147 + {% endif %}-->
127 148 </div>
128 149 <div class="col-md-12">
129 150 <nav aria-label="Page navigation">
... ...
courses/views.py
  Diff comments   View file @bce6287
... ... @@ -123,8 +123,8 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
123 123 list_courses = None
124 124 categorys_courses = None
125 125 list_courses = Course.objects.all().order_by('name')
126   - categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
127   -
  126 + #categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
  127 + categorys_courses = CourseCategory.objects.all()
128 128 paginator = Paginator(list_courses, self.paginate_by)
129 129 page = self.request.GET.get('page')
130 130  
... ...