added list categories on index and icons for notifications on cards

Felipe Henrique de Almeida Bormann
1 parent df035675
Showing 8 changed files with 102 additions and 53 deletions Show diff stats
amadeus/static/css/base/amadeus.css
categories/templates/categories/category_card.html
categories/templates/categories/home.html
categories/templates/categories/home_admin_content.html
categories/templates/categories/home_teacher_student_content.html
categories/templates/categories/list.html
categories/templates/categories/notifications_timeline.html
categories/views.py
@@ -22,8 +22,26 @@
 #sidebar-menu > .item i {
   margin-left: 15%;
 }
+
+
 /* side bar menu ends*/
+/* category app starts */
+
+.category-header > h4{
+  float:left;
+}
+
+.category-header i{
+  color: white;
+  float:right;
+  font-size: 25px;
+  margin-left: 2%;
+}
+
+
+/* category app ends */
+
 .clearfix{
   clear: both;
 }
@@ -0,0 +1,32 @@
+{% load static i18n permission_tags %}
+<div class="group  course-card " id="course_{{course.slug}}">
+    <div class="panel panel-info">
+        <div class="panel-heading course">
+          <div class="row">
+            <div class="col-xs-6 col-md-6 titleTopic">
+              <a role="button" href="#">
+                  <h4>{{course.name}}</h4>
+              </a>
+            </div>
+            {% if user|has_role:'professor' or user|has_role:'system_admin' %}
+            <div class="col-xs-6 col-md-6 divMoreActions" >
+                <div class="btn-group">
+                  <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                   </button>
+                  <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                    <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                    <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                    <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                  </ul>
+                </div>
+            </div>
+            {% elif user|has_role:'student' %}
+              {% if not request.user in course.students.all %}
+                <a onclick="subscribe($(this), '', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')"><button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button></a>
+              {% endif %}
+            {% endif %}
+          </div>
+        </div>
+    </div>
+</div>
 \ No newline at end of file
@@ -6,7 +6,7 @@
 {% block breadcrumbs %}
   {% clear_breadcrumbs %}
-  {% breadcrumb 'Home' 'app:index' %}
+  {% breadcrumb 'Home' 'categories:index' %}
 {% endblock %}
 {% load  static i18n %}
-{% for course in objects %}
+{% for category in categories %}
     <div class="panel panel-default courseHome">
-        <br><h4>{{ course }}</h4>
+        <br><h4>{{ category }}</h4>
       	<a href="#" class="btn btn-outline-info">{% trans 'Edit' %}</a>
     </div>
 {% endfor %}
@@ -1,20 +0,0 @@
-{% load static i18n %}
-
-{% for notification in objects %}
-    
-
-    <div class="well timeLine">
-  
-    <div class="row">
-        <div class="col-xs-2 col-md-1">
-            <img class="imgTimeLine" src="{{ notification.actor.image_url }}">
-        </div>
-        <div class="col-xs-10 col-md-11">
-            <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
-            <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="#">{{ notification.action_resource.resource.name }}</a></p>
-            <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %}  </i></p>
-        </div>
-    </div>
-</div>
-{% endfor %}
-
-{% extends 'home.html' %}
+{% extends 'categories/home.html' %}
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
@@ -10,7 +10,7 @@
 {% block breadcrumbs %}
 {{ block.super }}
-{% breadcrumb 'categories' 'course:manage' %}
+{% breadcrumb 'categories' 'categories:index' %}
 {% endblock %}
@@ -23,39 +23,38 @@
 {% endfor %}
 {% endif %}
-<div class="col-md-12 cards-content">
-  <form id="searchform" method="get" accept-charset="utf-8">
-    <div class="input-group">
-      <div class="form-group is-empty">
-        <input type="text" class="form-control" placeholder="{% trans 'Search for categories' %}" name="q">
-      </div>
-      <span class="input-group-btn input-group-sm">
-        <button type="submit" class="btn btn-fab btn-fab-mini">
-          <i class="fa fa-search" aria-hidden="true"></i>
-        </button>
-      </span>
-    </div>
-  </form>
-</div>
+
 <!-- Code for listing categories -->
 <div class="col-md-12 cards-content">
