Merge

ailsoncgt
2 parents 895649e2 996bf0e7
Showing 81 changed files with 1017 additions and 1191 deletions Show diff stats
Procfile
amadeus/settings.py
amadeus/staticfiles/js/modal_exam.js
amadeus/urls.py
app/templates/home.html
app/templates/home_professor.html
app/templates/home_student.html
core/middleware.py
core/migrations/0004_auto_20161110_1215.py
core/static/css/base/amadeus.css
core/static/js/topic_editation_presentation_search.js
core/templates/base.html
courses/serializers.py
courses/static/js/topic_editation_presentation.js
courses/templates/category/create.html
courses/templates/category/index.html
courses/templates/category/update.html
courses/templates/course/course_card.html
courses/templates/course/create.html
courses/templates/course/delete.html
-web: gunicorn amadeus.wsgi --log-file -
 \ No newline at end of file
+web: gunicorn amadeus.wsgi --log-file=-
 \ No newline at end of file
@@ -28,7 +28,7 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
 SECRET_KEY = '$=8)c!5)iha85a&8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4'
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 # Application definition
@@ -0,0 +1,43 @@
+//controles do modal
+$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
+  if($('.not_submited').length){
+      $('#exam').modal('show');
+  }
+});
+var Answer = {
+    init: function(url) { // utilizado para adicionar um novo campo de resposta
+      $.get(url, function(data){
+        $("#form").append(data);
+        var cont = 1;
+        $("#form div div div input").each(function(){
+                $(this).attr('name',cont++);
+        });
+      });
+    }
+};
+
+var Submite = {
+  post: function(url,dados){
+    $('#exam').modal('hide');
+      $.post(url,dados, function(data){
+      }).fail(function(data){
+        $("div.modal-backdrop.fade.in").remove();
+        $("#modal_exam").empty();
+        $("#modal_exam").append(data.responseText);
+      });
+  },
+  remove: function(url,dados, id_li_link){
+    $('#exam').modal('hide');
+      $.post(url,dados, function(data){
+        $(id_li_link).remove();
+        $("#modal_exam").empty();
+        $("div.modal-backdrop.fade.in").remove();
+      }).fail(function(){
+        $("#modal_exam").empty();
+        $("#modal_exam").append(data);
+        $('#exam').modal('show');
+      });
+  }
+}
+
+alert("essfd");
@@ -32,4 +32,5 @@ urlpatterns = [
     url(r'^summernote/', include('django_summernote.urls')),
 ]
-urlpatterns += static(settings.MEDIA_URL, document_root = settings.MEDIA_ROOT)
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root = settings.MEDIA_ROOT)
@@ -66,6 +66,7 @@
   {% breadcrumb 'Home' 'app:index' %}
 {% endblock %}
+
 {% block render_breadcrumbs %}
   {% render_breadcrumbs %}
 {% endblock %}
@@ -77,29 +78,27 @@
         </div>
         <div class="panel-body">
             <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                {% if user|has_role:'student' or not user.is_staff %}
-                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-                    <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
-                {% endif %}
-                    <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
+              <li>
+                  <a href="#menu_courses" class="accordion" data-toggle="collapse">{% trans 'Courses' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
+                  <div id="menu_courses" class="collapse">
+                      <ul class="nav nav-pill nav-stacked accordion_list">
+                        <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+                        <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
+                        {% if user|has_role:'system_admin' or user|has_role:'professor'%}
+                          <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</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>
+                        {% endif %}
+                      </ul>
+                  </div>
+              </li>
+              {% block menu %}
+
+              {% endblock %}
                 {% if user|has_role:'system_admin' %}
                     <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                     <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
                 {% endif %}
-                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
-                    <li>
-                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-                        <div id="courses_list" class="collapse">
-                            <ul class="nav nav-pill nav-stacked accordion_list">
-                            {% for course in courses_list %}
-                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-                            {% endfor %}
-                            </ul>
-                        </div>
-                    </li>
-                {% endif %}
             </ul>
         </div>
     </div>
@@ -15,18 +15,6 @@
 {% endblock %}
 {% block sidebar %}
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="javascript:void(0)">{% trans 'Pending tasks' %}</a></li>
-                <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'Manage Course' %}</a></li>
-            </ul>
-        </div>
-    </div>
 {% endblock %}
 {% block content %}
@@ -16,19 +16,6 @@
 {% block sidebar %}
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h4>{% trans 'Menu' %}</h4>
-        </div>
-        <div class="panel-body">
-          <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-                <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
-                <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
-            </ul>
-        </div>
-    </div>
 {% endblock %}
 {% block content %}
 from datetime import datetime
+import time
+from django.core.urlresolvers import resolve
 from django.shortcuts import get_object_or_404
 import json
@@ -9,36 +11,24 @@ class TimeSpentMiddleware(object):
 		self.get_response = get_response
 	def process_request(self, request):
-		if not request.is_ajax():
-			log_id = request.session.get('log_id', None)
+		app_names = resolve(request.path).app_names
-			if not log_id is None:
-				log = get_object_or_404(Log, id = log_id)
+		if not 'admin' in app_names:
+			if not request.is_ajax():
+				log_id = request.session.get('log_id', None)
-				date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f")
-				_now = datetime.now()
-				
-				time_spent = _now - date_time_click
-				
-				secs = time_spent.total_seconds()
-				hours = int(secs / 3600)
-				minutes = int(secs / 60) % 60
-				secs = secs % 60
+				if not log_id is None:
+					log = get_object_or_404(Log, id = log_id)
-				log_context = json.loads(log.context)
-				print(log.context)
+					if type(log.context) == dict:
+						log_context = log.context
+					else:
+						log_context = json.loads(log.context)
-				time = {}
-				time['hours'] = hours
-				time['minutes'] = minutes
-				time['seconds'] = secs
+					log_context['timestamp_end'] = str(int(time.time()))
-				log_context['time_spent'] = time
-				
-				log.context = log_context
-
-				log.save()
-
-				request.session['log_id'] = None
+					log.context = log_context
+					log.save()
+					request.session['log_id'] = None
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-10 15:15
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0003_auto_20161101_1457'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='log',
+            name='context',
+            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context'),
+        ),
+    ]
@@ -22,6 +22,9 @@
     position: absolute;
     left: 30%;
   }
+#btn-search{
+      margin-bottom: 0px;
+  }
 .user-notification-img{
   width:40%;
 }
@@ -453,4 +456,4 @@ ul, li {
 #panel2 .col-md-2, #panel2 .col-md-10{
   padding-left: 0;
-}
 \ No newline at end of file
+}
@@ -0,0 +1,79 @@
+
+var x = 0;
+$(".edit_card").on('click', function() {
+    $(".presentation").css('display','none');
+    $(".editation").css('display','block');
+})
+$(".edit_card_end").on('click', function() {
+    $(".editation").css('display','none');
+    $(".presentation").css('display','block');
+})
+
+$("#bot").on('click', function(){
+	x = x+1;
+	console.log(2)
+	if(x%2 == 0){
+		console.log(0)
+	$("#down").attr('class', 'fa fa-caret-square-o-down');
+}
+else{
+	console.log(1)
+	$("#down").attr('class', 'fa fa-caret-square-o-up');
+}
+
+})
+$("#bot1").on('click', function(){
+	x = x+1;
+	console.log(2)
+	if(x%2 == 0){
+		console.log(0)
+	$("#down1").attr('class', 'fa fa-caret-square-o-down');
+}
+else{
+	console.log(1)
+	$("#down1").attr('class', 'fa fa-caret-square-o-up');
+}
+
+})
+
+$("#bot2").on('click', function(){
+	x = x+1;
+	console.log(2)
+	if(x%2 == 0){
+		console.log(0)
+	$("#down2").attr('class', 'fa fa-caret-square-o-down');
+}
+else{
+	console.log(1)
+	$("#down2").attr('class', 'fa fa-caret-square-o-up');
+}
+
+})
+
+$("#bot3").on('click', function(){
+	x = x+1;
+	console.log(2)
+	if(x%2 == 0){
+		console.log(0)
+	$("#down3").attr('class', 'fa fa-caret-square-o-down');
+}
+else{
+	console.log(1)
+	$("#down3").attr('class', 'fa fa-caret-square-o-up');
+}
+
+})
+$("#bot4").on('click', function(){
+	x = x+1;
+	console.log(2)
+	if(x%2 == 0){
+		console.log(0)
+	$("#down4").attr('class', 'fa fa-caret-square-o-down');
+}
+else{
+	console.log(1)
+	$("#down4").attr('class', 'fa fa-caret-square-o-up');
+}
+
+})
+
@@ -54,6 +54,12 @@
 	{% endblock %}
 	{% block javascript %}
 	{% endblock %}
+
+	<!-- Summernote -->
+	<script src="http://podivej.se/js/summernote.min.js" type="text/javascript"></script>
+	<link href="http://podivej.se/css/summernote.css" type="text/css" rel="stylesheet" />
+	<link href="http://podivej.se/css/summernote-bs3.css" type="text/css" rel="stylesheet">
+
 </head>
 <body>
 	{% block nav %}
@@ -66,20 +72,24 @@
            		</button>
            		<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="navbar-collapse collapse navbar-responsive-collapse">
 							<div class="col-md-5 cards-content" id= 'NavBarSearch'>
 								<form id="SearchForm" action="{% url 'users:search' %}" 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>
+													 <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" style="color:#93C741"></i>
+													<button type="submit" class="btn btn-primary" id="btn-search">
+														<i class="fa fa-search fa-2x" aria-hidden="true" style="color:#93C741"></i>
 													</button>
-												</span>
+                        </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>
@@ -99,7 +109,15 @@
                </li>
              			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
-             			<li > <a  class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
+             			<li >
+										<a href="" data-toggle="dropdown">{{ user }}</a>
+										<ul class="dropdown-menu pull-right">
+	                    <li><a href="{% url 'users:profile' %}">{% trans 'Perfil' %}</a></li>
+	                    <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
+	                    <li><a href="{% url 'users:change_password' %}">{% trans 'Change password' %}</a></li>
+	                    <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>
+                  	</ul>
+									</li>
              			<li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
            		</ul>
          		</div>
@@ -109,53 +127,6 @@
 		<div class="row">
     		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
     			{% block sidebar %}
