Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

fbormann
2 parents bce6287c fc10311c
Showing 18 changed files with 222 additions and 181 deletions Show diff stats
core/forms.py
core/migrations/0003_auto_20161101_1457.py
core/models.py
core/static/css/base/amadeus.css
core/templates/base.html
core/templates/guest.html
core/templates/register_user.html
core/urls.py
core/views.py
courses/static/js/topic_editation_presentation.js
courses/templates/category/create.html
courses/templates/category/index.html
courses/templates/course/create.html
courses/templates/subject/create.html
courses/templates/subject/form_view_student.html
courses/templates/subject/form_view_teacher.html
courses/templates/subject/update.html
courses/views.py
@@ -75,4 +75,5 @@ class RegisterUserForm(forms.ModelForm):
     class Meta:
         model = User
         # exclude = ['is_staff', 'is_active']
-        fields = ['username', 'name', 'email', 'city', 'state', 'gender', 'cpf', 'birth_date', 'phone', 'image']
 \ No newline at end of file
+        fields = ['username', 'name', 'email', 'city', 'state', 'gender', 'cpf', 'birth_date', 'phone', 'image', 'titration', 
+        'year_titration', 'institution', 'curriculum',]
 \ No newline at end of file
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-01 17:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_auto_20161024_1559'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='log',
+            name='component',
+            field=models.TextField(default='', verbose_name='Component (Module / App)'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='log',
+            name='context',
+            field=models.TextField(blank=True, verbose_name='Context'),
+        ),
+    ]
@@ -101,10 +101,15 @@ class Notification(models.Model):
         return self.message
  
 class Log(models.Model):
-    datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
-    user = models.ForeignKey(User, verbose_name = _('Actor'))
+    component = models.TextField(_('Component (Module / App)'))
+    context = models.TextField(_('Context'), blank = True)
     action_resource = models.ForeignKey(Action_Resource, verbose_name = _('Action_Resource'))
+    user = models.ForeignKey(User, verbose_name = _('Actor'))
+    datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
  
     class Meta:
         verbose_name = _('Log')
         verbose_name_plural = _('Logs')
+
+    def __str__(self):
+        return self.message
@@ -18,7 +18,10 @@
   overflow: auto;
   width: 300px;
 }
-
+#NavBarSearch{
+    position: absolute;
+    left: 30%;
+  }
 .user-notification-img{
   width:40%;
 }