-  {% for category in categorys_categories  %}
+  {% for category in categories  %}
   <div class="panel-group course-card-group">
-    <div class="panel panel-default">
+    <div class="panel panel-info">
       <div class="panel-heading">
         <div class="row">
-          <div class="col-md-12">
+          <div class="col-md-12 category-header">
             <h4 class="panel-title">
               <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
             </h4>
+
+          
+            <a href=""><i class="fa fa-list" aria-hidden="true"></i></a>
+            <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+
+            <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
+
+            <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
           </div>
         </div>
       </div>
+      {% comment %}
+        
+     
       <div id="{{category.slug}}" class="panel-collapse collapse">
-        {% for course in category.course_category %}
-          {% include "course/course_card.html" %}
+        {% for subject in subjects %}
+          {% include "categories/category_card.html" %}
         {% endfor %}
       </div>
+       {% endcomment %}
     </div>
   </div>
   {% endfor %}
@@ -0,0 +1,20 @@
+{% load static i18n %}
+
+{% for notification in objects %}
+    
+
+    <div class="well timeLine">
+  
+    <div class="row">
+        <div class="col-xs-2 col-md-1">
+            <img class="imgTimeLine" src="{{ notification.actor.image_url }}">
+        </div>
+        <div class="col-xs-10 col-md-11">
+            <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
+            <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="#">{{ notification.action_resource.resource.name }}</a></p>
+            <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %}  </i></p>
+        </div>
+    </div>
+</div>
+{% endfor %}
+
@@ -16,7 +16,7 @@ class IndexView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
     queryset = Category.objects.all()
-    template_name = 'categories/home.html'
+    template_name = 'categories/list.html'
     context_object_name = 'categories'
@@ -30,15 +30,15 @@ class IndexView(LoginRequiredMixin, ListView):
         if self.request.user.is_staff:
             context['page_template'] = "categories/home_admin_content.html"
         else:
-            context['page_template'] = "categories/home_teacher_student_content.html"
+            context['page_template'] = "categories/home_teacher_student.html"
         context['title'] = _('Home')
         if self.request.is_ajax():
             if self.request.user.is_staff:
-                self.template_name = "home_admin_content.html"
+                self.template_name = "categories/home_admin_content.html"
             else:
-                self.template_name = "home_teacher_student_content.html"
+                self.template_name = "categories/home_teacher_student_content.html"
         return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
@@ -46,19 +46,19 @@ class IndexView(LoginRequiredMixin, ListView):
         context = super(IndexView, self).get_context_data(**kwargs)
         list_categories = None
         if has_role(self.request.user,'system_admin'):
-            list_categories = self.get_queryset().order_by('name')
-            # categorys_categories = CourseCategory.objects.all()
+            categories = self.get_queryset().order_by('name')
+            
         elif has_role(self.request.user,'professor'):
         	pass
             #list_categories = self.get_queryset().filter(professors__in = [self.request.user]).order_by('name')
             # categorys_categories = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
         elif has_role(self.request.user, 'student'):
-        	pass
-            #list_categories = self.get_queryset().filter(students__in = [self.request.user]).order_by('name')
+            categories = self.get_queryset().order_by('name')
         context['title'] = _('Categories')
-       
+        context['categories'] = categories
+
         return context
 class CreateCategory(HasRoleMixin, CreateView):
	@@ -22,8 +22,26 @@		@@ -22,8 +22,26 @@
22	#sidebar-menu > .item i {	22	#sidebar-menu > .item i {
23	margin-left: 15%;	23	margin-left: 15%;
24	}	24	}
		25	+
		26	+
25	/* side bar menu ends*/	27	/* side bar menu ends*/
26		28
		29	+/* category app starts */
		30	+
		31	+.category-header > h4{
		32	+ float:left;
		33	+}
		34	+
		35	+.category-header i{
		36	+ color: white;
		37	+ float:right;
		38	+ font-size: 25px;
		39	+ margin-left: 2%;
		40	+}
		41	+
		42	+
		43	+/* category app ends */
		44	+
