Download as
Browse Code »

Commit f31dfec9861ff02c2f84988e9e5bbf603b9d2b5f

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

fixed minor issues found and added a new sub-template for optimizing organization

Showing 6 changed files with 47 additions and 46 deletions   Show diff stats
app/templates/home_teacher_student_content.html
  Diff comments   View file @f31dfec
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
10 <img class="imgTimeLine" src="{{ notification.user.image_url }}"> 10 <img class="imgTimeLine" src="{{ notification.user.image_url }}">
11 </div> 11 </div>
12 <div class="col-xs-10 col-md-11"> 12 <div class="col-xs-10 col-md-11">
13 - <i class="fa fa-pencil-square-o" aria-hidden="true"></i>  
14 <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4> 13 <h4 class="resource_inline"><b>{{ notification.actor.username }}</b></h4>
15 <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id %}">{{ notification.action_resource.resource.name }}</a></p> 14 <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id %}">{{ notification.action_resource.resource.name }}</a></p>
16 <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %} </i></p> 15 <p class="timePost"><i> {{ notification.datetime|timesince }} {% trans "ago" %} </i></p>
courses/templates/course/course_card.html 0 → 100644
  Diff comments   View file @f31dfec
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
  1 +{% load static i18n permission_tags %}
  2 +{% load django_bootstrap_breadcrumbs %}
  3 +
  4 +<div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
  5 + <div class="group">
  6 + <div class="panel panel-info">
  7 + <div class="panel-heading" role="tab">
  8 + <div class="row">
  9 + <div class="col-xs-9 col-md-10 titleTopic">
  10 + <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">
  11 + <h4 style="color:white">{{course.name}}</h4>
  12 + </a>
  13 + </div>
  14 + {% if user|has_role:'professor' or user|has_role:'system_admin' %}
  15 + <div class="col-xs-4 col-md-2" id="divMoreActions">
  16 + <div class="btn-group">
  17 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  18 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  19 + </button>
  20 + <ul class="dropdown-menu" aria-labelledby="moreActions">
  21 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
  22 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
  23 + </ul>
  24 + </div>
  25 + </div>
  26 + {% endif %}
  27 + </div>
  28 + </div>
  29 + <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
  30 + <div class="panel-body">
  31 + <p><b>Course Name: </b>{{course.name}}</p>
  32 + <p><b>Coordinator: </b>{{course.professors.all.0}}</p>
  33 + <p>
  34 + <b>Description:</b>
  35 + <i>
  36 + {{course.description}}
  37 + </i>
  38 + </p>
  39 + <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
  40 + </div>
  41 + </div>
  42 + </div>
  43 + </div>
  44 + </div>
0 \ No newline at end of file 45 \ No newline at end of file
courses/templates/course/index.html
  Diff comments   View file @f31dfec
@@ -75,48 +75,7 @@ @@ -75,48 +75,7 @@
75 {% if courses|length > 0 %} 75 {% if courses|length > 0 %}
76 {% if request.GET.category == 'all' or none or request.GET.category == '' %} 76 {% if request.GET.category == 'all' or none or request.GET.category == '' %}
77 {% for course in list_courses %} 77 {% for course in list_courses %}
78 - <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">  
79 - <div class="group">  
80 - <div class="panel panel-info">  
81 - <div class="panel-heading" role="tab">  
82 - <div class="row">  
83 - <div class="col-xs-9 col-md-10 titleTopic">  
84 - <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">  
85 - <h4 style="color:white">{{course.name}}</h4>  
86 - </a>  
87 - </div>  
88 - {% if user|has_role:'professor' or user|has_role:'system_admin' %}  
89 - <div class="col-xs-4 col-md-2" id="divMoreActions">  
90 - <div class="btn-group">  
91 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
92 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
93 - </button>  
94 - <ul class="dropdown-menu" aria-labelledby="moreActions">  
95 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>  
96 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>  
97 - </ul>  
98 - </div>  
99 - </div>  
100 - {% endif %}  
101 - </div>  
102 - </div>  
103 - <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">  
104 - <div class="panel-body">  
105 - <p><b>Course Name: </b>{{course.name}}</p>  
106 - <p><b>Duration (in semesters): </b>09</p>  
107 - <p><b>Coordinator: </b>{{course.professors}}</p>  
108 - <p>  
109 - <b>Description:</b>  
110 - <i>  
111 - {{course.description}}  
112 - </i>  
113 - </p>  
114 - <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>  
115 - </div>  
116 - </div>  
117 - </div>  
118 - </div>  
119 - </div> 78 + {% include "course/course_card.html" %}
120 {% endfor %} 79 {% endfor %}
121 {% else %} 80 {% else %}
122 {% for course in courses_category %} 81 {% for course in courses_category %}
courses/templates/course/view.html
  Diff comments   View file @f31dfec
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <ul class="nav nav-pills nav-stacked"> 43 <ul class="nav nav-pills nav-stacked">
44 <li><a href="teacher/course_participants_teacher.html" target="_self"> {% trans "Participants" %}</a></li> 44 <li><a href="teacher/course_participants_teacher.html" target="_self"> {% trans "Participants" %}</a></li>
45 <li><a href="javascript:void(0)">{% trans "Replicate Subject" %}</a></li> 45 <li><a href="javascript:void(0)">{% trans "Replicate Subject" %}</a></li>
46 - <li><a href="javascript:void(0)">{% trans "Create Subject" %}t</a></li> 46 + <li><a href="javascript:void(0)">{% trans "Create Subject" %}</a></li>
47 <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal">{% trans "Create Topic" %}</a></li> 47 <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal">{% trans "Create Topic" %}</a></li>
48 </ul> 48 </ul>
49 </div> 49 </div>
courses/views.py
  Diff comments   View file @f31dfec
@@ -42,7 +42,6 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -42,7 +42,6 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
42 categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct() 42 categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
43 43
44 courses_category = Course.objects.filter(category__name = self.request.GET.get('category')) 44 courses_category = Course.objects.filter(category__name = self.request.GET.get('category'))
45 -  
46 none = None 45 none = None
47 q = self.request.GET.get('category', None) 46 q = self.request.GET.get('category', None)
48 if q is None: 47 if q is None:
@@ -73,7 +73,7 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, NotificationMixin,generic.Crea @@ -73,7 +73,7 @@ class CreatePoll(LoginRequiredMixin,HasRoleMixin, NotificationMixin,generic.Crea
73 self.object.name = str(self.object) 73 self.object.name = str(self.object)
74 self.object.save() 74 self.object.save()
75 75
76 - super(CreatePoll, self).createNotification(message="create a Poll "+ self.object.name, actor=self.request.user, 76 + super(CreatePoll, self).createNotification(message="created a Poll "+ self.object.name, actor=self.request.user,
77 resource_name=self.object.name, resource_link= reverse('course:poll:view_poll', args=[self.object.slug]), 77 resource_name=self.object.name, resource_link= reverse('course:poll:view_poll', args=[self.object.slug]),
78 users=self.object.topic.subject.students.all()) 78 users=self.object.topic.subject.students.all())
79 for key in self.request.POST: 79 for key in self.request.POST: