Commit bce6287c933058b0429737c03ba6ff57fcdda7e2
1 parent
47ffc2aa
Exists in
master
and in
5 other branches
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
| @@ -418,6 +418,11 @@ ul, li { | @@ -418,6 +418,11 @@ ul, li { | ||
| 418 | .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; } | 418 | .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; } |
| 419 | .course-detail{padding-top: 10px; padding-bottom: 10px;} | 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 | /* Menu link remove radius */ | 426 | /* Menu link remove radius */ |
| 422 | .nav-pills > li > a { | 427 | .nav-pills > li > a { |
| 423 | border-radius: 0px; | 428 | border-radius: 0px; |
courses/templates/course/index.html
| @@ -110,7 +110,28 @@ | @@ -110,7 +110,28 @@ | ||
| 110 | 110 | ||
| 111 | </fieldset> | 111 | </fieldset> |
| 112 | <div class="col-md-12 cards-content"> | 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 | {% if request.GET.category == '' or aparece or request.GET.q == '' %} | 135 | {% if request.GET.category == '' or aparece or request.GET.q == '' %} |
| 115 | {% for course in list_courses %} | 136 | {% for course in list_courses %} |
| 116 | {% include "course/course_card.html" %} | 137 | {% include "course/course_card.html" %} |
| @@ -123,7 +144,7 @@ | @@ -123,7 +144,7 @@ | ||
| 123 | {% endif %} | 144 | {% endif %} |
| 124 | {% else %} | 145 | {% else %} |
| 125 | {% trans 'No courses found' %} | 146 | {% trans 'No courses found' %} |
| 126 | - {% endif %} | 147 | + {% endif %}--> |
| 127 | </div> | 148 | </div> |
| 128 | <div class="col-md-12"> | 149 | <div class="col-md-12"> |
| 129 | <nav aria-label="Page navigation"> | 150 | <nav aria-label="Page navigation"> |
courses/views.py
| @@ -123,8 +123,8 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView): | @@ -123,8 +123,8 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView): | ||
| 123 | list_courses = None | 123 | list_courses = None |
| 124 | categorys_courses = None | 124 | categorys_courses = None |
| 125 | list_courses = Course.objects.all().order_by('name') | 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 | paginator = Paginator(list_courses, self.paginate_by) | 128 | paginator = Paginator(list_courses, self.paginate_by) |
| 129 | page = self.request.GET.get('page') | 129 | page = self.request.GET.get('page') |
| 130 | 130 |