27	.clearfix{	45	.clearfix{
28	clear: both;	46	clear: both;
29	}	47	}
	@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
		1	+{% load static i18n permission_tags %}
		2	+<div class="group course-card " id="course_{{course.slug}}">
		3	+ <div class="panel panel-info">
		4	+ <div class="panel-heading course">
		5	+ <div class="row">
		6	+ <div class="col-xs-6 col-md-6 titleTopic">
		7	+ <a role="button" href="#">
		8	+ <h4>{{course.name}}</h4>
		9	+ </a>
		10	+ </div>
		11	+ {% if user\|has_role:'professor' or user\|has_role:'system_admin' %}
		12	+ <div class="col-xs-6 col-md-6 divMoreActions" >
		13	+ <div class="btn-group">
		14	+ <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
		15	+ <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
		16	+ </button>
		17	+ <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
		18	+ <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
		19	+ <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
		20	+ <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
		21	+ </ul>
		22	+ </div>
		23	+ </div>
		24	+ {% elif user\|has_role:'student' %}
		25	+ {% if not request.user in course.students.all %}
		26	+ <a onclick="subscribe($(this), '', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')"><button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button></a>
		27	+ {% endif %}
		28	+ {% endif %}
		29	+ </div>
		30	+ </div>
		31	+ </div>
		32	+</div>
0	\ No newline at end of file	33	\ No newline at end of file
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6		6
7	{% block breadcrumbs %}	7	{% block breadcrumbs %}
8	{% clear_breadcrumbs %}	8	{% clear_breadcrumbs %}
9	- {% breadcrumb 'Home' 'app:index' %}	9	+ {% breadcrumb 'Home' 'categories:index' %}
10	{% endblock %}	10	{% endblock %}
11		11
12		12
1	{% load static i18n %}	1	{% load static i18n %}
2		2
3	-{% for course in objects %}	3	+{% for category in categories %}
4	<div class="panel panel-default courseHome">	4	<div class="panel panel-default courseHome">
5	- <br><h4>{{ course }}</h4>	5	+ <br><h4>{{ category }}</h4>
6	<a href="#" class="btn btn-outline-info">{% trans 'Edit' %}</a>	6	<a href="#" class="btn btn-outline-info">{% trans 'Edit' %}</a>
7	</div>	7	</div>
8	{% endfor %}	8	{% endfor %}
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-{% load static i18n %}
2	-
3	-{% for notification in objects %}
4	-
5	-
6	- <div class="well timeLine">
7	-
8	- <div class="row">
9	- <div class="col-xs-2 col-md-1">
10	- <img class="imgTimeLine" src="{{ notification.actor.image_url }}">
11	- </div>
12	- <div class="col-xs-10 col-md-11">
13	- <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
14	- <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="#">{{ notification.action_resource.resource.name }}</a></p>
15	- <p class="timePost"><i> {{ notification.datetime\|timesince }} {% trans "ago" %} </i></p>
16	- </div>
17	- </div>
18	-</div>
19	-{% endfor %}
20	-
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+{% load static i18n %}
	2	+
	3	+{% for notification in objects %}
	4	+
	5	+
	6	+ <div class="well timeLine">
	7	+
	8	+ <div class="row">
	9	+ <div class="col-xs-2 col-md-1">
	10	+ <img class="imgTimeLine" src="{{ notification.actor.image_url }}">
	11	+ </div>
	12	+ <div class="col-xs-10 col-md-11">
	13	+ <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
	14	+ <p class="resource_inline">{{notification.message}} {% trans 'at' %} : <a href="#">{{ notification.action_resource.resource.name }}</a></p>
	15	+ <p class="timePost"><i> {{ notification.datetime\|timesince }} {% trans "ago" %} </i></p>
	16	+ </div>
	17	+ </div>
	18	+</div>
	19	+{% endfor %}
	20	+