-    				    <div class="panel panel-primary navigation">
-					        <div class="panel-heading">
-					            <h4>{% trans "Menu" %}</h4>
-					        </div>
-					        <div class="panel-body">
-					            <ul class="nav nav-pills nav-stacked">
-					                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-					                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-					                {% if user|has_role:'student' or not user.is_staff %}
-					                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-					                    <li><a href="{% url 'core:all_courses' %}">{% trans 'All Courses' %}</a></li>
-					                {% endif %}
-					                    <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
-					                {% if user|has_role:'system_admin' %}
-					                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-					                {% endif %}
-					                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
-					                    <li>
-					                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-					                        <div id="courses_list" class="collapse">
-					                            <ul class="nav nav-pill nav-stacked accordion_list">
-					                            {% for course in courses_list %}
-					                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-					                            {% endfor %}
-					                            </ul>
-					                        </div>
-					                    </li>
-					                {% endif %}
-					            </ul>
-					        </div>
-					    </div>
-
-					    {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-						<div class="panel panel-primary navigation">
-						    <div class="panel-heading">
-						        <h3 class="panel-title">{% trans 'Category' %}</h3>
-						    </div>
-						    <div class="panel-body">
-						        <ul class="nav nav-pills nav-stacked">
-						            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category'%}</a></li>
-						            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
-						        </ul>
-						    </div>
-						</div>
-
-						{% endif %}
 	    		{% endblock %}
     		</div>
 		   <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
@@ -4,26 +4,17 @@ from users.serializers import UserSerializer
 class CourseSerializer(serializers.ModelSerializer):
 	#The set comes from the ManyToMany Relationship in django
-	students = UserSerializer(many=True)
-	professors = UserSerializer(many=True)
-	category = serializers.ReadOnlyField(source ='category.name')
 	class Meta:
 		model = Course
 		fields = ('name', 'slug', 'objectivies', 'content', 'max_students', 'create_date', 
 			'init_register_date', 'end_register_date', 'init_date', 'end_date', 'public', 'category' ,'students', 'professors')
 class SubjectSerializer(serializers.ModelSerializer):
-	students = UserSerializer(many=True)
-	professors = UserSerializer(many=True)
-	course = serializers.ReadOnlyField(source='course.name')
-	category = serializers.ReadOnlyField(source ='category.name')
 	class Meta:
 		model = Subject
 		fields = ('name','slug','description','visible','init_date','course','category','professors','course','students')
 class TopicSerializer(serializers.ModelSerializer):
-	subject = serializers.ReadOnlyField(source='subject.name')
-	owner = serializers.ReadOnlyField(source='owner.username')
 	class Meta:
 		model = Topic
 		fields = ('name', 'slug','description','create_date','update_date','visible','owner','subject')
 $(document).ready(function(){
-    $(".editation").hide();
+    $(".editation").hide();  
 });
+
 function show_editation(id_topic){
     $(".presentation_"+ id_topic).hide();
     $(".editation_"+ id_topic).show();
+    $('#summernote').summernote({height: 300});
 };
 function show_presentation(id_topic){
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
@@ -10,48 +10,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
-
-{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-    <div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-
-
-	<div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Category' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-{% endif %}
-
-{% endblock %}
-
 {% block content %}
 	<div class="card card-content">
         <div class="card-body">
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n %}
 {% load static i18n permission_tags %}
@@ -11,46 +11,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
-
-	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-    <div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-
-	<div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Category' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-{% endif %}
-{% endblock %}
-
 {% block content %}
 	{% if messages %}
 		{% for message in messages %}
@@ -83,7 +43,7 @@
 						              </ul>
 						            </div>
 						        </div>
-					        
+
 					      </div>
 					    </div>
 					</div>
@@ -114,4 +74,4 @@
 	</div>
 	<div class="row" id="modal_category">
 <script src="{% static 'js/modal_category.js' %}"></script>
-{% endblock %}
 \ No newline at end of file
+{% endblock %}
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n %}
 {% load static i18n permission_tags %}
@@ -11,45 +11,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
-
-{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-    <div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Actions' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-	<div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">{% trans 'Category' %}</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
-	        </ul>
-	    </div>
-	</div>
-{% endif %}
-{% endblock %}
-
 {% block content %}
 	{% if messages %}
 		{% for message in messages %}
@@ -7,13 +7,13 @@
             <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{course.slug}}" href=".collapseOne-{{course.slug}}" aria-expanded="false" aria-controls="collapseOne-{{course.slug}}">
                 <button class="btn btn-default btn-sm caret-square"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
             </div>
-            <div class="col-xs-9 col-md-4 titleTopic">
+            <div class="col-xs-5 col-md-5 titleTopic">
               <a role="button" href="{% url 'course:view' course.slug %}">
                   <h4>{{course.name}}</h4>
               </a>
             </div>
             {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-            <div class="col-xs-4 col-md-6 divMoreActions" >
+            <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>
@@ -55,11 +55,11 @@
     </div>
 </div>
-<div class="modal fade" id="replicateCourse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myModalLabel">{% trans 'Repicate Course' %}</h4>
+                <h4 class="modal-title">{% trans 'Repicate Course' %}</h4>
             </div>
             <div class="modal-body">
                 <section>
@@ -73,4 +73,4 @@
         </div>
     </div>
 </div>
- <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
 \ No newline at end of file
+ <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
@@ -12,41 +12,48 @@
 {% block content %}
 <div class="card card-content">
-        <div class="card-body">
-					<form method="post" action="" enctype="multipart/form-data">
-						{% csrf_token %}
-						{% for field in form %}
-							<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="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+    <div class="card-body">
+		<form method="post" action="" enctype="multipart/form-data">
+			{% csrf_token %}
+			{% for field in form %}
+				<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="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' %}
-								{% endif %}
-								<span class="help-block">{{ field.help_text }}</span>
-								{% if field.errors %}
-								<div class="row">
-								</br>
-										<div class="alert alert-danger alert-dismissible" 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>
-								</div>
-								{% endif %}
+					{% else %}
+						{% render_field field class='form-control' %}
+					{% endif %}
+					<span class="help-block">{{ field.help_text }}</span>
+					{% if field.errors %}
+					<div class="row">
+					</br>
+							<div class="alert alert-danger alert-dismissible" 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>
-						{% endfor %}
-						<div class="row text-center">
-								<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary" />
-						</div>
-          </form>
-    </div>
+					</div>
+					{% endif %}
+				</div>
+			{% endfor %}
+			<div class="row text-center">
+					<input type="submit" value="{% trans 'Create' %}" class="btn btn-primary btn-raised" />
+			</div>
+      	</form>
+	</div>
 </div>
 </br>
+<script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+</script>
 {% endblock %}
@@ -20,7 +20,7 @@
       <!-- Modal Footer -->
       <div class="modal-footer">
         <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
         <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
 		<script>
 		  $("#delete_form").submit(function(event) {
@@ -1,23 +0,0 @@
-{% extends 'app/base.html' %}
-
-{% load static i18n %}
-{% load widget_tweaks %}
-
-{% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Home Course' %}</li>
-	</ol>
-{% endblock %}
-
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'course:manage' %}" class="list-group-item">
-	    	{% trans 'Courses' %}
-	  	</a>
-	</div>
-{% endblock %}
-
-{% block content %}
-
-{% endblock %}
-{% extends 'home_professor.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
@@ -10,77 +10,6 @@
 {% endblock %}
-{% block sidebar %}
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h4>{% trans 'Menu' %}</h4>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                {% if user|has_role:'student' or not user.is_staff %}
-                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-                    <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
-                {% endif %}
-                <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
-                {% if user|has_role:'system_admin' %}
-                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-                {% endif %}
-                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
-                    <li>
-                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-                        <div id="courses_list" class="collapse">
-                            <ul class="nav nav-pill nav-stacked accordion_list">
-                            {% for course in courses_list %}
-                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-                            {% endfor %}
-                            </ul>
-                        </div>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-            <div class="panel panel-primary">
-                <div class="panel-heading">
-                    <h3 class="panel-title">{% trans 'Category' %}</h3>
-                </div>
-                <div class="panel-body">
-                    <ul class="nav nav-pills nav-stacked">
-                        <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
-                        <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
-                    </ul>
-                </div>
-            </div>
-        {% endif %}
-         <div class="panel-group" id="accordion">
-                <div class="panel panel-primary">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                            </span>{% trans 'Categorys' %}</a>
-                        </h4>
-                    </div>
-                    <div id="collapseOne" class="panel-collapse collapse in">
-                        <div class="panel-body">
-                            <table class="table">
-                            {% for category in categorys_courses %}
-                                <tr>
-                                    <td>
-                                        <a href="?category={{category.name}}">{{category.name}}</a>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-{% endblock %}
-
 {% block content %}
     {% if messages %}
         {% for message in messages %}
@@ -94,7 +23,7 @@
     {% endif %}
 <div class="col-md-12 cards-content">
-    <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
+    <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="Search Courses" name="q"></div>
@@ -122,21 +51,18 @@
                         </div>
                     </div>
                     <div id="{{category.slug}}" class="panel-collapse collapse">
-                        {% for course in category.course_category.all %}
-                            {% if user in course.students.all or user in course.professors.all or user|has_role:'system_admin' %}
+                        {% for course in category.course_category %}
+                            {# {% if user in course.students.all or user in course.professors.all or user|has_role:'system_admin' %}#}
                                  {% include "course/course_card.html" %}
-                            {% endif %}
+                            {# {% endif %}#}
                         {% endfor %}
                     </div>
                 </div>
             </div>
-            
-            
+
+
         {% endfor %}
     </div>
-         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-            <a href="{% url 'course:create' %}" class="btn btn-primary btn-fab float-button"><i class="fa fa-plus material-icons"></i></a>
-         {% endif %}
         <div class="col-md-12">
         <nav aria-label="Page navigation">
             <ul class="pagination">
@@ -4,132 +4,139 @@
 {% load widget_tweaks %}
 {% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Replicate Course' %}</li>
-	</ol>
+<ol class="breadcrumb">
+	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+	<li class="active">{% trans 'Replicate Course' %}</li>
+</ol>
 {% endblock %}
 {% block content %}
 <div class="card card-content">
-        <div class="card-body">
-					<form method="post" action="" enctype="multipart/form-data">{% csrf_token %}						
-							<div class="form-group  is-fileinput">
-								<label for="id_name">{% trans 'Name' %}</label>
-								
-								
-									<input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">
-								
-								<span class="help-block">{% trans 'Course name' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_objectivies">{% trans 'Objectives' %}</label>
-								
-									<textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{course.objectivies}}</textarea>
-								
-								<span class="help-block">{% trans 'Course objective' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_content">{% trans 'Content' %}</label>
-								
-								
-									<textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>
-								
-								<span class="help-block">{% trans 'Course modules' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_max_students">{% trans 'Number of studets maximum' %}</label>
-								
-								
-									<input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">
-								
-								<span class="help-block">{% trans 'Max number of students that a class can have' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_init_register_date">{% trans 'Course registration start date' %}</label>
-								
-								
-									<input type="text" class="form-control date-picker" name="init_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-								
-								<span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_end_register_date">{% trans 'Course registration end date' %}</label>
-								
-								
-									<input type="text" class="form-control date-picker" name="end_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-								
-								<span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_init_date">{% trans 'Course start date' %}</label>
-								
-								
-									<input type="text" class="form-control date-picker" name="init_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-								
-								<span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_end_date">{% trans 'Course end date' %}</label>
-								
-								
-									<input type="text" class="form-control date-picker" name="end_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-								
-								<span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_image">{% trans 'Imagem' %}</label>
-								
-								
-									<input class="form-control" id="id_image" name="image" type="file">
-									<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">{% trans 'attach_file' %}</i>
-												</button>
-										</span>
-									</div>
-								
-								<span class="help-block">{% trans 'Representative image of the course' %}</span>
-								
-							</div>
-						
-							<div class="form-group  is-fileinput">
-								<label for="id_category">{% trans 'CourseCategory' %}</label>
-								
-								
-									<select class="form-control" id="id_category" name="category" required="">
-										{% for category in categorys_courses %}
-											<option value="{{category.id}}">{{category}}</option>
-										{% endfor %}
-									</select>
-								
-								<span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>
-								
-							</div>
-						
-						<div class="row text-center">
-								<input type="submit" value="Create" class="btn btn-primary">
-						</div>
-          </form>
-    </div>
+	<div class="card-body">
+		<form method="post" action="" enctype="multipart/form-data">
+			{% csrf_token %}
+			<div class="form-group  is-fileinput">
+			<label for="id_name">{% trans 'Name' %}</label>
+
+
+				<input class="form-control" id="id_name" maxlength="100" name="name" type="text" required="" value="{{course.name}}">
+
+				<span class="help-block">{% trans 'Course name' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_objectivies">{% trans 'Objectives' %}</label>
+
+				<textarea class="form-control" cols="80" id="id_objectivies" name="objectivies" rows="5">{{ course.objectivies }}</textarea>
+
+				<span class="help-block">{% trans 'Course objective' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_content">{% trans 'Content' %}</label>
+
+
+				<textarea class="form-control" cols="80" id="id_content" name="content" rows="5">{{course.content}}</textarea>
+
+				<span class="help-block">{% trans 'Course modules' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_max_students">{% trans 'Number of studets maximum' %}</label>
+
+
+				<input class="form-control" id="id_max_students" min="0" name="max_students" type="number" value="{{course.max_students}}">
+
+				<span class="help-block">{% trans 'Max number of students that a class can have' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_init_register_date">{% trans 'Course registration start date' %}</label>
+
+
+				<input type="text" class="form-control date-picker" name="init_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+
+				<span class="help-block">{% trans 'Date that starts the registration period of the course (dd/mm/yyyy)' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_end_register_date">{% trans 'Course registration end date' %}</label>
+
+
+				<input type="text" class="form-control date-picker" name="end_register_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+
+				<span class="help-block">{% trans 'Date that ends the registration period of the course (dd/mm/yyyy)' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_init_date">{% trans 'Course start date' %}</label>
+
+
+				<input type="text" class="form-control date-picker" name="init_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+
+				<span class="help-block">{% trans 'Date that the course starts (dd/mm/yyyy)' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_end_date">{% trans 'Course end date' %}</label>
+
+
+				<input type="text" class="form-control date-picker" name="end_date" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+
+				<span class="help-block">{% trans 'Date that the course ends (dd/mm/yyyy)' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_image">{% trans 'Imagem' %}</label>
+
+
+				<input class="form-control" id="id_image" name="image" type="file">
+				<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">{% trans 'attach_file' %}</i>
+						</button>
+					</span>
+				</div>
+
+				<span class="help-block">{% trans 'Representative image of the course' %}</span>
+
+			</div>
+
+			<div class="form-group  is-fileinput">
+				<label for="id_category">{% trans 'CourseCategory' %}</label>
+
+
+				<select class="form-control" id="id_category" name="category" required="">
+					{% for category in categorys_courses %}
+					<option value="{{category.id}}">{{category}}</option>
+					{% endfor %}
+				</select>
+
+				<span class="help-block">{% trans 'CourseCategory which the course belongs' %}</span>
+
+			</div>	
+
+			<div class="row text-center">
+				<input type="submit" value="Create" class="btn btn-primary btn-raised">
+			</div>
+		</form>
+	</div>
 </div>
-</br>
-{% endblock %}
 \ No newline at end of file
+  <script>
+    $(document).ready(function() {
+        $('#id_objectivies').summernote();
+        $('#id_content').summernote();
+    });
+  </script>
+</br></br></br>
+{% endblock %}
@@ -41,7 +41,7 @@
 				</div>
 			{% endfor %}
 			<div class="row text-center">
-					<input type="submit" value="{% trans 'Update' %}" class="btn btn-primary" />
+					<input type="submit" value="{% trans 'Update' %}" class="btn btn-primary btn-raised" />
 			</div>
     </form>
 	</div>
@@ -49,4 +49,11 @@
 </br>
 </br>
 </br>
-{% endblock %}
 \ No newline at end of file
+<script type="text/javascript">
+    var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
+</script>
+{% endblock %}
@@ -21,53 +21,6 @@
   </ol>
 {% endblock %}
-{% block sidebar %}
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h4>{% trans 'Menu' %}</h4>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'core:home' %}">{% trans "Home" %}</a></li>
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-                <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
-                <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
-                {# <li><a href="{% url 'course:participants' %}">{% trans 'Participants' %}</a></li> #}
-                {% if user|has_role:'system_admin' %}
-                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-                {% endif %}
-                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
-                    <li>
-                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-                        <div id="courses_list" class="collapse">
-                            <ul class="nav nav-pill nav-stacked accordion_list">
-                            {% for course in courses_list %}
-                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-                            {% endfor %}
-                            </ul>
-                        </div>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h5>{% trans 'Categories' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li {% if category is None %}class="active"{% endif %}><a href="{% url 'course:view' course.slug %}">{% trans 'All' %}</a></li>
-                {% for cat in categorys_subjects %}
-                    <li {% if category == cat.slug %}class="active"{% endif %}><a href="{% url 'course:view_filter' course.slug cat.slug %}">{{ cat }}</a></li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-{% endblock %}
-
 {% block content %}
   <div class="col-md-12 cards-content">
@@ -124,8 +77,8 @@
         <div>
         </div>
         <div class="modal-footer">
-          <button type="button" data-dismiss="modal" class="btn btn-default">{% trans "Cancel" %}</button>
-          <a href="#" target="_self"><button type="button" class="btn btn-primary"> {% trans "Confirm" %}</button></a>
+          <button type="button" data-dismiss="modal" class="btn btn-default btn-raised">{% trans "Cancel" %}</button>
+          <a href="#" target="_self"><button type="button" class="btn btn-primary btn-raised"> {% trans "Confirm" %}</button></a>
         </div>
       </div>
     </div>
@@ -158,9 +111,11 @@
                         <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="{% url 'course:replicate_subject' subject.slug %}" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Replicate' %}</a></li>
-                        <li><a href="javascript:delete_subject.get('{% url 'course:delete_subject' subject.slug %}','#subject','#modal_subject')" data-toggle="modal" data-target="#removeSubject"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans 'Remove' %}</a></li>
+                        <li><a href="{% url 'course:replicate_subject' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
+                        <li><a href="{% url 'course:update_subject' subject.slug %}"> <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+                        <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
                       </ul>
+
                     </div>
                   </div>
                 {% endif %}
@@ -20,7 +20,7 @@
       <!-- Modal Footer -->
       <div class="modal-footer">
         <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Close" %}</button>
         <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
 		<script>
 		  $("#delete_form").submit(function(event) {
@@ -0,0 +1,20 @@
+{% load static i18n permission_tags professor_access %}
+
+<script src="{% static 'js/modals_requisitions.js'%}"></script>
+<script src="{% static 'js/modal_exam.js'%}"></script>
+
+{% for exam in exams %}
+  {% professor_subject exam.topic.subject request.user as permission%}
+  {% if permission %}
+    <li id="exam_{{exam.slug}}"><i class="material-icons">{% trans 'exam' %}</i> <a href="javascript:modal.get('{% url 'course:exam:update_exam' exam.slug %}','#exam','#modal_exam');">{{ exam.name }}</a><a href="javascript:modal.get('{% url 'course:exam:delete_exam' exam.slug %}','#exam','#modal_exam');"><span class="glyphicon glyphicon-remove"></span></a></li>
+  {% else %}
+    <li id="exam_{{exam.slug}}"><i class="material-icons">{% trans 'exam' %}</i> <a href="javascript:modal.get('{% url 'course:exam:view_exam' exam.slug %}','#exam','#modal_exam');">{{ exam.name }}</a></li>
+  {% endif %}
+  {% endfor %}
+{# <button class="btn btn-primary btn-raised" onclick="javascript:modal.get('{% url 'course:exam:create_exam' topic.slug%}','#exam','#modal_exam');">{% trans '+ Create Exam' %}</button> #}
+<div class="row" id="modal_exam">
+
+
+
+
+</div>
@@ -25,6 +25,8 @@
             <li><a href="javascript:show_editation('{{topic.slug}}')"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
             <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeTopic"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
           </ul>
+
+
           {% endif %}
         </div>
       </div>
@@ -49,7 +51,7 @@
       </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>
+        <textarea class="form-control" rows="3" id="summernote">{{topic.description}}</textarea>
       </div>
       {# materiais do topico#}
@@ -99,6 +101,7 @@
               <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','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
               </ul>
             </div>
@@ -119,6 +122,7 @@
               {% list_topic_foruns request topic %}
             </ul>
           </div>
+
         </div>
       </div>
@@ -207,3 +211,5 @@
   </div>
 </div>
 <!-- EndModal -->
+
+
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags professor_access %}
@@ -21,41 +21,6 @@
     <li class="active">{{ subject }}</li>
   </ol>
 {% endblock %}
-{% block sidebar %}
-  <div class="panel panel-primary">
-    <div class="panel-heading">
-      <h4>{% trans 'Menu' %}</h4>
-    </div>
-    <div class="panel-body">
-      <ul class="nav nav-pills nav-stacked">
-        <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-        <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-        {% if user|has_role:'student' or not user.is_staff %}
-        <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-        <li><a href="{% url 'core:guest' %}">{% trans 'All Courses' %}</a></li>
-        {% endif %}
-        <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
-        {% if user|has_role:'system_admin' %}
-        <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-        {% endif %}
-        {% if user|has_role:'system_admin' or user|has_role:'professor' %}
-        <li>
-          <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
-          <div id="courses_list" class="collapse">
-            <ul class="nav nav-pill nav-stacked accordion_list">
-              {% for course in courses_list %}
-              <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
-              {% endfor %}
-            </ul>
-          </div>
-        </li>
-        {% endif %}
-      </ul>
-    </div>
-  </div>
-
-
-{% endblock %}
 {% block content %}
   <div class="panel panel-info">
@@ -75,7 +40,7 @@
             </button>
             <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
               <li><a href="{% url 'course:replicate_subject' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a></li>
-              <li><a href="{% url 'course:update_subject' subject.slug %}" <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
+              <li><a href="{% url 'course:update_subject' subject.slug %}"> <i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a></li>
               <li><a href="{% url 'course:delete_subject' subject.slug %}" ><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Remove" %}</a></li>
             </ul>
           </div>
@@ -4,4 +4,5 @@
   {% for poll in polls %}
       <li id="poll_{{poll.slug}}"><i class="fa fa-bar-chart"></i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#requisicoes_ajax');">{{ poll }}</a></li>
   {% endfor %}
+
 </div>
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags professor_access%}
@@ -11,30 +11,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-
-    <div class="panel panel-primary">
-
-      <div class="panel-heading">
-        <h3 class="panel-title">{{course}}</h3>
-      </div>
-
-      <div class="panel-body">
-        {% for category in subject_categories %}
-				<div class="row">
-					<div class="col-md-12 col-sm-12">
-						<a href="" class="btn btn-default text-left">{{subject}}</a>
-					</div>
-				</div>
-        {% endfor %}
-      </div>
-    </div>
-
-		{% if user|has_role:'system_admin' or user|has_role:'professor' %}
-			<a href="" class="btn btn-primary btn-md btn-block">{% trans "Create Subject Category" %}</a>
-		{% endif %}
-{% endblock %}
-
 {% block content %}
   	<div class="panel panel-info">
     	<div class="panel-heading">
@@ -20,7 +20,7 @@
       <!-- Modal Footer -->
       <div class="modal-footer">
         <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
         <button type="submit" id="button" form="delete_topic_{{topic.slug}}" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
 		<script>
 		  $("#delete_topic_{{topic.slug}}").submit(function(event) {
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags professor_access %}
@@ -26,24 +26,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-        	<ul class="nav nav-pills nav-stacked">
-              	<li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-              	<li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
-
-
-
-{% endblock %}
-
 {% block content %}
 <div class="col-md-12 col-xs-12 col-sm-12">
 <div class="panel panel-info">
@@ -2,6 +2,6 @@
 <div id="list-topic{{ topic.id }}-links-edit">
   {% for link in links%}
     <li class="icon_edit_remove" id = "link_edit_icon_{{ link.slug }}"> <a href="javascript:modal.get('{% url 'course:links:update_link' link.slug %}', '#linksModalEdit', '#requisicoes_ajax')"><i class="fa fa-pencil fa-lg" aria-hidden="true"></i></a>  <a href="javascript:modal.get('{% url 'course:links:delete_link' link.slug %}', '#linkDeleteModal', '#requisicoes_ajax')"><i class="fa fa-trash fa-lg" aria-hidden="true"></i></a></li>
-    <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#requisicoes_ajax')">{{link.name}}</a></li>
+    <li id = "link_edit_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#requisicoes_ajax')">{{link.name}}</a></li>
   {% endfor %}
 </div>
@@ -6,11 +6,11 @@
     <div class="resource_inline">
       <h4>{% trans "Materials" %}</h4>
     </div>
-    
+
     <ul id="list-materials">
         {% list_topic_file request topic %}
         {% list_topic_link request topic%}
-      
+
     </ul>
   </div>
   <div class="col-xs-4 col-md-4">
@@ -19,10 +19,11 @@
     </div>
     <ul>
         <div class="foruns_list">
+            {% list_topic_exam request topic %}
             {% list_topic_poll request topic %}
             {% list_topic_foruns request topic %}
         </div>
     </ul>
   </div>
- 
-</div>
 \ No newline at end of file
+
+</div>
@@ -3,6 +3,7 @@ from django import template
 from links.models import Link
 from forum.models import Forum
 from poll.models import Poll
+from exam.models import Exam
 from files.models import TopicFile
 register = template.Library()
@@ -31,6 +32,7 @@ def list_topic_poll(request, topic):
     return context
+
 @register.inclusion_tag('subject/poll_item_actions_teacher.html')
 def list_topic_poll_teacher(request, topic):
     context = {
@@ -25,11 +25,39 @@ from courses.models import Material
 from django.urls import reverse
 from datetime import date, datetime
+import time
 #API IMPORTS
 from rest_framework import viewsets, permissions
 from .serializers import *
+class Category:
+	name = None
+	slug = None
+	course_category = []
+
+def course_category(list_courses):
+
+	list_courses = list_courses.distinct().order_by('category','name')
+	categorys_courses = []
+	cat_slug = None
+	cat = None
+	for course in list_courses:
+		if (course.category.slug != cat_slug):
+			if (cat != None):
+				categorys_courses.append(cat)
+			cat_slug = course.category.slug
+			cat = Category()
+			cat.name = course.category.name
+			cat.slug = cat_slug
+			cat.course_category = []
+		cat.course_category.append(course)
+
+	if (cat):
+		categorys_courses.append(cat)
+
+	return categorys_courses
+
 class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")
@@ -37,8 +65,6 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	queryset = Course.objects.all()
 	template_name = 'course/index.html'
 	context_object_name = 'courses'
-	paginate_by = 10
-	aparece = True
 	def get_queryset(self):
@@ -47,14 +73,12 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		course_search = self.request.GET.get('q', None)
 		category_search = self.request.GET.get('category', None)
 		if course_search:
-			self.aparece = False
 			query_list = course_search.split()
 			result = result.filter(
 			reduce(operator.and_,
 				(Q(name__icontains=q) for q in query_list))
 			)
 		if category_search:
-			self.aparece = False
 			query_list = category_search.split()
 			result = result.filter(
 			reduce(operator.and_,
@@ -65,58 +89,40 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
 		list_courses = None
-		categorys_courses = None
-		if has_role(self.request.user,'professor'):
-			list_courses = Course.objects.filter(Q(professors = True)|Q(professors__name = self.request.user.name)).order_by('name')
-			categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
-		elif has_role(self.request.user,'system_admin'):
-			list_courses = queryset.order_by('name')
-			categorys_courses = CourseCategory.objects.all()
+		if has_role(self.request.user,'system_admin'):
+			list_courses = self.get_queryset().order_by('name')
+			# categorys_courses = CourseCategory.objects.all()
+		elif has_role(self.request.user,'professor'):
+			list_courses = self.get_queryset().filter(professors__in = [self.request.user])
+			# categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
 		elif has_role(self.request.user, 'student'):
-			list_courses = Course.objects.filter(Q(students = True)|Q(students__name = self.request.user.name)).order_by('name')
-			categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
-
-		paginator = Paginator(list_courses, self.paginate_by)
-		page = self.request.GET.get('page')
-
-		try:
-		    list_courses = paginator.page(page)
-		except PageNotAnInteger:
-		    list_courses = paginator.page(1)
-		except EmptyPage:
-		    list_courses = paginator.page(paginator.num_pages)
-
-		context['list_courses'] = list_courses
-		context['categorys_courses'] = categorys_courses
-		context['aparece'] = self.aparece
+			list_courses = self.get_queryset().filter(students__in = [self.request.user])
+		context['categorys_courses'] = course_category(list_courses)
 		return context
 class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
-	queryset = Course.objects.all()
 	template_name = 'course/index.html'
 	context_object_name = 'courses'
-	paginate_by = 5
-	aparece = True
 	def get_queryset(self):
-		result = super(AllCoursesView, self).get_queryset()
+		result = Course.objects.all()
 		course_search = self.request.GET.get('q', None)
 		category_search = self.request.GET.get('category', None)
 		if course_search:
-			self.aparece = False
+			# self.aparece = False
 			query_list = course_search.split()
 			result = result.filter(
 			reduce(operator.and_,
 				(Q(name__icontains=q) for q in query_list))
 			)
 		if category_search:
-			self.aparece = False
+			# self.aparece = False
 			query_list = category_search.split()
 			result = result.filter(
 			reduce(operator.and_,
@@ -126,25 +132,10 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	def get_context_data(self, **kwargs):
 		context = super(AllCoursesView, self).get_context_data(**kwargs)
-		list_courses = None
-		categorys_courses = None
-		list_courses = Course.objects.all().order_by('name')
-		#categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
-		categorys_courses = CourseCategory.objects.all()
-		paginator = Paginator(list_courses, self.paginate_by)
-		page = self.request.GET.get('page')
-		try:
-		    list_courses = paginator.page(page)
-		except PageNotAnInteger:
-		    list_courses = paginator.page(1)
-		except EmptyPage:
-		    list_courses = paginator.page(paginator.num_pages)
-
-		context['list_courses'] = list_courses
-		context['categorys_courses'] = categorys_courses
-		context['aparece'] = self.aparece
+		list_courses = self.get_queryset()
+		context['categorys_courses'] = course_category(list_courses)
 		return context
 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.edit.CreateView):
@@ -345,10 +336,10 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView):
 		self.log_context['course_slug'] = course.slug
 		self.log_context['course_category_id'] = course.category.id
 		self.log_context['course_category_name'] = course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(CourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		category_sub = self.kwargs.get('category', None)
@@ -552,10 +543,10 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
 		self.log_context['course_slug'] = subject.course.slug
 		self.log_context['course_category_id'] = subject.course.category.id
 		self.log_context['course_category_name'] = subject.course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(SubjectsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return super(SubjectsView, self).dispatch(*args, **kwargs)
@@ -657,10 +648,10 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
 		self.log_context['course_slug'] = topic.subject.course.slug
 		self.log_context['course_category_id'] = topic.subject.course.category.id
 		self.log_context['course_category_name'] = topic.subject.course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(TopicsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return super(TopicsView, self).dispatch(*args, **kwargs)
@@ -1003,10 +994,10 @@ class FileMaterialView(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['course_slug'] = file.topic.subject.course.slug
 		self.log_context['course_category_id'] = file.topic.subject.course.category.id
 		self.log_context['course_category_name'] = file.topic.subject.course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(FileMaterialView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return super(FileMaterialView, self).dispatch(*args, **kwargs)
@@ -1028,4 +1019,3 @@ class TopicViewSet(viewsets.ModelViewSet):
 	queryset = Topic.objects.all()
 	serializer_class = TopicSerializer
 	permissions_class = (permissions.IsAuthenticatedOrReadOnly)
-
 {% extends "home.html" %}
-{% load i18n %}
-
-{% block content %}
-<div class="panel panel-info">
-  <div class="panel-heading">
-    {% block title_poll %}
-    <h1 class="panel-title">{% trans "New Exam" %}</h1>
-    {% endblock title_poll %}
-  </div>
-  <div class="panel-body">
-    <div class="row form-group">
-      <label for="exam_name" class="col-md-2 control-label">{% trans "Exam Name" %}</label>
-      <div class="col-md-10">
-        <input type="text" name="exam_name" class="form-control" id="exam_name" placeholder="{% trans 'Exam Name' %}">
-      </div>
-    </div>
-    <div class="row form-group">
-      <label for="begin_date" class="col-md-2 control-label">{% trans "Exam's begin date" %}</label>
-      <div class="col-md-10">
-        <input type="date" name="begin_date" class="form-control" id="begin_date" placeholder='{% trans "Begin Date" %}'>
-      </div>
-    </div>
-    <div class="row form-group">
-      <label for="end_date" class="col-md-2 control-label">{% trans "Exam's end date" %}</label>
-      <div class="col-md-10">
-        <input type="text" name="end_date" class="form-control" id="end_date" placeholder='{% trans "End Date" %}'>
-      </div>
-    </div>
-    <div class="row form-group">
-      <div class="col-md-10">
-        <div class="checkbox">
-          <label>
-            <input type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans "Allow submissions after deadline?" %}
-          </label>
-        </div>
-      </div>
-    </div>
-    <div class="row form-group" id="questions">
+{% load i18n widget_tweaks dict_access static%}
-    </div>
-    <div class="row form-group">
-      <label for="questionType" class="col-md-2 control-label">{% trans "Question Type" %}</label>
-      <div class="col-md-10">
-        <select id="questionType" class="form-control" name="option_question" onchange="showDiv (this)">
-          <option selected disabled>{% trans "Question Type" %}</option>
-          <option value="0">{% trans "Multiple Choice" %}</option>
-          <option value="1">{% trans "True or False" %}</option>
-          <option value="2">{% trans "Gap Filling" %}</option>
-          <option value="3">{% trans "Discursive Question" %}</option>
-        </select>
+{# {% block style %} #}
+  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <script src="{% static 'js/modal_exam.js' %}"></script>
+
+{# {% endblock %} #}
+
+{# {% block content %} #}
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="exam" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+
+        {% block title_exam %}
+        <!-- Put your title here!!!  -->
+        <h4 class="modal-title" id="myModalLabel">{% trans "Create a Exam" %}</h4>
+        {% endblock title_exam %}
       </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <button type="button" class="btn btn-primary btn-raised" id="add_question">{% trans "add question" %}</button>
+      <!-- Modal Body -->
+      <div class="modal-body">
+
+          {% block content_exam %}
+
+          <div class="panel-body">
+            <div class="row form-group">
+              <label for="exam_name" class="col-md-2 control-label">{% trans "Exam Name" %}</label>
+              <div class="col-md-10">
+                <input type="text" name="exam_name" class="form-control" id="exam_name" placeholder="{% trans 'Exam Name' %}">
+              </div>
+            </div>
+            <div class="row form-group">
+              <label for="begin_date" class="col-md-2 control-label">{% trans "Exam's begin date" %}</label>
+              <div class="col-md-10">
+                <input type="date" name="begin_date" class="form-control" id="begin_date" placeholder='{% trans "Begin Date" %}'>
+              </div>
+            </div>
+            <div class="row form-group">
+              <label for="end_date" class="col-md-2 control-label">{% trans "Exam's end date" %}</label>
+              <div class="col-md-10">
+                <input type="date" name="end_date" class="form-control" id="end_date" placeholder='{% trans "End Date" %}'>
+              </div>
+            </div>
+            <div class="row form-group">
+              <div class="col-md-10">
+                <div class="checkbox">
+                  <label>
+                    <input type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans "Allow submissions after deadline?" %}
+                  </label>
+                </div>
+              </div>
+            </div>
+            <div class="row form-group" id="questions">
+
+            </div>
+            <div class="row form-group">
+              <label for="questionType" class="col-md-2 control-label">{% trans "Question Type" %}</label>
+              <div class="col-md-10">
+                <select id="questionType" class="form-control" name="option_question" onchange="showDiv (this)">
+                  <option selected disabled>{% trans "Question Type" %}</option>
+                  <option value="0">{% trans "Multiple Choice" %}</option>
+                  <option value="1">{% trans "True or False" %}</option>
+                  <option value="2">{% trans "Gap Filling" %}</option>
+                  <option value="3">{% trans "Discursive Question" %}</option>
+                </select>
+              </div>
+            </div>
+            <!-- Modal Footer -->
+            <div class="modal-footer">
+
+              <!-- Don't remove that!!!  -->
+              <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+              {% block button_save %}
+              <!-- Put curtom buttons here!!!  -->
+              <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
+              {% endblock button_save %}
+            </div>
+
+
+          {% endblock content_exam %}
       </div>
     </div>
   </div>
-  <div class="panel-footer text-right">
-    <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
-  </div>
 </div>
-<script>
+
+<script type="text/javascript">
+
 var id = 1;
 $("#add_question").click(function(){
   $.get("{% url 'course:exam:true_or_false_question' %}", function(data){
-    // var teste = String(data);
-    // teste.replace("#radiosTF", "W3Schools");
-    // alert(teste);
+    
     $("#questions").append(data);
-    // $("#radiosTF").attr("id", "true_id_" + id);
+    
     $("#0").attr("id","true_" + id++);
   });
 });
@@ -104,6 +129,9 @@ $(&#39;#tfAlternative&#39;).click(function () {
 $(function() {
   $( "#begin_date,#end_date" ).datepicker();
 });
+
 </script>
+
+
 {% endblock content %}
@@ -1,6 +0,0 @@
-<div class="form-group" id="discursiveQuestion">
-  <label for="question" class="col-md-2 control-label">{% trans "Question" %}</label>
-  <div class="col-md-10">
-    <textarea class="form-control" rows="1" id="question" placeholder="{% trans 'Question' %}"></textarea>
-  </div>
-</div>
@@ -1,6 +0,0 @@
-XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
@@ -1,3 +0,0 @@
-<div class="form-group" id="gapFilling" style="display: none;">
-  <p>{% trans 'Gap Filling Question' %}</p>
-</div>
@@ -1,3 +0,0 @@
-XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
-  XXX gettext(u'Gap Filling Question') XXXX
-XXXXXX
@@ -1,42 +0,0 @@
-{% load i18n %}
-
-<div class="form-group" id="multipleChoice">
-
-  <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
-
-
-  <div class="col-md-10">
-    <textarea class="form-control" rows="1" id="questionName" placeholder="Wording"></textarea>
-  </div>
-
-
-</div>
-<div class="form-group">
-  <label for="alternative" class="col-md-2 control-label">{% trans 'Alternatives' %}</label>
-  <div class="col-md-10" id="radios">
-    <div class="radio radio-primary">
-      <label>
-        <input checked type="radio" name="alternatives" id="alternative1" value="1">
-        <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
-      </label>
-    </div>
-    <div class="radio radio-primary">
-      <label>
-        <input type="radio" name="alternatives" id="alternative2" value="2">
-        <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
-      </label>
-    </div>
-  </div>
-</div>
-<!-- new alternative button -->
-<div class="form-group">
-  <div class="col-md-12 col-md-offset-2">
-  <button type="button" class="btn btn-primary" id="newAlternative">{% trans 'New Alternative' %}</button>
-  </div>
-</div>
-<div class="form-group">
-  <div class="col-md-12 col-md-offset-2">
-  <button type="submit" class="btn btn-primary">Save</button>
-  <button type="cancel" class="btn btn-default">Cancel</button>
-  </div>
-</div>
@@ -1,42 +0,0 @@
-BBBB BBBB
-
-XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
-
-  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
-
-
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-
-
-XXXXXX
-XXXX XXXXXXXXXXXXXXXXXXX
-  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX
-  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
-      XXXXXXX
-        XXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-        XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
-      XXXXXXX
-        XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
-        XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX
-      XXXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-XXXX XXX XXXXXXXXXXX XXXXXX XXX
-XXXX XXXXXXXXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX
-  XXXXXX
-XXXXXX
-XXXX XXXXXXXXXXXXXXXXXXX
-  XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
@@ -0,0 +1,6 @@
+<div class="form-group" id="discursiveQuestion">
+  <label for="question" class="col-md-2 control-label">{% trans "Question" %}</label>
+  <div class="col-md-10">
+    <textarea class="form-control" rows="1" id="question" placeholder="{% trans 'Question' %}"></textarea>
+  </div>
+</div>
@@ -0,0 +1,6 @@
+XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
+  XXXX XXXXXXXXXXXXXXXXXX
+    XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXXXXX
+  XXXXXX
+XXXXXX
@@ -0,0 +1,3 @@
+<div class="form-group" id="gapFilling" style="display: none;">
+  <p>{% trans 'Gap Filling Question' %}</p>
+</div>
@@ -0,0 +1,3 @@
+XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX
+  XXX gettext(u'Gap Filling Question') XXXX
+XXXXXX
@@ -0,0 +1,42 @@
+{% load i18n %}
+
+<div class="form-group" id="multipleChoice">
+
+  <label for="questionName" class="col-md-2 control-label">{% trans 'Question' %}</label>
+
+
+  <div class="col-md-10">
+    <textarea class="form-control" rows="1" id="questionName" placeholder="Wording"></textarea>
+  </div>
+
+
+</div>
+<div class="form-group">
+  <label for="alternative" class="col-md-2 control-label">{% trans 'Alternatives' %}</label>
+  <div class="col-md-10" id="radios">
+    <div class="radio radio-primary">
+      <label>
+        <input checked type="radio" name="alternatives" id="alternative1" value="1">
+        <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+      </label>
+    </div>
+    <div class="radio radio-primary">
+      <label>
+        <input type="radio" name="alternatives" id="alternative2" value="2">
+        <textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>
+      </label>
+    </div>
+  </div>
+</div>
+<!-- new alternative button -->
+<div class="form-group">
+  <div class="col-md-12 col-md-offset-2">
+  <button type="button" class="btn btn-primary" id="newAlternative">{% trans 'New Alternative' %}</button>
+  </div>
+</div>
+<div class="form-group">
+  <div class="col-md-12 col-md-offset-2">
+  <button type="submit" class="btn btn-primary">Save</button>
+  <button type="cancel" class="btn btn-default">Cancel</button>
+  </div>
+</div>
@@ -0,0 +1,42 @@
+BBBB BBBB
+
+XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX
+
+  XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
+
+
+  XXXX XXXXXXXXXXXXXXXXXX
+    XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX
+
+
+XXXXXX
+XXXX XXXXXXXXXXXXXXXXXXX
+  XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX
+  XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX
+    XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
+      XXXXXXX
+        XXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
+        XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX
+      XXXXXXXX
+    XXXXXX
+    XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX
+      XXXXXXX
+        XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX
+        XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX
+      XXXXXXXX
+    XXXXXX
+  XXXXXX
+XXXXXX
+XXXX XXX XXXXXXXXXXX XXXXXX XXX
+XXXX XXXXXXXXXXXXXXXXXXX
+  XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX
+  XXXXXX
+XXXXXX
+XXXX XXXXXXXXXXXXXXXXXXX
+  XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX
+XXXXXX
@@ -0,0 +1,15 @@
+{% load i18n %}
+
+<div class="row form-group" >
+  <div class="col-md-1">
+    </br>
+    <label><span class="glyphicon glyphicon-move"></span></label>
+  </div>
+  <div class="col-md-10">
+    <input class="form-control" placeholder='{% trans "Write your alternative" %}'></input>
+  </div>
+  <div class="col-md-1">
+    </br>
+    <label><span class="glyphicon glyphicon-remove" onclick="this.parentNode.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode.parentNode);"></span></label>
+  </div>
+</div>
@@ -0,0 +1,15 @@
+BBBB BBBB
+
+XXXX XXXXXXXXXX XXXXXXXXXXX X
+  XXXX XXXXXXXXXXXXXXXXX
+    XXXXX
+    XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX
+  XXXX XXXXXXXXXXXXXXXXXX
+    XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Write your alternative') XXXXXXXXXX
+  XXXXXX
+  XXXX XXXXXXXXXXXXXXXXX
+    XXXXX
+    XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXX
+XXXXXX
@@ -0,0 +1,67 @@
+{# {% extends "base.html" %} #}
+
+{% load i18n %}
+{# {% block content %} #}
+<style>
+  .glyphicon-remove:hover {
+    cursor: pointer;
+  }
+  .glyphicon-move:hover {
+    cursor: move;
+  }
+</style>
+<div class="" id="0">
+  <div class="row form-group">
+    <div class="col-md-1">
+      </br>
+      <label><span class="glyphicon glyphicon-move"></span></label>
+    </div>
+    <div class="col-md-2">
+      <label for="questionName" class="control-label">{% trans "Question" %}</label>
+    </div>
+    <div class="col-md-9">
+      <div class="row">
+        <div class="col-md-11">
+          <input class="form-control" id="questionName" placeholder="{% trans 'Question' %}"></input>
+        </div>
+        <div class="col-md-1">
+          </br>
+          <label><span class="glyphicon glyphicon-remove"></span></label>
+        </div>
+      </div>
+    </div>
+
+  </div>
+  <div class="row">
+    <div class="col-md-offset-1 col-md-2">
+    <label class="control-label">{% trans "Alternatives: T/F" %}</label>
+  </div>
+    <div class="col-md-9" id="radiosTF">
+      {% include "exam/true_or_false_answer.html" %}
+    </div>
+  </div>
+  <div class="form-group">
+    <div class="col-md-9 col-md-offset-3">
+      <button type="button" class="btn btn-primary btn-raised" id="new_alternative">{% trans "New Alternative" %}</button>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+  $("#new_alternative").click(function(){
+    $.get("{% url 'course:exam:true_or_false_answer' %}", function(data){
+      $("#radiosTF").append(data);
+    });
+  });
+  //deve ser importado apenas depois do html
+  $( "#radiosTF" ).sortable({ // utilizado para fazer a re-organização das respostas
+      delay: 100,
+      distance: 5,
+      update: function( event, ui ) {
+        var cont = 1;
+        $("#radiosTF div div input").each(function(){
+                $(this).attr('name',cont++);
+        });
+      },
+  });
+</script>
+{# {% endblock content %} #}
@@ -0,0 +1,67 @@
+
+
+BBBB BBBB
+
+XXXXXXX
+  XXXXXXXXXXXXXXXXXXXXXXX X
+    XXXXXXX XXXXXXXX
+  X
+  XXXXXXXXXXXXXXXXXXXXX X
+    XXXXXXX XXXXX
+  X
+XXXXXXXX
+XXXX XXXXXXXX XXXXXXX
+  XXXX XXXXXXXXXX XXXXXXXXXXXX
+    XXXX XXXXXXXXXXXXXXXXX
+      XXXXX
+      XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    XXXXXX
+    XXXX XXXXXXXXXXXXXXXXX
+      XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
+    XXXXXX
+    XXXX XXXXXXXXXXXXXXXXX
+      XXXX XXXXXXXXXXXX
+        XXXX XXXXXXXXXXXXXXXXXX
+          XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXX
+        XXXXXX
+        XXXX XXXXXXXXXXXXXXXXX
+          XXXXX
+          XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        XXXXXX
+      XXXXXX
+    XXXXXX
+
+  XXXXXX
+  XXXX XXXXXXXXXXXX
+    XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX
+    XXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Alternatives: T/F') XXXXXXXX
+  XXXXXX
+    XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
+      BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+    XXXXXX
+  XXXXXX
+  XXXX XXXXXXXXXXXXXXXXXXX
+    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
+      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'New Alternative') XXXXXXXXX
+    XXXXXX
+  XXXXXX
+XXXXXX
+XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
+  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX
+      XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    XXX
+  XXX
+  XXXXXX XXX XXXXXXXXX XXXXXX XXXXXX XX XXXX
+  XX XXXXXXXXXXX XXXXXXXXXXXX XX XXXXXXXXX XXXX XXXXX X XXXXXXXXXXXXXX XXX XXXXXXXXX
+      XXXXXX XXXX
+      XXXXXXXXX XX
+      XXXXXXX XXXXXXXXX XXXXXX XX X X
+        XXX XXXX X XX
+        XXXXXXXXXXXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXX
+                XXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        XXX
+      XX
+  XXX
+XXXXXXXXX
+
@@ -0,0 +1,27 @@
+{% extends "exam/create.html" %}
+
+{% load i18n static%}
+
+{% block title_exam %}
+<!-- Put your title here!!!  -->
+<h4 class="modal-title" id="myModalLabel">{% trans "Delete Exam" %}</h4>
+{% endblock title_exam %}
+
+{% block content_exam %}
+<script src="{% static 'js/modal_exam.js' %}"></script>
+<!-- Put ONLY your content here!!!  -->
+<form id="delete_form" action="" method="post">
+  {% csrf_token %}
+    <p>{% trans 'Are you sure you want to delete the subject' %} "{{exam.name}}"?</p>
+</form>
+{% endblock content_exam %}
+
+{% block button_save %}
+<button type="submite" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+<script>
+  $("#delete_form").submit(function(event) {
+    Submite.remove("{% url 'course:exam:delete_exam' exam.slug %}",$(this).serialize(),"#exam_{{exam.slug}}");
+    event.preventDefault();
+  });
+</script>
+{% endblock button_save %}
@@ -1,15 +0,0 @@
-{% load i18n %}
-
-<div class="row form-group" >
-  <div class="col-md-1">
-    </br>
-    <label><span class="glyphicon glyphicon-move"></span></label>
-  </div>
-  <div class="col-md-10">
-    <input class="form-control" placeholder='{% trans "Write your alternative" %}'></input>
-  </div>
-  <div class="col-md-1">
-    </br>
-    <label><span class="glyphicon glyphicon-remove" onclick="this.parentNode.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode.parentNode);"></span></label>
-  </div>
-</div>
@@ -1,15 +0,0 @@
-BBBB BBBB
-
-XXXX XXXXXXXXXX XXXXXXXXXXX X
-  XXXX XXXXXXXXXXXXXXXXX
-    XXXXX
-    XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXXX
-    XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Write your alternative') XXXXXXXXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXX
-    XXXXX
-    XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXX
-XXXXXX
@@ -1,67 +0,0 @@
-{# {% extends "base.html" %} #}
-
-{% load i18n %}
-{# {% block content %} #}
-<style>
-  .glyphicon-remove:hover {
-    cursor: pointer;
-  }
-  .glyphicon-move:hover {
-    cursor: move;
-  }
-</style>
-<div class="" id="0">
-  <div class="row form-group">
-    <div class="col-md-1">
-      </br>
-      <label><span class="glyphicon glyphicon-move"></span></label>
-    </div>
-    <div class="col-md-2">
-      <label for="questionName" class="control-label">{% trans "Question" %}</label>
-    </div>
-    <div class="col-md-9">
-      <div class="row">
-        <div class="col-md-11">
-          <input class="form-control" id="questionName" placeholder="{% trans 'Question' %}"></input>
-        </div>
-        <div class="col-md-1">
-          </br>
-          <label><span class="glyphicon glyphicon-remove"></span></label>
-        </div>
-      </div>
-    </div>
-
-  </div>
-  <div class="row">
-    <div class="col-md-offset-1 col-md-2">
-    <label class="control-label">{% trans "Alternatives: T/F" %}</label>
-  </div>
-    <div class="col-md-9" id="radiosTF">
-      {% include "exam/true_or_false_answer.html" %}
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="col-md-9 col-md-offset-3">
-      <button type="button" class="btn btn-primary btn-raised" id="new_alternative">{% trans "New Alternative" %}</button>
-    </div>
-  </div>
-</div>
-<script type="text/javascript">
-  $("#new_alternative").click(function(){
-    $.get("{% url 'course:exam:true_or_false_answer' %}", function(data){
-      $("#radiosTF").append(data);
-    });
-  });
-  //deve ser importado apenas depois do html
-  $( "#radiosTF" ).sortable({ // utilizado para fazer a re-organização das respostas
-      delay: 100,
-      distance: 5,
-      update: function( event, ui ) {
-        var cont = 1;
-        $("#radiosTF div div input").each(function(){
-                $(this).attr('name',cont++);
-        });
-      },
-  });
-</script>
-{# {% endblock content %} #}
@@ -1,67 +0,0 @@
-
-
-BBBB BBBB
-
-XXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXX XXXXXXXX
-  X
-  XXXXXXXXXXXXXXXXXXXXX X
-    XXXXXXX XXXXX
-  X
-XXXXXXXX
-XXXX XXXXXXXX XXXXXXX
-  XXXX XXXXXXXXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XXXXX
-      XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX
-    XXXXXX
-    XXXX XXXXXXXXXXXXXXXXX
-      XXXX XXXXXXXXXXXX
-        XXXX XXXXXXXXXXXXXXXXXX
-          XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXX
-        XXXXXX
-        XXXX XXXXXXXXXXXXXXXXX
-          XXXXX
-          XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXXXXX
-      XXXXXX
-    XXXXXX
-
-  XXXXXX
-  XXXX XXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX
-    XXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Alternatives: T/F') XXXXXXXX
-  XXXXXX
-    XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXX
-      BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-    XXXXXX
-  XXXXXX
-  XXXX XXXXXXXXXXXXXXXXXXX
-    XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX
-      XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'New Alternative') XXXXXXXXX
-    XXXXXX
-  XXXXXX
-XXXXXX
-XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
-  XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX
-      XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    XXX
-  XXX
-  XXXXXX XXX XXXXXXXXX XXXXXX XXXXXX XX XXXX
-  XX XXXXXXXXXXX XXXXXXXXXXXX XX XXXXXXXXX XXXX XXXXX X XXXXXXXXXXXXXX XXX XXXXXXXXX
-      XXXXXX XXXX
-      XXXXXXXXX XX
-      XXXXXXX XXXXXXXXX XXXXXX XX X X
-        XXX XXXX X XX
-        XXXXXXXXXXXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXX
-                XXXXXXXXXXXXXXXXXXXXXXXXXXXX
-        XXX
-      XX
-  XXX
-XXXXXXXXX
-
@@ -0,0 +1,32 @@
+{% extends "exam/create.html" %}
+
+{% load i18n dict_access static%}
+
+{% block title_exam %}
+<!-- Put your title here!!!  -->
+<h4 class="modal-title" id="myModalLabel">{% trans "Update a Exam" %}</h4>
+{% endblock title_exam %}
+
+{% block button_save %}
+<!-- Put curtom buttons here!!!  -->
+<button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Update" %}</button>
+{% endblock button_save %}
+
+{% block script_exam %}
+<script type="text/javascript">
+	var locale = navigator.language || navigator.userLanguage;
+
+  $('.date-picker').datepicker({
+      language: locale,
+  });
+// Este js tem que ficar aqui se não o button add não vai funcionar
+  $("#add").click(function (){
+    Answer.init('{% url "course:exam:answer_exam" %}');
+  });
+
+  $("#form").submit(function(event) {
+    Submite.post("{% url 'course:exam:update_exam' exam.slug %}",$(this).serialize());
+    event.preventDefault();
+  });
+</script>
+{% endblock script_exam %}
@@ -0,0 +1,28 @@
+{% extends "exam/create.html" %}
+
+{% load i18n dict_access static%}
+
+{% block style %}
+{% endblock %}
+
+{% block title_exam %}
+<!-- Put your title here!!!  -->
+<h4 class="modal-title" id="myModalLabel">{{exam.name}}</h4>
+{% endblock title_exam %}
+
+{% block content_exam %}
+<!-- Put ONLY your content here!!!  -->
+<div class="row">
+  <div class="col-md-10 col-md-offset-1">
+    <p>{% trans "Limit date:" %} {{exam.limit_date|date:'d/m/y'}}</p>
+  </div>
+
+</div>
+{% endblock content_exam %}
+
+{% block button_save %}
+<!-- Put curtom buttons here!!!  -->
+{% if not status %}
+<button type="button" onclick="javascript:modal.get('{% url 'course:exam:answer_student_exam' exam.slug%}','#exam','#modal_exam');$('div.modal-backdrop.fade.in').remove();" class="btn btn-primary btn-raised">{% trans "Answer" %}</button>
+{% endif %}
+{% endblock button_save %}
@@ -10,6 +10,7 @@ from rolepermissions.verifications import has_role
 from rolepermissions.verifications import has_object_permission
 from django.db.models import Q
 from datetime import datetime
+import time
 # from django.views.generic.edit import FormMixin
 from .forms import ExamForm
@@ -59,10 +60,10 @@ class ViewExam(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['course_slug'] = exam.topic.subject.course.slug
 		self.log_context['course_category_id'] = exam.topic.subject.course.category.id
 		self.log_context['course_category_name'] = exam.topic.subject.course.category.name
+		self.request.session['time_spent'] = str(int(time.time()))
 		super(ViewExam, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return context
@@ -105,7 +106,7 @@ class CreateExam(LoginRequiredMixin,HasRoleMixin, LogMixin, NotificationMixin, g
 		self.object.save()
 		super(CreateExam, self).createNotification(message="created an Exam "+ self.object.name, actor=self.request.user,
-			resource_name=self.object.name, resource_link= reverse('course:exam:view_exam', args=[self.object.slug]), 
+			resource_name=self.object.name, resource_link= reverse('course:exam:view_exam', args=[self.object.slug]),
 			users=self.object.topic.subject.students.all())
 		for key in self.request.POST:
 			if(key != 'csrfmiddlewaretoken' and key != 'name' and key != 'begin_date' and key != 'limit_date' and key != 'all_students' and key != 'students'):
@@ -318,6 +319,7 @@ class AnswerStudentExam(LoginRequiredMixin, LogMixin, generic.CreateView):
 		minutes = int(secs / 60) % 60
 		secs = secs % 60
+		self.log_context['timestamp_end'] = str(int(time.time()))
 		self.log_context['time_spent'] = {}
 		self.log_context['time_spent']['hours'] = hours
 		self.log_context['time_spent']['minutes'] = minutes
@@ -346,6 +348,7 @@ class AnswerStudentExam(LoginRequiredMixin, LogMixin, generic.CreateView):
 		context['answers'] = answers
 		context['keys'] = keys
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		self.request.session['time_spent'] = str(datetime.now())
 		return context
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 {% load static i18n permission_tags list_post %}
 {% load widget_tweaks %}
@@ -21,32 +21,19 @@
     </ol>
 {% endblock %}
-{% block sidebar %}
-    <div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
-    {% if request.user|has_role:'system_admin' or request.user|has_role:'professor' and request.user in forum.topic.subject.professors.all %}
-        <div class="panel panel-primary navigation">
-            <div class="panel-heading">
-                <h3 class="panel-title">{% trans 'Actions' %}</h3>
-            </div>
-            <div class="panel-body">
-                <ul class="nav nav-pills nav-stacked">
-                    <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
-                    <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
-                </ul>
-            </div>
+{% block menu %}
+  {% if user|has_role:'system_admin' or user|has_role:'professor'%}
+    <li>
+        <a href="#menu_forum" class="accordion" data-toggle="collapse">{% trans 'Forum' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
+        <div id="menu_forum" class="collapse">
+            <ul class="nav nav-pill nav-stacked accordion_list">
+              <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}', '{% trans 'Forum edited successfully!' %}')">{% trans 'Edit' %}</a></li>
+              <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
+            </ul>
         </div>
-    {% endif %}
+    </li>
+  {% endif %}
 {% endblock %}
 {% block content %}
@@ -130,4 +117,3 @@
         </div>
     </div>
 {% endblock %}
-
@@ -8,6 +8,7 @@ from django.core.paginator import Paginator, EmptyPage
 from django.http import Http404, JsonResponse
 from django.urls import reverse
 from django.template.loader import render_to_string
+import time
 from rolepermissions.mixins import HasRoleMixin
 from rolepermissions.verifications import has_object_permission
@@ -229,10 +230,10 @@ class ForumDetailView(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['course_slug'] = forum.topic.subject.course.slug
 		self.log_context['course_category_id'] = forum.topic.subject.course.category.id
 		self.log_context['course_category_name'] = forum.topic.subject.course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(ForumDetailView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return super(ForumDetailView, self).dispatch(*args, **kwargs)
-<li id="link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:get_modal_link('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
+<li id="link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#requisicoes_ajax')">{{link.name}}</a></li>
@@ -10,6 +10,7 @@ from core.mixins import NotificationMixin
 from django.urls import reverse
 from django.core.files.base import ContentFile
 from rolepermissions.verifications import has_role
+import time
 from core.models import Log
 from core.mixins import LogMixin
@@ -244,6 +245,7 @@ class ViewLink(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DetailView):
         self.log_context['course_slug'] = link.topic.subject.course.slug
         self.log_context['course_category_id'] = link.topic.subject.course.category.id
         self.log_context['course_category_name'] = link.topic.subject.course.category.name
+        self.log_context['timestamp_start'] = str(int(time.time()))
         super(ViewLink, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -144,7 +144,7 @@
       <div class="modal-footer">
         <!-- Don't remove that!!!  -->
-        <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
         {% block button_save %}
         <!-- Put curtom buttons here!!!  -->
         <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
@@ -10,6 +10,7 @@ from rolepermissions.verifications import has_role
 from rolepermissions.verifications import has_object_permission
 from django.db.models import Q
 from django.urls import reverse
+import time
 from .forms import PollForm
 from .models import Poll, Answer, AnswersStudent
@@ -48,10 +49,10 @@ class ViewPoll(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['course_slug'] = poll.topic.subject.course.slug
 		self.log_context['course_category_id'] = poll.topic.subject.course.category.id
 		self.log_context['course_category_name'] = poll.topic.subject.course.category.name
+		self.log_context['timestamp_start'] = str(int(time.time()))
 		super(ViewPoll, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-		self.request.session['time_spent'] = str(datetime.datetime.now())
 		self.request.session['log_id'] = Log.objects.latest('id').id
 		return poll
@@ -315,6 +316,7 @@ class AnswerStudentPoll(LoginRequiredMixin, LogMixin, generic.CreateView):
 	def dispatch(self, *args, **kwargs):
 		if self.request.method == 'GET':
 			self.request.session['time_spent'] = str(datetime.datetime.now())
+			self.log_context['timestamp_start'] = str(int(time.time()))
 		return super(AnswerStudentPoll, self).dispatch(*args, **kwargs)
@@ -344,6 +346,7 @@ class AnswerStudentPoll(LoginRequiredMixin, LogMixin, generic.CreateView):
 		self.log_context['course_slug'] = poll.topic.subject.course.slug
 		self.log_context['course_category_id'] = poll.topic.subject.course.category.id
 		self.log_context['course_category_name'] = poll.topic.subject.course.category.name
+		self.log_context['timestamp_end'] = str(int(time.time()))
 		date_time_click = datetime.datetime.strptime(self.request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f")
 		_now = datetime.datetime.now()
@@ -9,23 +9,11 @@
 {% endblock %}
-{% if user|has_role:'system_admin' %}
-    {% block sidebar %}
-        <div class="panel panel-primary navigation">
-            <div class="panel-heading">
-                <h5>{% trans 'Menu' %}</h5>
-            </div>
-            <div class="panel-body">
-                <ul class="nav nav-pills nav-stacked">
-                    <li><a href="{% url 'core:home' %}">{% trans "Home" %}</a></li>
-                    <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
-                    <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
-                </ul>
-            </div>
-        </div>
-    {% endblock %}
-{% endif %}
-
+{% block menu %}
+  {% if user|has_role:'system_admin' %}
+	 <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
+  {% endif %}
+{% endblock %}
 {% block content %}
     {% if messages %}
@@ -108,4 +96,3 @@
         </div>
     {% endif %}
 {% endblock %}
-
-{% extends 'app/base.html' %}
+{% extends 'home.html' %}
 {% load static i18n %}
@@ -9,18 +9,8 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'users:manage' %}" class="list-group-item active">
-	    	{% trans 'System Users' %}
-	  	</a>
-	  	<a href="{% url 'users:create' %}" class="list-group-item">
-	    	{% trans 'New Account' %}
-	  	</a>
-	  	<a href="#" class="list-group-item">
-	    	{% trans 'Send Mail' %}
-	  	</a>
-	</div>
+{% block menu %}
+	<li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
 {% endblock %}
 {% block content %}
-{% extends 'home_student.html' %}
+{% extends 'home.html' %}
 {% load static i18n %}
 {% load widget_tweaks %}
-{% load django_bootstrap_breadcrumbs %}
+{% load django_bootstrap_breadcrumbs permission_tags%}
 {% block breadcrumbs %}
@@ -11,21 +11,10 @@
 {% endblock %}
-{% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h4>{% trans "Menu" %}</h4>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-            	<li><a href="{% url 'app:index' %}">{% trans 'Home page' %}</a></li>
-            	<li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li>
-               <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
-               <li><a href="{% url 'users:change_password' %}">{% trans 'Change Password' %}</a></li>
-               <li><a href="{% url 'users:remove_account' %}">{% trans 'Remove account' %}</a></li>
-            </ul>
-        </div>
-    </div>
+{% block menu %}
+  {% if user|has_role:'system_admin' %}
+	 <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
+  {% endif %}
 {% endblock %}
 {% block content %}
@@ -5,7 +5,6 @@
    <script type="text/javascript" src="{% static 'js/forum.js' %}"></script>
    <script src="{% static 'js/file.js' %}"></script>
    <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
-   <script type = "text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
    <script type = "text/javascript" src="{% static 'js/links.js' %}"></script>
    <script src="{% static 'js/modals_requisitions.js'%}"></script>
    <script src="{% static 'js/modal_poll.js'%}"></script>
@@ -21,47 +20,48 @@
 {% block content %}
 <div class="jumbotron">
 <h3>Search Result:</h3> {{qtd}} items found
+
+{% if link_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Link" id="bot"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>
+        <a data-toggle="collapse" href="#Link" id="bot" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down"></i>Links</a>
       </h4>
     </div>
     <div id="Link" class="panel-collapse collapse">
       <div class="panel-body">
-        {% if link_list %}
+
           {% for link in link_list %}
               <li id = "link_{{ link.slug }}"><i class="fa fa-link" aria-hidden="true"></i>  <a href="javascript:modal.get('{% url 'course:links:view_link' link.slug %}', '#viewLinkModal','#divModalLink')">{{link.name}}</a></li>
           {% endfor %}
           <div class = 'row' id ="divModalLink">
           </div>
-        {% else %}
-          {% trans 'No results found'%}
-        {% endif%}
+
       </div>
     </div>
   </div>
 </div>
+{% endif%}
+
+{% if file_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#File" id="bot1"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>
+        <a data-toggle="collapse" href="#File" id="bot1" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down1"></i>File</a>
       </h4>
     </div>
     <div id="File" class="panel-collapse collapse">
       <div class="panel-body">
-      {% if file_list %}
+
           {% for file in file_list %}
               <li id="file_{{ file.slug }}"><i class="material-icons">{{ file.file_type.icon }}</i> <a href="{% url 'course:file_material_view' file.slug %}" target="_blank">{{ file.name }}</a></li>
           {% endfor%}
-      {% else %}
-          {% trans 'No results found' %}
-      {% endif %}
+
       <div class="row" id="divModalFile">
@@ -72,65 +72,65 @@
     </div>
   </div>
 </div>
+{% endif %}
+{% if forum_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Forum" id="bot2"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>
+        <a data-toggle="collapse" href="#Forum" id="bot2" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down2"></i>Forum</a>
       </h4>
     </div>
     <div id="Forum" class="panel-collapse collapse">
       <div class="panel-body">
-        {% if forum_list %}
               {% for forum in forum_list %}
               <li><i class="fa fa-commenting" aria-hidden="true"></i> <a id="forum_{{ forum.id }}" href="{% url 'course:forum:view' forum.slug %}"> {{ forum }}</a></li>
               {% endfor %}
-          {% else %}
-
-            {% trans 'No results found' %}
-          {% endif %}
       </div>
     </div>
   </div>
 </div>
+{% endif %}
+
+{% if exam_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-       <a data-toggle="collapse" href="#Exam" id="bot3"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>
+       <a data-toggle="collapse" href="#Exam" id="bot3" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down3"></i>Exam</a>
       </h4>
     </div>
     <div id="Exam" class="panel-collapse collapse">
       <div class="panel-body">
-        {% if exam_list %}
+        {% for exam in exam_list %}
+              {{exam.name}}
+        {% endfor %}
-        {% else %}
-            {% trans 'No results found' %}
-        {% endif %}
       </div>
     </div>
   </div>
 </div>
+{% endif %}
+
+{% if poll_list %}
 <div class="panel-group">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
-        <a data-toggle="collapse" href="#Poll" id="bot4"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>
+        <a data-toggle="collapse" href="#Poll" id="bot4" style="color: black"> <i class="fa fa-caret-square-o-down" aria-hidden="true" id="down4"></i>Poll</a>
       </h4>
     </div>
     <div id="Poll" class="panel-collapse collapse">
       <div class="panel-body">
-            {% if poll_list %}
+
               {% for poll in poll_list %}
                   <li id="poll_{{poll.slug}}"><i class="material-icons">{% trans 'poll' %}</i> <a href="javascript:modal.get('{% url 'course:poll:view_poll' poll.slug %}','#poll','#modal_poll');">{{ poll.name }}</a></li>
               {% endfor %}
-            {% else %}
-                {% trans 'No results found' %}
-            {% endif %}
+
             <div class="row" id="modal_poll">
             </div>
@@ -138,16 +138,10 @@
     </div>
   </div>
 </div>
+{% endif %}
 </div>
-<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
-<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
-<script>
-        // set up all (import templates, set up navbar and set environment variables)
-        Amadeus.load(function() {
-          // set data to breadcrumb
-          Amadeus.setBreadcrumb(null,'Home');
-        });
-</script>
+<script type="text/javascript" src="{% static 'js/amadeus.js' %}"> </script>
+<script type="text/javascript" src="{% static 'js/topic_editation_presentation_search.js' %}"></script>
 {% endblock %}
-{% extends 'app/base.html' %}
+{% extends 'users/profile.html' %}
 {% load static i18n %}
@@ -9,26 +9,6 @@
 	</ol>
 {% endblock %}
-{% block sidebar %}
-	<div class="list-group">
-	  	<a href="{% url 'users:manage' %}" class="list-group-item">
-	    	{% trans 'System Users' %}
-	  	</a>
-	  	<a href="{% url 'users:create' %}" class="list-group-item">
-	    	{% trans 'New Account' %}
-	  	</a>
-	  	<a href="{% url 'users:view' acc.username %}" class="list-group-item active">
-	    	{% trans 'View User Account' %}
-	  	</a>
-	  	<a href="{% url 'users:update' acc.username %}" class="list-group-item">
-	    	{% trans 'Edit User Account' %}
-	  	</a>
-	  	<a href="#" class="list-group-item">
-	    	{% trans 'Send Mail' %}
-	  	</a>
-	</div>
-{% endblock %}
-
 {% block content %}
 	<div class="row">
 		<div class="col-sm-3">
1	-web: gunicorn amadeus.wsgi --log-file -
2	\ No newline at end of file	1	\ No newline at end of file
		2	+web: gunicorn amadeus.wsgi --log-file=-
3	\ No newline at end of file	3	\ No newline at end of file
	@@ -28,7 +28,7 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))		@@ -28,7 +28,7 @@ PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
28	SECRET_KEY = '$=8)c!5)iha85a&8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4'	28	SECRET_KEY = '$=8)c!5)iha85a&8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4'
29		29
30	# SECURITY WARNING: don't run with debug turned on in production!	30	# SECURITY WARNING: don't run with debug turned on in production!
31	-DEBUG = False	31	+DEBUG = True
32		32
33		33
34	# Application definition	34	# Application definition
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+//controles do modal
	2	+$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
	3	+ if($('.not_submited').length){
	4	+ $('#exam').modal('show');
	5	+ }
	6	+});
	7	+var Answer = {
	8	+ init: function(url) { // utilizado para adicionar um novo campo de resposta
	9	+ $.get(url, function(data){
	10	+ $("#form").append(data);
	11	+ var cont = 1;
	12	+ $("#form div div div input").each(function(){
	13	+ $(this).attr('name',cont++);
	14	+ });
	15	+ });
	16	+ }
	17	+};
	18	+
	19	+var Submite = {
	20	+ post: function(url,dados){
	21	+ $('#exam').modal('hide');
	22	+ $.post(url,dados, function(data){
	23	+ }).fail(function(data){
	24	+ $("div.modal-backdrop.fade.in").remove();
	25	+ $("#modal_exam").empty();
	26	+ $("#modal_exam").append(data.responseText);
	27	+ });
	28	+ },
	29	+ remove: function(url,dados, id_li_link){
	30	+ $('#exam').modal('hide');
	31	+ $.post(url,dados, function(data){
	32	+ $(id_li_link).remove();
	33	+ $("#modal_exam").empty();
	34	+ $("div.modal-backdrop.fade.in").remove();
	35	+ }).fail(function(){
	36	+ $("#modal_exam").empty();
	37	+ $("#modal_exam").append(data);
	38	+ $('#exam').modal('show');
	39	+ });
	40	+ }
	41	+}
	42	+
	43	+alert("essfd");
	@@ -32,4 +32,5 @@ urlpatterns = [		@@ -32,4 +32,5 @@ urlpatterns = [
32	url(r'^summernote/', include('django_summernote.urls')),	32	url(r'^summernote/', include('django_summernote.urls')),
33	]	33	]
34		34
35	-urlpatterns += static(settings.MEDIA_URL, document_root = settings.MEDIA_ROOT)	35	+if settings.DEBUG:
		36	+ urlpatterns += static(settings.MEDIA_URL, document_root = settings.MEDIA_ROOT)
	@@ -15,18 +15,6 @@		@@ -15,18 +15,6 @@
15	{% endblock %}	15	{% endblock %}
16		16
17	{% block sidebar %}	17	{% block sidebar %}
18	- <div class="panel panel-primary">
19	- <div class="panel-heading">
20	- <h5>{% trans 'Menu' %}</h5>
21	- </div>
22	- <div class="panel-body">
23	- <ul class="nav nav-pills nav-stacked">
24	- <li><a href="javascript:void(0)">{% trans 'Pending tasks' %}</a></li>
25	- <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
26	- <li><a href="{% url 'course:manage' %}">{% trans 'Manage Course' %}</a></li>
27	- </ul>
28	- </div>
29	- </div>
30	{% endblock %}	18	{% endblock %}
31		19
32	{% block content %}	20	{% block content %}
	@@ -16,19 +16,6 @@		@@ -16,19 +16,6 @@
16		16
17		17
18	{% block sidebar %}	18	{% block sidebar %}
19	- <div class="panel panel-primary">
20	- <div class="panel-heading">
21	- <h4>{% trans 'Menu' %}</h4>
22	- </div>
23	- <div class="panel-body">
24	- <ul class="nav nav-pills nav-stacked">
25	- <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
26	- <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
27	- <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
28	- <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
29	- </ul>
30	- </div>
31	- </div>
32	{% endblock %}	19	{% endblock %}
33		20
34	{% block content %}	21	{% block content %}
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-10 15:15
	3	+from __future__ import unicode_literals
	4	+
	5	+import django.contrib.postgres.fields.jsonb
	6	+from django.db import migrations
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('core', '0003_auto_20161101_1457'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AlterField(
	17	+ model_name='log',
	18	+ name='context',
	19	+ field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context'),
	20	+ ),
	21	+ ]
@@ -0,0 +1,79 @@		@@ -0,0 +1,79 @@
	1	+
	2	+var x = 0;
	3	+$(".edit_card").on('click', function() {
	4	+ $(".presentation").css('display','none');
	5	+ $(".editation").css('display','block');
	6	+})
	7	+$(".edit_card_end").on('click', function() {
	8	+ $(".editation").css('display','none');
	9	+ $(".presentation").css('display','block');
	10	+})
	11	+
	12	+$("#bot").on('click', function(){
	13	+ x = x+1;
	14	+ console.log(2)
	15	+ if(x%2 == 0){
	16	+ console.log(0)
	17	+ $("#down").attr('class', 'fa fa-caret-square-o-down');
	18	+}
	19	+else{
	20	+ console.log(1)
	21	+ $("#down").attr('class', 'fa fa-caret-square-o-up');
	22	+}
	23	+
	24	+})
	25	+$("#bot1").on('click', function(){
	26	+ x = x+1;
	27	+ console.log(2)
	28	+ if(x%2 == 0){
	29	+ console.log(0)
	30	+ $("#down1").attr('class', 'fa fa-caret-square-o-down');
	31	+}
	32	+else{
	33	+ console.log(1)
	34	+ $("#down1").attr('class', 'fa fa-caret-square-o-up');
	35	+}
	36	+
	37	+})
	38	+
	39	+$("#bot2").on('click', function(){
	40	+ x = x+1;
	41	+ console.log(2)
	42	+ if(x%2 == 0){
	43	+ console.log(0)
	44	+ $("#down2").attr('class', 'fa fa-caret-square-o-down');
	45	+}
	46	+else{
	47	+ console.log(1)
	48	+ $("#down2").attr('class', 'fa fa-caret-square-o-up');
	49	+}
	50	+
	51	+})
	52	+
	53	+$("#bot3").on('click', function(){
	54	+ x = x+1;
	55	+ console.log(2)
	56	+ if(x%2 == 0){
	57	+ console.log(0)
	58	+ $("#down3").attr('class', 'fa fa-caret-square-o-down');
	59	+}
	60	+else{
	61	+ console.log(1)
	62	+ $("#down3").attr('class', 'fa fa-caret-square-o-up');
	63	+}
	64	+
	65	+})
	66	+$("#bot4").on('click', function(){
	67	+ x = x+1;
	68	+ console.log(2)
	69	+ if(x%2 == 0){
	70	+ console.log(0)
	71	+ $("#down4").attr('class', 'fa fa-caret-square-o-down');
	72	+}
	73	+else{
	74	+ console.log(1)
	75	+ $("#down4").attr('class', 'fa fa-caret-square-o-up');
	76	+}
	77	+
	78	+})
	79	+
1	-{% extends 'base.html' %}	1	+{% extends 'home.html' %}
2		2
3	{% load static i18n permission_tags %}	3	{% load static i18n permission_tags %}
4	{% load widget_tweaks %}	4	{% load widget_tweaks %}
	@@ -10,48 +10,6 @@		@@ -10,48 +10,6 @@
10	</ol>	10	</ol>
11	{% endblock %}	11	{% endblock %}
12		12
13	-{% block sidebar %}
14	- <div class="panel panel-primary navigation">
15	- <div class="panel-heading">
16	- <h5>{% trans 'Menu' %}</h5>
17	- </div>
18	- <div class="panel-body">
19	- <ul class="nav nav-pills nav-stacked">
20	- <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
21	- <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
22	- </ul>
23	- </div>
24	- </div>
25	-
26	-{% if user\|has_role:'professor' or user\|has_role:'system_admin' %}
27	-
28	- <div class="panel panel-primary navigation">
29	- <div class="panel-heading">
30	- <h3 class="panel-title">{% trans 'Actions' %}</h3>
31	- </div>
32	- <div class="panel-body">
33	- <ul class="nav nav-pills nav-stacked">
34	- <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
35	- </ul>
36	- </div>
37	- </div>
38	-
39	-
40	- <div class="panel panel-primary navigation">
41	- <div class="panel-heading">
42	- <h3 class="panel-title">{% trans 'Category' %}</h3>
43	- </div>
44	- <div class="panel-body">
45	- <ul class="nav nav-pills nav-stacked">
46	- <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
47	- <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
48	- </ul>
49	- </div>
50	- </div>
51	-{% endif %}
52	-
53	-{% endblock %}
54	-
55	{% block content %}	13	{% block content %}
56	<div class="card card-content">	14	<div class="card card-content">
57	<div class="card-body">	15	<div class="card-body">
1	-{% extends 'base.html' %}	1	+{% extends 'home.html' %}
2		2
3	{% load static i18n %}	3	{% load static i18n %}
4	{% load static i18n permission_tags %}	4	{% load static i18n permission_tags %}
	@@ -11,46 +11,6 @@		@@ -11,46 +11,6 @@
11	</ol>	11	</ol>
12	{% endblock %}	12	{% endblock %}
13		13
14	-{% block sidebar %}
15	- <div class="panel panel-primary navigation">
16	- <div class="panel-heading">
17	- <h5>{% trans 'Menu' %}</h5>
18	- </div>
19	- <div class="panel-body">
20	- <ul class="nav nav-pills nav-stacked">
21	- <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
22	- <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
23	- </ul>
24	- </div>
25	- </div>
26	-
27	- {% if user\|has_role:'professor' or user\|has_role:'system_admin' %}
28	-
29	- <div class="panel panel-primary navigation">
30	- <div class="panel-heading">
31	- <h3 class="panel-title">{% trans 'Actions' %}</h3>
32	- </div>
33	- <div class="panel-body">
34	- <ul class="nav nav-pills nav-stacked">
35	- <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
36	- </ul>
37	- </div>
38	- </div>
39	-
40	- <div class="panel panel-primary navigation">
41	- <div class="panel-heading">
42	- <h3 class="panel-title">{% trans 'Category' %}</h3>
43	- </div>
44	- <div class="panel-body">
45	- <ul class="nav nav-pills nav-stacked">
46	- <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
47	- <li><a href="{% url 'course:manage_cat' %}">{% trans 'List Category' %}</a></li>
48	- </ul>
49	- </div>
50	- </div>
51	-{% endif %}
52	-{% endblock %}
53	-
54	{% block content %}	14	{% block content %}
55	{% if messages %}	15	{% if messages %}
56	{% for message in messages %}	16	{% for message in messages %}
	@@ -83,7 +43,7 @@		@@ -83,7 +43,7 @@
83	</ul>	43	</ul>
84	</div>	44	</div>
85	</div>	45	</div>
86	-	46	+
87	</div>	47	</div>
88	</div>	48	</div>
89	</div>	49	</div>
	@@ -114,4 +74,4 @@		@@ -114,4 +74,4 @@
114	</div>	74	</div>
115	<div class="row" id="modal_category">	75	<div class="row" id="modal_category">
116	<script src="{% static 'js/modal_category.js' %}"></script>	76	<script src="{% static 'js/modal_category.js' %}"></script>
117	-{% endblock %}
118	\ No newline at end of file	77	\ No newline at end of file
		78	+{% endblock %}