@@ -408,7 +411,6 @@ ul, li {
 .dropdown-menu .pull-right {
     right: 0;
   }
-  .editation{display: none}
 .moreAccordion{ padding-left: 0px; padding-right: 0px;}
 .moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
 .cards-content{ padding-left: 0px; padding-right: 0px; }
@@ -426,4 +428,4 @@ ul, li {
 /* Menu link remove radius */
 .nav-pills > li > a {
   border-radius: 0px;
-}
 \ No newline at end of file
+}
@@ -20,7 +20,7 @@
  
   	<!-- Bootstrap and themes (material) -->
 	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
-	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.css' %}">
+	
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
@@ -72,6 +72,19 @@
            		<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo"/></a>
          		</div>
          		<div class="navbar-collapse collapse navbar-responsive-collapse">
+							<div class="col-md-5 cards-content" id= 'NavBarSearch'>
+								<form id="SearchForm" action="#" 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 Files (.pdf, others) and/or activities' %}" name="search"></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>
            		<ul class="nav navbar-nav navbar-right notifications">
              			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
                  <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
@@ -3,6 +3,7 @@
  
 {% load i18n custom_filters %}
 {% load static i18n %}
+{% load pagination %}
  
 <html>
 <head>
@@ -159,6 +160,7 @@
 						</div>
 					{% endfor %}
  
+                    {% pagination request paginator page_obj %}
 				{% endblock %}
 			</div>
 		</div>
@@ -38,53 +38,64 @@
 						{% csrf_token %}
 							<legend>{% trans 'User Register' %}</legend>
 							{% for field in form %}
-							<div class="row">
-							<div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
-								{% if field.field.required %}
-									<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
-								{% else %}
-									<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
-								{% endif %}
-								<div class="col-md-10">
-									{% if field.auto_id == 'id_birth_date' %}
-										{% render_field field class='form-control input-sm date-picker' %}
-										
-										<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-									{% elif field.auto_id == 'id_image' %}
-										{% render_field field class='form-control input-sm' %}
-										<div class="input-group">
-						                    <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
-						                    <span class="input-group-btn input-group-sm">
-						                        <button type="button" class="btn btn-fab btn-fab-mini">
-						                          	<i class="material-icons">attach_file</i>
-						                        </button>
-						                    </span>
-						                </div>
-						            {% elif field.auto_id == 'id_cpf' %}
-		                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
-
-		                			{% elif field.auto_id == 'id_phone' %}
-		                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+								<div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
+									{% if field.field.required %}
+										<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
 									{% else %}
-										{% render_field field class='form-control' %}
-										<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+										<label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+									{% endif %}
+									<div class="col-md-10">
+										{% if field.auto_id == 'id_birth_date' %}
+											{% render_field field class='form-control input-sm date-picker' %}
+											
+											<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+										{% elif field.auto_id == 'id_image' %}
+											{% render_field field class='form-control input-sm' %}
+											<div class="input-group">
+							                    <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
+							                    <span class="input-group-btn input-group-sm">
+							                        <button type="button" class="btn btn-fab btn-fab-mini">
+							                          	<i class="material-icons">attach_file</i>
+							                        </button>
+							                    </span>
+							                </div>
+							            {% elif field.auto_id == 'id_curriculum' %}
+											{% render_field field class='form-control input-sm' %}
+											<div class="input-group">
+							                    <input type="text" readonly="" class="form-control" placeholder="{% trans 'Chose your file ...' %}">
+							                    <span class="input-group-btn input-group-sm">
+							                        <button type="button" class="btn btn-fab btn-fab-mini">
+							                          	<i class="material-icons">attach_file</i>
+							                        </button>
+							                    </span>
+							                </div>
+							            {% elif field.auto_id == 'id_cpf' %}
+			                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
+
+										{% elif field.auto_id == 'id_year_titration' %}
+			                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
+
+			                			{% elif field.auto_id == 'id_phone' %}
+			                				{% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
+										{% else %}
+											{% render_field field class='form-control' %}
+											<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
+										{% endif %}
+									</div>
+									
+									{% if field.errors %}
+									<div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
+					  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					  						<span aria-hidden="true">&times;</span>
+				  						</button>
+										<ul>
+											{% for error in field.errors %}
+												<li>{{ error }}</li>
+											{% endfor %}
+										</ul>
+									</div>
 									{% endif %}
 								</div>
-								
-								{% if field.errors %}
-								<div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
-				  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-				  						<span aria-hidden="true">&times;</span>
-			  						</button>
-									<ul>
-										{% for error in field.errors %}
-											<li>{{ error }}</li>
-										{% endfor %}
-									</ul>
-								</div>
-								{% endif %}
-							</div>
-							</div>
 							{% endfor %}
 							<div class="col-md-offset-2 col-md-6 col-sm-offset-2 col-sm-6 col-xs-6 col-xs-offset-2 col-xs-6">
 								<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />	
@@ -11,7 +11,7 @@ urlpatterns = [
     url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
     url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
     url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
-    url(r'^guest/$', views.guest, name='guest'),
+    url(r'^guest/$', views.GuestView.as_view(), name='guest'),
  
 #Reset Password
  
@@ -6,7 +6,7 @@ from .decorators import log_decorator
 from django.contrib import messages
 from django.shortcuts import render, redirect
 from django.template.loader import render_to_string
-from django.views.generic import CreateView, UpdateView
+from django.views.generic import CreateView, UpdateView, ListView
 from django.http import HttpResponse, JsonResponse
 from django.core.mail import send_mail,BadHeaderError
 from django.conf import settings
@@ -120,9 +120,18 @@ def getNotifications(request):
 	data['amountGotten'] = amountGotten
 	return JsonResponse(data)
  
-def guest (request):
-	context = {
-		'courses': Course.objects.filter(public=True),
-		'categories': CourseCategory.objects.all(),
-	}
-	return render(request, 'guest.html', context)
 \ No newline at end of file
+
+class GuestView (ListView):
+
+	template_name = 'guest.html'
+	context_object_name = 'courses'
+	paginate_by = 10
+
+	def get_queryset(self):
+		return Course.objects.filter(public=True)
+
+
+	def get_context_data (self, **kwargs):
+		context = super(GuestView, self).get_context_data(**kwargs)
+		context['categories'] = CourseCategory.objects.all()
+		return context
+$(document).ready(function(){
+    $(".editation").css('display','none');
+});
 function show_editation(id_topic){
-    $("#presentation_"+ id_topic).css('display','none');
-    $("#editation_"+ id_topic).css('display','block');
-}
+    $(".presentation_"+ id_topic).css('display','none');
+    $(".editation_"+ id_topic).css('display','block');
+};
+    function show_presentation(id_topic){
+    $(".editation_"+ id_topic).css('display','none');
+    $(".presentation_"+ id_topic).css('display','block');
+};
+
  
-function show_presentation(id_topic){
-    $("#editation_"+ id_topic).css('display','none');
-    $("#presentation_"+ id_topic).css('display','block');
-}
 \ No newline at end of file
@@ -31,13 +31,12 @@
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
 	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
  
+
 	<div class="panel panel-primary navigation">
 	    <div class="panel-heading">
 	        <h3 class="panel-title">{% trans 'Category' %}</h3>
@@ -32,9 +32,7 @@
 	    </div>
 	    <div class="panel-body">
 	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
 	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
 	        </ul>
 	    </div>
 	</div>
@@ -71,16 +69,15 @@
 					<div class="panel panel-info">
 					    <div class="panel-heading" role="tab">
 					      <div class="row">
-					        <div class="col-xs-9 col-md-10 titleTopic">
+					        <div class="col-xs-9 col-md-11 titleTopic">
 					          <h4 style="color:white; margin-left: 20px;">{{category}}</h4>
 					        </div>
-					        
-						        <div class="col-xs-4 col-md-2" id="divMoreActions">
+						        <div class="col-xs-4 col-md-1" id="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" aria-labelledby="moreActions">
+						              <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
 						                <li><a href="{% url 'course:update_cat' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Update' %}</a></li>
 						                <li><a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remover' %}</a></li>
 						              </ul>
-{% extends 'course/view.html' %}
+{% extends 'home.html' %}
  
 {% load static i18n %}
 {% load widget_tweaks %}
@@ -19,7 +19,7 @@
 							<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
 								<label for="{{ field.auto_id }}">{{ field.label }}</label>
 								{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
-									<input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}">
+									<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'Y-m-d'}}">
 								{% elif field.auto_id == 'id_image' %}
 									{% render_field field class='form-control' %}
 									<div class="input-group">
