From 2e5cee0a31633428547c9c902bacae266b698284 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 4 Jan 2017 19:04:21 -0200
Subject: [PATCH] Adjusting home subjects presentation

---
 subjects/templates/subjects/initial.html      | 34 ++++++++++++----------------------
 subjects/templates/subjects/subject_card.html |  2 +-
 subjects/views.py                             | 33 +++++++++++++++++++--------------
 3 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html
index ca5512f..d45aeec 100644
--- a/subjects/templates/subjects/initial.html
+++ b/subjects/templates/subjects/initial.html
@@ -1,37 +1,27 @@
 {% extends "categories/home.html" %}
 
+{% load pagination %}
+
 {% block content %}
 
 	<div id="" class="col-md-12">
 		<div class="users-cloud">
-		<ul class=" users-cloud">
-			{% for user in users %}
-				<li>{{user.social_name}}</li>
-			{% endfor %}
-		</ul>
+			<ul class=" users-cloud">
+				{% for user in users %}
+					<li>{{user.social_name}}</li>
+				{% endfor %}
+			</ul>
 		</div>
 	</div>
+
 	<div class="col-md-12 cards-content">
     	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
-		{% for subject in subjects %}
-			{% include "subjects/subject_card.html" %}
-		{% endfor %}
+			{% for subject in subjects %}
+				{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
+			{% endfor %}
 		</div>
 	</div>
 
-	 
-    <div class="pagination">
-        <span class="page-links">
-            {% if subjects.has_previous %}
-                <a href="?page={{ subjects.previous_page_number }}">previous</a>
-            {% endif %}
-            <span class="page-current">
-                Page {{ subjects.number }} of {{ subjects.paginator.num_pages }}.
-            </span>
-            {% if subjects.has_next %}
-                <a href="?page={{ subjects.next_page_number }}">next</a>
-            {% endif %}
-        </span>
-    </div>
+	{% pagination request paginator page_obj %} 
     
 {% endblock content %}
\ No newline at end of file
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index dd237fe..f5c020a 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -5,7 +5,7 @@
         <div class="row">
             <div class="col-md-12 category-header">
                 <h4 class="panel-title">
-                    <a class="category-course-link pull-left" data-parent="#{{ subject.category.slug }}-accordion" data-toggle="collapse" href="#{{subject.slug}}">
+                    <a class="category-course-link pull-left" data-parent="#{% if accordion_id %}{{ accordion_id }}{% else %}{{ subject.category.slug }}-accordion{% endif %}" data-toggle="collapse" href="#{{subject.slug}}">
                         <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{subject.name}}
                     </a>
                 </h4>
diff --git a/subjects/views.py b/subjects/views.py
index 38c7ddb..f0febb7 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -32,30 +32,35 @@ class HomeView(LoginRequiredMixin, ListView):
     redirect_field_name = 'next'
     queryset = Subject.objects.all()
     template_name = 'subjects/initial.html'
-    
+    context_object_name = 'subjects'
+    paginate_by = 2    
 
-    def get_context_data(self, **kwargs):
-        context = super(HomeView, self).get_context_data(**kwargs)
+    def get_queryset(self):
         if self.request.user.is_staff:
             subjects = Subject.objects.all()
         else:
             subjects = Subject.objects.all()
             subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all()]
+
+        return subjects
+
+    def get_context_data(self, **kwargs):
+        context = super(HomeView, self).get_context_data(**kwargs)
            
-        paginator = Paginator(subjects, 2)
+        # paginator = Paginator(subjects, 2)
 
-        page = self.request.GET.get('page')
-        try:
-            subjects = paginator.page(page)
-        except PageNotAnInteger:
-            # If page is not an integer, deliver first page.
-            subjects = paginator.page(1)
+        # page = self.request.GET.get('page')
+        # try:
+        #     subjects = paginator.page(page)
+        # except PageNotAnInteger:
+        #     # If page is not an integer, deliver first page.
+        #     subjects = paginator.page(1)
 
-        except EmptyPage:
-            # If page is out of range (e.g. 9999), deliver last page of results.
-            subjects = paginator.page(paginator.num_pages)
+        # except EmptyPage:
+        #     # If page is out of range (e.g. 9999), deliver last page of results.
+        #     subjects = paginator.page(paginator.num_pages)
 
-        context['subjects'] = subjects
+        # context['subjects'] = subjects
         #bringing users
         users = User.objects.all()
         context['users'] = users
--
libgit2 0.21.2