@@ -11,8 +11,11 @@
         {% for field in form %}
         <div class="form-group {% if field.errors %} has-error{% endif %}">
           <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
-
-          {% render_field field class='form-control' placeholder=field.label%}
+          {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
+              <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          {% else %}
+              {% render_field field class='form-control' placeholder=field.label%}
+          {% endif %}
           <span class="help-block">{{ field.help_text }}</span>
         </div>
         {% endfor %}
@@ -22,4 +25,12 @@
       </form>
     </div>
   </div>
+
+  <script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+  </script>
 {% endblock content %}
@@ -32,32 +32,14 @@
           </p>
  
         </div>
-        <div class="row">
-          <div class="col-xs-6 col-md-6">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <ul>
-              {% list_topic_file request topic %}
-              {% list_topic_link request topic%}
-            </ul>
-          </div>
-          <div class="col-xs-4 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
-          </div>
-        </div>
       </div>
     </div>
     </div>
+
     </div>
+
     {% professor_subject topic.subject user as professor_links %}
-    {% if professor_links %}
+    {% if professor_links%}
         {% include "links/create_link.html" %}
         {% include "links/delete_link.html" %}
     {% endif %}
@@ -41,106 +41,73 @@
   </div>
   <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
     <div class="panel-body">
-      <div class="presentation" id="presentation_{{topic.slug}}">
+      <div class="presentation_{{topic.slug}}">
         <p>
           <i>
             {{topic.description|linebreaks}}
           </i>
         </p>
-        <div class="row">
-          <div class="col-xs-6 col-md-6">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <div class="dropdown">
-                <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                <ul class="dropdown-menu" aria-labelledby="dLabel">
-                  <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
-                  <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
-                </ul>
-              </div>
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
+        <input type="text" class="form-control" value="{{topic}}">
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
+        <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
+      </div>
+      <div class="row">
+        <div class="col-xs-6 col-md-6">
+          <div class="resource_inline">
+            <h4>{% trans 'Material' %}</h4>
+          </div>
+          <div class="resource_inline">
+            <div class="dropdown">
+              <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+              <ul class="dropdown-menu" aria-labelledby="dLabel">
+                <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
+                <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
+              </ul>
             </div>
+          </div>
+          <div class="presentation_{{topic.slug}}">
             <ul>
               {% list_topic_file request topic %}
               {% list_topic_link request topic%}
             </ul>
           </div>
-          <div class="col-xs-4 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <div class="dropdown">
-                <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                <ul class="dropdown-menu" aria-labelledby="dLabel">
-                  <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
-                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
-                </ul>
-              </div>
-            </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
-          </div>
-        </div>
-      </div><!--EndPresentation-->
-      <div class="editation topic_{{ topic.id }}" id="editation_{{topic.slug}}">
-        <div class="form-group">
-          <label class="control-label" for="focusedInput2">{% trans 'Name Topic' %}</label>
-          <input type="text" class="form-control" value="{{topic}}">
-        </div>
-        <div class="form-group">
-          <label class="control-label" for="focusedInput2">{% trans 'Description' %}</label>
-          <textarea class="form-control" rows="3" id="textArea">{{topic.description}}</textarea>
-        </div>
-        <div class="row">
-          <div class=" col-xs-6 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Material' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <div class="dropdown">
-                <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                <ul class="dropdown-menu" aria-labelledby="dLabel">
-                  <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
-                  <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
-                </ul>
-              </div>
-            </div>
+          <div class="editation editation_{{topic.slug}}">
             <ul>
               {% list_topic_file_edit request topic %}
               {% list_topic_link_edit request topic%}
             </ul>
           </div>
-          <div class="col-xs-4 col-md-offset-1 col-md-4">
-            <div class="resource_inline">
-              <h4>{% trans 'Activities' %}</h4>
-            </div>
-            <div class="resource_inline">
-              <div class="dropdown">
-                <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
-                <ul class="dropdown-menu" aria-labelledby="dLabel">
-                  <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
-                  <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
-                </ul>
-              </div>
+        </div>
+        <div class="col-xs-4 col-md-4">
+          <div class="resource_inline">
+            <h4>{% trans 'Activities' %}</h4>
+          </div>
+          <div class="resource_inline">
+            <div class="dropdown">
+              <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
+              <ul class="dropdown-menu" aria-labelledby="dLabel">
+                <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
+                <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#modal_poll');">{% trans 'Create Poll' %}</a></li>
+              </ul>
             </div>
-            <ul>
-              {% list_topic_poll request topic %}
-              {% list_topic_foruns request topic %}
-            </ul>
           </div>
+          <ul>
+            {% list_topic_poll request topic %}
+            {% list_topic_foruns request topic %}
+          </ul>
         </div>
-        <div class="form-group">
-          <div class="col-md-10">
-            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
-            <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
-          </div>
+      </div>
+      <div class="form-group editation editation_{{topic.slug}}">
+        <div class="col-md-10">
+          <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
+          <a href="javascript:show_presentation('{{topic.slug}}')" class="btn btn-raised btn-primary">{% trans 'Submit' %}</a>
         </div>
-      </div><!--EndEditation-->
-
+      </div>
     </div>
   </div>
 </div>
@@ -12,7 +12,11 @@
         <div class="form-group {% if field.errors %} has-error{% endif %}">
           <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
  
-          {% render_field field class='form-control' placeholder=field.label%}
+          {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
+              <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+          {% else %}
+              {% render_field field class='form-control' placeholder=field.label%}
+          {% endif %}
           <span class="help-block">{{ field.help_text }}</span>
         </div>
         {% endfor %}
@@ -22,4 +26,12 @@
       </form>
     </div>
   </div>
+
+  <script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+  </script>
 {% endblock content %}
@@ -160,7 +160,7 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,gener
 		if has_role(self.request.user,'system_admin'):
 			courses = Course.objects.all()
 		elif has_role(self.request.user,'professor'):
-			courses = self.request.user.courses.all()
+			courses = self.request.user.courses_student.all()
 		context['courses'] = courses
 		context['title'] = _("Create Course")
 		context['now'] = date.today()
...	...	@@ -75,4 +75,5 @@ class RegisterUserForm(forms.ModelForm):
75	75	class Meta:
76	76	model = User
77	77	# exclude = ['is_staff', 'is_active']
78		- fields = ['username', 'name', 'email', 'city', 'state', 'gender', 'cpf', 'birth_date', 'phone', 'image']
79	78	\ No newline at end of file
	79	+ fields = ['username', 'name', 'email', 'city', 'state', 'gender', 'cpf', 'birth_date', 'phone', 'image', 'titration',
	80	+ 'year_titration', 'institution', 'curriculum',]
80	81	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,26 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-01 17:57
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('core', '0002_auto_20161024_1559'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AddField(
	16	+ model_name='log',
	17	+ name='component',
	18	+ field=models.TextField(default='', verbose_name='Component (Module / App)'),
	19	+ preserve_default=False,
	20	+ ),
	21	+ migrations.AddField(
	22	+ model_name='log',
	23	+ name='context',
	24	+ field=models.TextField(blank=True, verbose_name='Context'),
	25	+ ),
	26	+ ]
...	...
...	...	@@ -101,10 +101,15 @@ class Notification(models.Model):
101	101	return self.message
102	102
103	103	class Log(models.Model):
104		- datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
105		- user = models.ForeignKey(User, verbose_name = _('Actor'))
	104	+ component = models.TextField(_('Component (Module / App)'))
	105	+ context = models.TextField(_('Context'), blank = True)
106	106	action_resource = models.ForeignKey(Action_Resource, verbose_name = _('Action_Resource'))
	107	+ user = models.ForeignKey(User, verbose_name = _('Actor'))
	108	+ datetime = models.DateTimeField(_("Date and Time of action"), auto_now_add = True)
107	109
108	110	class Meta:
109	111	verbose_name = _('Log')
110	112	verbose_name_plural = _('Logs')
	113	+
	114	+ def __str__(self):
	115	+ return self.message
...	...
...	...	@@ -18,7 +18,10 @@
18	18	overflow: auto;
19	19	width: 300px;
20	20	}
21		-
	21	+#NavBarSearch{
	22	+ position: absolute;
	23	+ left: 30%;
	24	+ }
22	25	.user-notification-img{
23	26	width:40%;
24	27	}
...	...	@@ -408,7 +411,6 @@ ul, li {
408	411	.dropdown-menu .pull-right {
409	412	right: 0;
410	413	}
411		- .editation{display: none}
412	414	.moreAccordion{ padding-left: 0px; padding-right: 0px;}
413	415	.moreAccordion div button{ padding-left: 0px; padding-right: 0px;}
414	416	.cards-content{ padding-left: 0px; padding-right: 0px; }
...	...	@@ -426,4 +428,4 @@ ul, li {
426	428	/* Menu link remove radius */
427	429	.nav-pills > li > a {
428	430	border-radius: 0px;
429		-}
430	431	\ No newline at end of file
	432	+}
...	...
...	...	@@ -20,7 +20,7 @@
20	20
21	21	<!-- Bootstrap and themes (material) -->
22	22	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.css' %}">
23		- <link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.css' %}">
	23	+
24	24	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
25	25	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.css' %}">
26	26	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
...	...	@@ -72,6 +72,19 @@
72	72	<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo"/></a>
73	73	</div>
74	74	<div class="navbar-collapse collapse navbar-responsive-collapse">
	75	+ <div class="col-md-5 cards-content" id= 'NavBarSearch'>
	76	+ <form id="SearchForm" action="#" method="get" accept-charset="utf-8">
	77	+ <div class="input-group">
	78	+ <div class="form-group is-empty" >
	79	+ <input type="text" class="form-control" placeholder="{% trans 'Search Files (.pdf, others) and/or activities' %}" name="search"></div>
	80	+ <span class="input-group-btn input-group-sm">
	81	+ <button type="submit" class="btn btn-fab btn-fab-mini">
	82	+ <i class="fa fa-search" aria-hidden="true"></i>
	83	+ </button>
	84	+ </span>
	85	+ </div>
	86	+ </form>
	87	+ </div>
75	88	<ul class="nav navbar-nav navbar-right notifications">
76	89	<li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
77	90	<a class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
...	...
...	...	@@ -3,6 +3,7 @@
3	3
4	4	{% load i18n custom_filters %}
5	5	{% load static i18n %}
	6	+{% load pagination %}
6	7
7	8	<html>
8	9	<head>
...	...	@@ -159,6 +160,7 @@
159	160	</div>
160	161	{% endfor %}
161	162
	163	+ {% pagination request paginator page_obj %}
162	164	{% endblock %}
163	165	</div>
164	166	</div>
...	...
...	...	@@ -38,53 +38,64 @@
38	38	{% csrf_token %}
39	39	<legend>{% trans 'User Register' %}</legend>
40	40	{% for field in form %}
41		- <div class="row">
42		- <div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
43		- {% if field.field.required %}
44		- <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
45		- {% else %}
46		- <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
47		- {% endif %}
48		- <div class="col-md-10">
49		- {% if field.auto_id == 'id_birth_date' %}
50		- {% render_field field class='form-control input-sm date-picker' %}
51		-
52		- <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
53		- {% elif field.auto_id == 'id_image' %}
54		- {% render_field field class='form-control input-sm' %}
55		- <div class="input-group">
56		- <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
57		- <span class="input-group-btn input-group-sm">
58		- <button type="button" class="btn btn-fab btn-fab-mini">
59		- <i class="material-icons">attach_file</i>
60		- </button>
61		- </span>
62		- </div>
63		- {% elif field.auto_id == 'id_cpf' %}
64		- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
65		-
66		- {% elif field.auto_id == 'id_phone' %}
67		- {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
	41	+ <div class="form-group is-empty {% if form.has_error %} has-error {% endif %} is-fileinput">
	42	+ {% if field.field.required %}
	43	+ <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}<span>*</span></label>
68	44	{% else %}
69		- {% render_field field class='form-control' %}
70		- <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
	45	+ <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
	46	+ {% endif %}
	47	+ <div class="col-md-10">
	48	+ {% if field.auto_id == 'id_birth_date' %}
	49	+ {% render_field field class='form-control input-sm date-picker' %}
	50	+
	51	+ <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
	52	+ {% elif field.auto_id == 'id_image' %}
	53	+ {% render_field field class='form-control input-sm' %}
	54	+ <div class="input-group">
	55	+ <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
	56	+ <span class="input-group-btn input-group-sm">
	57	+ <button type="button" class="btn btn-fab btn-fab-mini">
	58	+ <i class="material-icons">attach_file</i>
	59	+ </button>
	60	+ </span>
	61	+ </div>
	62	+ {% elif field.auto_id == 'id_curriculum' %}
	63	+ {% render_field field class='form-control input-sm' %}
	64	+ <div class="input-group">
	65	+ <input type="text" readonly="" class="form-control" placeholder="{% trans 'Chose your file ...' %}">
	66	+ <span class="input-group-btn input-group-sm">
	67	+ <button type="button" class="btn btn-fab btn-fab-mini">
	68	+ <i class="material-icons">attach_file</i>
	69	+ </button>
	70	+ </span>
	71	+ </div>
	72	+ {% elif field.auto_id == 'id_cpf' %}
	73	+ {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarCpf(this,event);' %}
	74	+
	75	+ {% elif field.auto_id == 'id_year_titration' %}
	76	+ {% render_field field class='form-control' onkeypress='campoNumerico(this,event);' %}
	77	+
	78	+ {% elif field.auto_id == 'id_phone' %}
	79	+ {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
	80	+ {% else %}
	81	+ {% render_field field class='form-control' %}
	82	+ <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
	83	+ {% endif %}
	84	+ </div>
	85	+
	86	+ {% if field.errors %}
	87	+ <div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
	88	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
	89	+ <span aria-hidden="true">×</span>
	90	+ </button>
	91	+ <ul>
	92	+ {% for error in field.errors %}
	93	+ <li>{{ error }}</li>
	94	+ {% endfor %}
	95	+ </ul>
	96	+ </div>
71	97	{% endif %}
72	98	</div>
73		-
74		- {% if field.errors %}
75		- <div class="alert alert-danger alert-dismissible col-md-offset-1 col-md-10 col-sm-offset-1 col-sm-10 col-xs-offset-1 col-xs-10" role="alert">
76		- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
77		- <span aria-hidden="true">×</span>
78		- </button>
79		- <ul>
80		- {% for error in field.errors %}
81		- <li>{{ error }}</li>
82		- {% endfor %}
83		- </ul>
84		- </div>
85		- {% endif %}
86		- </div>
87		- </div>
88	99	{% endfor %}
89	100	<div class="col-md-offset-2 col-md-6 col-sm-offset-2 col-sm-6 col-xs-6 col-xs-offset-2 col-xs-6">
90	101	<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" />
...	...
...	...	@@ -11,7 +11,7 @@ urlpatterns = [
11	11	url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
12	12	url(r'^notification/([0-9]+)/$', views.processNotification, name='notification_read'),
13	13	url(r'^getNotifications/$', views.getNotifications, name='getNotifications'),
14		- url(r'^guest/$', views.guest, name='guest'),
	14	+ url(r'^guest/$', views.GuestView.as_view(), name='guest'),
15	15
16	16	#Reset Password
17	17
...	...
...	...	@@ -6,7 +6,7 @@ from .decorators import log_decorator
6	6	from django.contrib import messages
7	7	from django.shortcuts import render, redirect
8	8	from django.template.loader import render_to_string
9		-from django.views.generic import CreateView, UpdateView
	9	+from django.views.generic import CreateView, UpdateView, ListView
10	10	from django.http import HttpResponse, JsonResponse
11	11	from django.core.mail import send_mail,BadHeaderError
12	12	from django.conf import settings
...	...	@@ -120,9 +120,18 @@ def getNotifications(request):
120	120	data['amountGotten'] = amountGotten
121	121	return JsonResponse(data)
122	122
123		-def guest (request):
124		- context = {
125		- 'courses': Course.objects.filter(public=True),
126		- 'categories': CourseCategory.objects.all(),
127		- }
128		- return render(request, 'guest.html', context)
129	123	\ No newline at end of file
	124	+
	125	+class GuestView (ListView):
	126	+
	127	+ template_name = 'guest.html'
	128	+ context_object_name = 'courses'
	129	+ paginate_by = 10
	130	+
	131	+ def get_queryset(self):
	132	+ return Course.objects.filter(public=True)
	133	+
	134	+
	135	+ def get_context_data (self, **kwargs):
	136	+ context = super(GuestView, self).get_context_data(**kwargs)
	137	+ context['categories'] = CourseCategory.objects.all()
	138	+ return context
...	...
	1	+$(document).ready(function(){
	2	+ $(".editation").css('display','none');
	3	+});
1	4	function show_editation(id_topic){
2		- $("#presentation_"+ id_topic).css('display','none');
3		- $("#editation_"+ id_topic).css('display','block');
4		-}
	5	+ $(".presentation_"+ id_topic).css('display','none');
	6	+ $(".editation_"+ id_topic).css('display','block');
	7	+};
	8	+ function show_presentation(id_topic){
	9	+ $(".editation_"+ id_topic).css('display','none');
	10	+ $(".presentation_"+ id_topic).css('display','block');
	11	+};
	12	+
5	13
6		-function show_presentation(id_topic){
7		- $("#editation_"+ id_topic).css('display','none');
8		- $("#presentation_"+ id_topic).css('display','block');
9		-}
10	14	\ No newline at end of file
...	...