Merge

ailsoncgt
2 parents c37e0128 ce6e6ebe
Showing 26 changed files with 455 additions and 159 deletions Show diff stats
README.md
app/locale/pt_BR/LC_MESSAGES/django.po
app/views.py
core/decorators.py
core/locale/pt_BR/LC_MESSAGES/django.po
core/middleware.py
courses/locale/pt_BR/LC_MESSAGES/django.po
courses/static/js/course.js
courses/static/js/topic.js
courses/templates/course/index.html
courses/templates/subject/form_view_student.html
courses/templates/subject/form_view_teacher.html
courses/templates/topic/index.html
courses/urls.py
courses/views.py
exam/admin.py
exam/forms.py
exam/migrations/0003_auto_20161125_0808.py
exam/models.py
exam/static/js/Exam.js
@@ -80,14 +80,31 @@ Para Classes que envolvem formulários:
 * `CreateCourseForm`
 * `UpdateCourseForm()`
+[PT-BR]
+##API Descrição
+Estamos usando em sua maioria viewsets ( http://www.django-rest-framework.org/api-guide/viewsets/) para construir os endpoints da nossa API. Ela tem como função compartilhar os dados da instância do Amadeus com aplicações credenciadas.
+
+##API Setup
+**Criar aplicação**
+* Vá para "/o/applications/" e clique "new application". Um formulário irá aparecer para preencher.
+* No formulário, preencha somente o "Name" com o nome da aplicação, os campos "client id" e "client secret" são gerados automaticamente e não devem ser modificados. 
+"Client type" deve ser confidential, e "Authorization Grant Type" como " Resource owner password-based".
+
+**Obtendo um access Token**
+
+* Crie um request, usando um usuário valido, usando o seguinte abaixo (lembre-se que isso é  um POST, estou usando um comando curl para fins de teste): 
+curl -X POST -d "grant_type=password&username=<user_name>&password=<password>" -u"<client_id>:<client_secret>" http://amadeus/o/token/
-##API Description
-We are using mostly viewsets ( http://www.django-rest-framework.org/api-guide/viewsets/) to build our API endpoints now, so all default methods and API points were kept.
+* finalmente, com o seu access token, você pode testar um dos endpoints usando o template abaixo: 
+curl -H "Authorization: Bearer <your_access_token>" -X POST -d"username=foo&password=bar" http://localhost:8000/users/ (inserting a new user)
+ 
 * model list(GET) = list all objects from that mode in pagination mode, each page has 10
 * model detail(GET) = give the details of the objects and most important fields of the ones objects its has relationships.
 * model create
+**API Endpoints **
+
 **Courses (URL: coursesapi)**
 * course list ("/coursesapi/")
 * course detail ("/coursesapi/id") (id is a parameter)
@@ -104,14 +121,7 @@ We are using mostly viewsets ( http://www.django-rest-framework.org/api-guide/vi
 * logs list ("/logs/")
 * log detail ("/logs/id") (id is a parameter)
-#Obtaining an Access Token
-* First build an application o "amadeus/o/applications" following this tutorial: http://django-oauth-toolkit.readthedocs.io/en/latest/tutorial/tutorial_01.html#create-an-oauth2-client-application
-* Then request, using a valid user, an access token using the following template (you'll have to know how to translate a GET Method into a POST one)
-curl -X POST -d "grant_type=password&username=<user_name>&password=<password>" -u"<client_id>:<client_secret>" http://amadeus/o/token/
-
-* finally, with your access token you can use test using 
-curl -H "Authorization: Bearer <your_access_token>" -X POST -d"username=foo&password=bar" http://localhost:8000/users/ (inserting a new user)
 ## Link's úteis
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-23 23:14-0300\n"
+"POT-Creation-Date: 2016-11-26 12:36-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -212,10 +212,18 @@ msgstr &quot;em&quot;
 msgid "ago"
 msgstr "atrás"
+#: .\views.py:38
+msgid "Home | Amadeus"
+msgstr "Página inicial | Amadeus"
+
 #: .\views.py:75
 msgid "Changes saved."
 msgstr "Mudanças salvas"
+#: .\views.py:82
+msgid "Settings | Amadeus"
+msgstr "Configurações | Amadeus"
+
 #, fuzzy
 #~| msgid "Students:"
 #~ msgid "Students"
@@ -14,7 +14,7 @@ from .forms import EmailBackendForm
 from courses.models import Course
 class AppIndex(LoginRequiredMixin, ListView, NotificationMixin):
-	login_url = reverse_lazy("core:home")	
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = "home.html"
@@ -34,15 +34,15 @@ class AppIndex(LoginRequiredMixin, ListView, NotificationMixin):
 			context['page_template'] = "home_admin_content.html"
 		else:
 			context['page_template'] = "home_teacher_student_content.html"
-	
-		context['title'] = 'Amadeus'
+
+		context['title'] = _('Home | Amadeus')
 		if self.request.is_ajax():
 			if self.request.user.is_staff:
 				self.template_name = "home_admin_content.html"
 			else:
 				self.template_name = "home_teacher_student_content.html"
-			
+
 		return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
 class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
@@ -79,6 +79,7 @@ class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
 	def get_context_data(self, **kwargs):
 		context = super(AmadeusSettings, self).get_context_data(**kwargs)
 		context['page'] = self.kwargs.get('page')
+		context['title'] = _('Settings | Amadeus')
 		if not self.request.method == 'POST':
 			try:
 				setting = EmailBackend.objects.latest('id')
@@ -86,6 +87,3 @@ class AmadeusSettings(LoginRequiredMixin, HasRoleMixin, generic.CreateView):
 			except:
 				pass
 		return context
-
-
-
 from django.conf import settings
 import json
+import time
 from functools import wraps
+from django.shortcuts import get_object_or_404
 from .models import Action, Resource, Action_Resource, Log, Notification
 def log_decorator(log_component = '', log_action = '', log_resource = ''):
@@ -38,7 +40,6 @@ def log_decorator(log_component = &#39;&#39;, log_action = &#39;&#39;, log_resource = &#39;&#39;):
 				log = Log()
 				log.user = request.user
 				log.component = log_component
-				#log.context = json.dumps(request.log_context)
 				log.context = request.log_context
 				log.action_resource = action_resource
@@ -51,6 +52,75 @@ def log_decorator(log_component = &#39;&#39;, log_action = &#39;&#39;, log_resource = &#39;&#39;):
 	return _log_decorator
+def log_decorator_ajax(log_component = '', log_action = '', log_resource = ''):
+
+	def _log_decorator_ajax(view_function):
+
+		def _decorator(request, *args, **kwargs):
+			view_action = request.GET.get("action")
+
+			if view_action == 'open':
+				if request.user.is_authenticated:
+					action = Action.objects.filter(name = log_action)
+					resource = Resource.objects.filter(name = log_resource)
+
+					if not action:
+						action = Action(name = log_action)
+						action.save()
+					else:
+						action = action[0]
+
+					if not resource:
+						resource = Resource(name = log_resource)
+						resource.save()
+					else:
+						resource = resource[0]
+
+					action_resource = Action_Resource.objects.filter(action = action, resource = resource)
+
+					if not action_resource:
+						action_resource = Action_Resource(action = action, resource = resource)
+						action_resource.save()
+					else:
+						action_resource = action_resource[0]
+
+					log = Log()
+					log.user = request.user
+					log.component = log_component
+					log.context = ""
+					log.action_resource = action_resource
+
+					log.save()
+
+					response = view_function(request, *args, **kwargs)
+					
+					log = Log.objects.latest('id')
+					log.context = request.log_context
+					log.save()
+			elif view_action == 'close':
+				if request.user.is_authenticated:
+					log = get_object_or_404(Log, id = request.GET.get('log_id'))
+
+					if type(log.context) == dict:
+						log_context = log.context
+					else:
+						log_context = json.loads(log.context)
+
+					log_context['timestamp_end'] = str(int(time.time()))
+
+					log.context = log_context
+
+					log.save()
+
+					response = view_function(request, *args, **kwargs)
+
+			return response
+
+		return wraps(view_function)(_decorator)
+
+	return _log_decorator_ajax
+
+
 def notification_decorator(read = False, message = '', actor = None, users = [], not_action='', not_resource='', resource_link=''):
 	def _notification_decorator(view_function):
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-23 23:16-0300\n"
+"POT-Creation-Date: 2016-11-26 12:44-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -32,3 +32,17 @@ class TimeSpentMiddleware(object):
 					log.save()
 					request.session['log_id'] = None
+
+					oppened_logs = Log.objects.filter(user = request.user, context__contains={'timestamp_end': '-1'})
+
+					for op_log in oppened_logs:
+						if type(op_log.context) == dict:
+							log_context = op_log.context
+						else:
+							log_context = json.loads(op_log.context)
+
+						log_context['timestamp_end'] = str(int(time.time()))
+
+						op_log.context = log_context
+
+						op_log.save()
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-23 23:19-0300\n"
+"POT-Creation-Date: 2016-11-26 12:45-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot;
 #: .\forms.py:13 .\forms.py:25 .\forms.py:47 .\forms.py:68 .\forms.py:91
 #: .\models.py:14 .\models.py:26 .\models.py:39 .\models.py:68 .\models.py:96
-#: .\models.py:157 .\templates\subject\form_view_teacher.html:182
+#: .\models.py:157 .\templates\subject\form_view_teacher.html:185
 #: .\templates\subject\replicate.html:18 .\templates\topic\replicate.html:18
 msgid "Name"
 msgstr "Nome"
@@ -55,7 +55,7 @@ msgid &quot;To define if the course can be accessed by people not registered&quot;
 msgstr "Para definir se o curso pode ser acessado por pessoas não registradas"
 #: .\forms.py:69 .\forms.py:92 .\models.py:70 .\models.py:98 .\models.py:159
-#: .\templates\subject\form_view_teacher.html:53
+#: .\templates\subject\form_view_teacher.html:56
 #: .\templates\subject\index.html:53 .\templates\subject\replicate.html:25
 #: .\templates\topic\replicate.html:24
 msgid "Description"
@@ -173,7 +173,7 @@ msgstr &quot;Todos estudantes&quot;
 #: .\models.py:143 .\models.py:148
 #: .\templates\subject\form_view_student.html:42
-#: .\templates\subject\form_view_teacher.html:61
+#: .\templates\subject\form_view_teacher.html:64
 msgid "Material"
 msgstr "Material"
@@ -228,7 +228,7 @@ msgstr &quot;Remover&quot;
 #: .\templates\course\course_card.html:18 .\templates\course\view.html:39
 #: .\templates\course\view.html:90
-#: .\templates\subject\form_view_teacher.html:24
+#: .\templates\subject\form_view_teacher.html:26
 #: .\templates\subject\index.html:37 .\templates\subject\replicate.html:52
 #: .\templates\topic\index.html:36
 msgid "Replicate"
@@ -236,14 +236,14 @@ msgstr &quot;Repetir&quot;
 #: .\templates\course\course_card.html:19 .\templates\course\view.html:40
 #: .\templates\course\view.html:91
-#: .\templates\subject\form_view_teacher.html:25
+#: .\templates\subject\form_view_teacher.html:27
 #: .\templates\subject\index.html:38 .\templates\topic\index.html:39
 msgid "Edit"
 msgstr "Editar"
 #: .\templates\course\course_card.html:20 .\templates\course\view.html:41
 #: .\templates\course\view.html:92
-#: .\templates\subject\form_view_teacher.html:26
+#: .\templates\subject\form_view_teacher.html:28
 #: .\templates\subject\index.html:39 .\templates\topic\index.html:42
 msgid "Remove"
 msgstr "Remover"
@@ -276,7 +276,7 @@ msgstr &quot;Apagar curso&quot;
 msgid "Are you sure you want to delete the course"
 msgstr "Você tem certeza que deseja deletar o curso"
-#: .\templates\course\filtered.html:11 .\views.py:176
+#: .\templates\course\filtered.html:11
 msgid "Create Course"
 msgstr "Criar curso"
@@ -284,6 +284,10 @@ msgstr &quot;Criar curso&quot;
 msgid "Categories:"
 msgstr "Categorias:"
+#: .\templates\course\index.html:29
+msgid "Search for Courses"
+msgstr "Pesquisar por cursos"
+
 #: .\templates\course\view.html:41
 msgid "Are you sure you want to delete this course?"
 msgstr "Você tem certeza que deseja deletar este curso?"
@@ -301,8 +305,8 @@ msgid &quot;Cancel&quot;
 msgstr "Cancelar"
 #: .\templates\course\view.html:65
-#: .\templates\subject\form_view_teacher.html:164
-#: .\templates\subject\form_view_teacher.html:216
+#: .\templates\subject\form_view_teacher.html:167
+#: .\templates\subject\form_view_teacher.html:219
 msgid "Confirm"
 msgstr "Confirmar"
@@ -324,64 +328,64 @@ msgid &quot;exam&quot;
 msgstr "Avaliação"
 #: .\templates\subject\form_view_student.html:55
-#: .\templates\subject\form_view_teacher.html:95
+#: .\templates\subject\form_view_teacher.html:98
 #: .\templates\topic\topic_card.html:18
 msgid "Activities"
 msgstr "Atividades"
-#: .\templates\subject\form_view_teacher.html:49
+#: .\templates\subject\form_view_teacher.html:52
 msgid "Name Topic"
 msgstr "Nome do tópico"
-#: .\templates\subject\form_view_teacher.html:69
+#: .\templates\subject\form_view_teacher.html:72
 msgid "Create a Link"
 msgstr "Criar link"
-#: .\templates\subject\form_view_teacher.html:70
+#: .\templates\subject\form_view_teacher.html:73
 msgid "Create a file"
 msgstr "Criar um arquivo"
-#: .\templates\subject\form_view_teacher.html:103
+#: .\templates\subject\form_view_teacher.html:106
 msgid "Create Forum"
 msgstr "Criar Forum"
-#: .\templates\subject\form_view_teacher.html:104
+#: .\templates\subject\form_view_teacher.html:107
 msgid "Create Poll"
 msgstr "Criar enquete"
-#: .\templates\subject\form_view_teacher.html:105
+#: .\templates\subject\form_view_teacher.html:108
 msgid "Delivery Material"
 msgstr "Entregar Material"
-#: .\templates\subject\form_view_teacher.html:106
+#: .\templates\subject\form_view_teacher.html:109
 msgid "Create exam"
 msgstr "Criar avaliação"
-#: .\templates\subject\form_view_teacher.html:140
+#: .\templates\subject\form_view_teacher.html:143
 msgid "Back"
 msgstr "Voltar"
-#: .\templates\subject\form_view_teacher.html:160
+#: .\templates\subject\form_view_teacher.html:163
 msgid "Delete your Topic?"
 msgstr "Deletar seu Tópico?"
-#: .\templates\subject\form_view_teacher.html:178
+#: .\templates\subject\form_view_teacher.html:181
 msgid "Material EMBED"
 msgstr "Incorporar Material"
-#: .\templates\subject\form_view_teacher.html:189
+#: .\templates\subject\form_view_teacher.html:192
 msgid "Code"
 msgstr "Código"
-#: .\templates\subject\form_view_teacher.html:193
+#: .\templates\subject\form_view_teacher.html:196
 msgid "Material description"
 msgstr "Descrição do material"
-#: .\templates\subject\form_view_teacher.html:197
+#: .\templates\subject\form_view_teacher.html:200
 msgid "Height"
 msgstr "Tamanho"
-#: .\templates\subject\form_view_teacher.html:203
+#: .\templates\subject\form_view_teacher.html:206
 msgid "Weight"
 msgstr "Peso"
@@ -445,45 +449,75 @@ msgstr &quot;Descrição do Tópico&quot;
 msgid "Materials"
 msgstr "Materiais"
-#: .\views.py:218
-msgid "Replicate Course"
-msgstr "Replicar curso"
+#: .\views.py:102
+msgid "Courses | Amadeus"
+msgstr "Cursos | Amadeus"
-#: .\views.py:400
+#: .\views.py:140
+msgid "All Courses | Amadeus"
+msgstr "Todos Cursos | Amadeus"
+
+#: .\views.py:178
+msgid "Create Course | Amadeus"
+msgstr "Criar curso | Amadeus"
+
+#: .\views.py:220
+msgid "Replicate Course | Amadeus"
+msgstr "Replicar curso | Amadeus"
+
+#: .\views.py:402
 msgid "Course deleted successfully!"
 msgstr "Curso deletado com sucesso!"
-#: .\views.py:423
+#: .\views.py:425
 msgid "Successfully subscribed to the course!"
 msgstr "Inscrição no curso realizada com sucesso!"
-#: .\views.py:425
+#: .\views.py:427
 msgid ""
 "An error has occured. Could not subscribe to this course, try again later"
 msgstr "Ocorreu um erro. Não pôde inscrever no curso, tente novamente"
-#: .\views.py:467
+#: .\views.py:460
+msgid "Categories | Amadeus"
+msgstr "Categorias | Amadeus"
+
+#: .\views.py:474
+#, python-format
 msgid "Category \"%s\" created successfully!"
 msgstr "Categoria \"%s\" criada com sucesso!"
-#: .\views.py:482
+#: .\views.py:479
+msgid "Create Category | Amadeus"
+msgstr "Criar Categoria | Amadeus"
+
+#: .\views.py:495
+#, python-format
 msgid "Category \"%s\" updated successfully!"
 msgstr "Categoria \"%s\" editada com sucesso!"
-#: .\views.py:507
+#: .\views.py:521
 msgid "Category deleted successfully!"
 msgstr "Categoria deletada com sucesso!"
-#: .\views.py:917
+#: .\views.py:688
+msgid "Create Topic | Amadeus"
+msgstr "Criar Tópico | Amadeus"
+
+#: .\views.py:794
+msgid "Create Subject | Amadeus"
+msgstr "Criar Assunto | Amadeus"
+
+#: .\views.py:936
 msgid "Successfully subscribed to the subject!"
 msgstr "Inscrição no assunto realizada com sucesso!"
-#: .\views.py:919
+#: .\views.py:938
 msgid ""
 "An error has occured. Could not subscribe to this subject, try again later"
 msgstr "Ocorreu um erro. Não pôde inscrever no assunto, tente novamente"
-#: .\views.py:921
+#: .\views.py:940
 msgid "You're not subscribed in the course yet."
 msgstr "Você não está inscrito no curso ainda."
@@ -517,16 +551,12 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Image"
 #~ msgstr "Imagem"
-
 #~ msgid "CourseCategory"
 #~ msgstr "Categoria do Curso"
 #~ msgid "Course objective"
 #~ msgstr "Objetivo do Curso"
-#~ msgid "Course modules"
-#~ msgstr "Módulos do curso"
-
 #~ msgid "Max number of students that a class can have"
 #~ msgstr "Número máximo de estudantes que uma classe pode ter"
@@ -545,17 +575,14 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Representative image of the course"
 #~ msgstr "Imagem representativa do curso"
-
 #~| msgid "Category which the course belongs"
 #~ msgid "CourseCategory which the course belongs"
 #~ msgstr "Categoria de Curso ao qual o curso pertence"
-
 #~| msgid "Maximum Students"
 #~ msgid "Student"
 #~ msgstr "Quantidade máxima de estudantes"
-
 #~| msgid "Course modules"
 #~ msgid "Course's Students"
 #~ msgstr "Estudantes do curso"
@@ -587,7 +614,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Profile"
 #~ msgstr "Perfil"
-
 #~| msgid "Courses"
 #~ msgid "My Courses"
 #~ msgstr "Meus Cursos"
@@ -595,7 +621,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Actions"
 #~ msgstr "Ações"
-
 #~| msgid "Edit Category"
 #~ msgid "List Category"
 #~ msgstr "Listar Categorias"
@@ -606,7 +631,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Edit Category"
 #~ msgstr "Editar categoria"
-
 #~| msgid "Course name"
 #~ msgid "Course Name"
 #~ msgstr "Nome do Curso"
@@ -617,22 +641,14 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "No"
 #~ msgstr "Não"
-
 #~| msgid "Course"
 #~ msgid "Home Course"
 #~ msgstr "Pagina Inicial do Curso"
-
 #~| msgid "Courses"
 #~ msgid "My courses"
 #~ msgstr "Meus Cursos"
-
-#~| msgid "Courses"
-#~ msgid "All Courses"
-#~ msgstr "Todos Cursos"
-
-
 #~| msgid "Manage Courses"
 #~ msgid "Manage Users"
 #~ msgstr "Gerenciar Usuários"
@@ -643,12 +659,10 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "No courses found"
 #~ msgstr "Nenhum curso encontrado"
-
 #~| msgid "Image"
 #~ msgid "Imagem"
 #~ msgstr "Imagem"
-
 #~| msgid "Are you sure you want to delete the couse"
 #~ msgid "Are you sure you want to remove this subject?"
 #~ msgstr "Você tem certeza que deseja deletar este assunto?"
@@ -665,7 +679,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Proposal Activity"
 #~ msgstr "Atividade proposta"
-
 #~| msgid "Description"
 #~ msgid "Describe"
 #~ msgstr "Descreva"
@@ -679,7 +692,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Send Later"
 #~ msgstr "Enviar depois"
-
 #~| msgid "Manage Courses"
 #~ msgid "Manage Subjects"
 #~ msgstr "Gerenciar cursos"
@@ -687,7 +699,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "poll"
 #~ msgstr "Enquete"
-
 #~| msgid "Create Category"
 #~ msgid "Create Subject Category"
 #~ msgstr "Criar Categoria de Assunto"
@@ -695,17 +706,14 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Participants"
 #~ msgstr "Participantes"
-
 #~| msgid "Duplicate Course"
 #~ msgid "Replicate subject"
 #~ msgstr "Replicar assunto"
-
 #~| msgid "Create Course"
 #~ msgid "Create subject"
 #~ msgstr "Criar assunto"
-
 #~| msgid "Edit Course"
 #~ msgid "Edit subject"
 #~ msgstr "Editar assunto"
@@ -719,7 +727,6 @@ msgstr &quot;Você não está inscrito no curso ainda.&quot;
 #~ msgid "Send"
 #~ msgstr "Enviar"
-
 #~| msgid "No categories found"
 #~ msgid "No activity found"
 #~ msgstr "Nenhuma atividade encontrada"
@@ -49,7 +49,7 @@ function subscribe(elem, url, id, confirm_message) {
 /*
 *
-* Function to delete a course 
+* Function to delete a course
 *
 */
@@ -62,7 +62,7 @@ var RemoveCourse = {
         $("#accordion").remove();
         $(".modal-backdrop.in").remove();
         alertify.success("Course removed successfully!");
-        setTimeout(function () { location.reload(1); }, 2000);
+        setTimeout(function () { location.reload(1); }, 1);
       }).fail(function(){
         $("#modal_course").empty();
         $("#modal_course").append(data);
@@ -84,7 +84,7 @@ var delete_course = {
     });
   }
 };
-/* 
+/*
 *
 * Function to load create course's form
 *
@@ -97,4 +97,4 @@ function replicate_course(url, course) {
             $(".course_replicate_form").html(data);
         }
     });
-}
 \ No newline at end of file
+}
@@ -0,0 +1,30 @@
+function openTopic(url, topic, btn) {
+    var icon = btn.find('i');
+    var action = '', log_id;
+
+    if (icon.hasClass('fa-caret-square-o-down')) {
+        icon.removeClass('fa-caret-square-o-down');
+        icon.addClass('fa-caret-square-o-up');
+        action = 'open';
+        log_id = -1;
+    } else {
+        icon.addClass('fa-caret-square-o-down');
+        icon.removeClass('fa-caret-square-o-up');
+        action = 'close';
+        log_id = $(".topic_" + topic).find(".log_id").val();
+    }
+
+    $.ajax({
+        url: url,
+        data: {"action": action, "log_id": log_id},
+        dataType: 'json',
+        success: function (data) {
+           if (action == 'open') {
+                $(".topic_" + topic).find(".log_id").val(data.log_id);           
+           }
+        },
+        error: function(data) {
+            console.log('Error');
+        }
+    });
+}
 \ No newline at end of file
@@ -26,7 +26,7 @@
     <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>
+          <input type="text" class="form-control" placeholder="{% trans 'Search for Courses' %}" name="q"></div>
             <span class="input-group-btn input-group-sm">
               <button type="submit" class="btn btn-fab btn-fab-mini">
                 <i class="fa fa-search" aria-hidden="true"></i>
@@ -6,6 +6,7 @@
       <script src="{% static 'js/file.js' %}"></script>
       <script type="text/javascript" src="{% static 'js/material.js' %}"></script>
       <script type = "text/javascript" src="{% static 'links.js' %}"></script>
+      <script type="text/javascript" src="{% static 'js/topic.js' %}"></script>
   {% endblock %}
 <div class="cards-detail">
   <div class="panel-group accordion ui-accordion ui-widget ui-helper-reset ui-sortable" role="tablist" aria-multiselectable="false">
@@ -13,7 +14,7 @@
       <div class="panel-heading topic ui-sortable-handle" role="tab">
       <div class="row">
         <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.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>
+          <button class="btn btn-default btn-sm caret-square" onclick="openTopic('{% url 'course:topic_log' topic.id %}', '{{topic.id}}', $(this));"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
         </div>
         <div class="col-xs-9 col-md-9 titleTopic">
           <a href="{% url 'course:view_topic' topic.slug %}" role="button">
@@ -22,7 +23,7 @@
         </div>
       </div>
     </div>
-    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+    <div class="panel-collapse collapseTopic-{{topic.slug}} collapse" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="false" aria-hidden="true">
       <div class="panel-body">
         <div class="presentation">
           <p>
@@ -32,8 +33,7 @@
           </p>
         </div>
-      </div>
-    </div>
+     
     {% if not professor_links %}
       <div class="row">
@@ -82,4 +82,6 @@
         {% include "links/update_link.html" %}
     {% endif %}
     </div>
+    </div>
+     </div>
     </div>
 \ No newline at end of file
 {% load static i18n list_topic_foruns permission_tags widget_tweaks professor_access list_topic_exercises %}
+<script type="text/javascript" src="{% static 'js/topic.js' %}"></script>
+
 <div class="panel panel-default cards-detail">
   <div class="panel-heading topic">
     <div class="row">
       <div class="col-md-1 moreAccordion" data-toggle="collapse" data-parent="#accordion-{{topic.slug}}" href=".collapseTopic-{{topic.slug}}" aria-expanded="false" aria-controls="collapseTopic-{{topic.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>
+        <button class="btn btn-default btn-sm caret-square" onclick="openTopic('{% url 'course:topic_log' topic.id %}', '{{topic.id}}', $(this));"><i class="fa fa-caret-square-o-down fa-2x" aria-hidden="true"></i></button>
       </div>
       <div class="col-xs-9 col-md-9 titleTopic">
         <a href="{% url 'course:view_topic' topic.slug %}" role="button">
@@ -32,7 +34,8 @@
       </div>
     </div>
   </div>
-  <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse in" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="true" aria-hidden="false">
+  <div class="panel-collapse collapseTopic-{{topic.slug}} topic_{{ topic.id }} collapse" role="tabpanel" aria-labelledby="heading_{{topic.id}}" aria-expanded="false" aria-hidden="true">
+    <input type="hidden" class="log_id" />
     <div class="panel-body">
       {# dados do tópico no modo de visualização #}
@@ -33,7 +33,7 @@
               </button>
               <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                 <li>
-                    <a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Replicate" %}</a>
+                    <a href="{% url 'course:replicate_topic' topic.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 %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>&nbsp; {% trans "Edit" %}</a>
@@ -34,6 +34,7 @@ urlpatterns = [
     url(r'^subjects/file-material-view/(?P<slug>[\w_-]+)/$', views.FileMaterialView.as_view(), name='file_material_view'),
     url(r'^links/',include('links.urls',namespace = 'links')),
     url(r'^exercise/', include('exercise.urls', namespace='exercise')),
+    url(r'^topic/(?P<topic>[\w_-]+)/$', views.topic_log, name='topic_log'),
     url(r'^(?P<slug>[\w_-]+)/', include([
         url(r'^$', views.CourseView.as_view(), name='view'),
         url(r'^(?P<category>[\w_-]+)/$', views.CourseView.as_view(), name='view_filter')
 from .forms import CourseForm, UpdateCourseForm, CategoryCourseForm, SubjectForm,TopicForm,ActivityForm
 from .models import Course, Subject, CourseCategory, Topic, SubjectCategory, Activity, CategorySubject
-from core.decorators import log_decorator
+from core.decorators import log_decorator, log_decorator_ajax
 from core.mixins import LogMixin, NotificationMixin
 from core.models import Log
 from courses.models import Material
@@ -99,6 +99,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
             list_courses = self.get_queryset().filter(students__in = [self.request.user]).order_by('name')
         context['categorys_courses'] = course_category(list_courses)
+        context['title'] = _('Courses | Amadeus')
         return context
 class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
@@ -136,6 +137,7 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
         list_courses = self.get_queryset()
         context['categorys_courses'] = course_category(list_courses)
+        context['title'] = _('All Courses | Amadeus')
         return context
@@ -161,7 +163,7 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationM
         self.log_context['course_slug'] = self.object.slug
         self.log_context['course_category_id'] = self.object.category.id
         self.log_context['course_category_name'] = self.object.category.name
-
+        messages.success(self.request,_("Course '%s' was successfully created!"%(self.object.name) ))
         super(CreateCourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
         return super(CreateCourseView, self).form_valid(form)
@@ -173,7 +175,7 @@ class CreateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationM
         elif has_role(self.request.user,'professor'):
             courses = self.request.user.courses_student.all()
         context['courses'] = courses
-        context['title'] = _("Create Course")
+        context['title'] = _("Create Course | Amadeus")
         context['now'] = date.today()
         return context
@@ -215,7 +217,7 @@ class ReplicateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
         context['courses'] = courses
         context['course'] = course
         context['categorys_courses'] = categorys_courses
-        context['title'] = _("Replicate Course")
+        context['title'] = _("Replicate Course | Amadeus")
         context['now'] = date.today()
         print (course.public)
         return context
@@ -245,7 +247,6 @@ class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Updat
     def form_valid(self, form):
         self.object = form.save()
-        print (form)
         self.log_context['course_id'] = self.object.id
         self.log_context['course_name'] = self.object.name
         self.log_context['course_slug'] = self.object.slug
@@ -453,6 +454,11 @@ class IndexCatView(LoginRequiredMixin, generic.ListView):
     context_object_name = 'categories'
     paginate_by = 10
+    def get_context_data (self, **kwargs):
+        context = super(IndexCatView, self).get_context_data(**kwargs)
+        context['title'] = _('Categories | Amadeus')
+        return context
+
 class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
     allowed_roles = ['professor', 'system_admin']
@@ -467,6 +473,12 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
         messages.success(self.request, _('Category "%s" created successfully!')%(objeto))
         return reverse_lazy('course:manage_cat')
+    def get_context_data (self, **kwargs):
+        context = super(CreateCatView, self).get_context_data(**kwargs)
+        context['title'] = _('Create Category | Amadeus')
+
+        return context
+
 class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
     allowed_roles = ['professor', 'system_admin']
@@ -482,6 +494,7 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
         messages.success(self.request, _('Category "%s" updated successfully!')%(objeto))
         #return reverse_lazy('course:update_cat', kwargs={'slug' : self.object.slug})
         return reverse_lazy('course:manage_cat')
+
 class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
     allowed_roles = ['professor', 'system_admin']
@@ -556,6 +569,7 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
         context['subject'] = subject
         context['topics'] = Topic.objects.filter(subject = subject)
         context['exercise'] = Exercise.objects.filter(topic__subject=subject)
+        context['title'] = subject.name
         if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
             context['files'] = TopicFile.objects.filter(professor__name = self.request.user.name)
         else:
@@ -631,7 +645,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
         activitys = Activity.objects.filter(topic__name = topic.name)
         students_activit = User.objects.filter(activities__in = Activity.objects.all())
         materials = Material.objects.filter(topic = topic)
-        
+
         users = User.objects.filter(subject_student__in = Subject.objects.all())
         context['users'] = users
         exercises = Exercise.objects.filter(Q(students=self.request.user)|Q(professors=self.request.user))
@@ -644,6 +658,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
         context['students_activit'] = students_activit
         context['materials'] = materials
         context['form'] = ActivityForm
+        context['title'] = topic.name
         return context
@@ -669,6 +684,7 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMi
         context['course'] = subject.course
         context['subject'] = subject
         context['subjects'] = subject.course.subjects.all()
+        context['title'] = _('Create Topic | Amadeus')
         return context
     def form_valid(self, form):
@@ -774,6 +790,7 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notification
         context['subjects'] = course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user]))
         if (has_role(self.request.user,'system_admin')):
             context['subjects'] = course.subjects.all()
+        context['title'] = _('Create Subject | Amadeus')
         return context
     def form_valid(self, form):
@@ -848,6 +865,7 @@ class UpdateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Upda
         context['course'] = self.object.course
         context['subject'] = self.object
         context['subjects'] = self.object.course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user]))
+        context['title'] = self.object.name
         if (has_role(self.request.user,'system_admin')):
             context['subjects'] = self.object.course.subjects.all()
         return context
@@ -970,6 +988,35 @@ class FileMaterialView(LoginRequiredMixin, LogMixin, generic.DetailView):
         return super(FileMaterialView, self).dispatch(*args, **kwargs)
+@login_required
+@log_decorator_ajax("courses", "viewed", "topic")
+def topic_log(request, topic):
+    action = request.GET.get('action')
+
+    if action == 'open':
+        topic = get_object_or_404(Topic, id = topic)
+        log_context = {}
+        log_context['topic_id'] = topic.id
+        log_context['topic_name'] = topic.name
+        log_context['topic_slug'] = topic.slug
+        log_context['subject_id'] = topic.subject.id
+        log_context['subject_name'] = topic.subject.name
+        log_context['subject_slug'] = topic.subject.slug
+        log_context['course_id'] = topic.subject.course.id
+        log_context['course_name'] = topic.subject.course.name
+        log_context['course_slug'] = topic.subject.course.slug
+        log_context['course_category_id'] = topic.subject.course.category.id
+        log_context['course_category_name'] = topic.subject.course.category.name
+        log_context['timestamp_start'] = str(int(time.time()))
+        log_context['timestamp_end'] = "-1"
+        request.log_context = log_context
+        log_id = Log.objects.latest('id').id
+
+        response = JsonResponse({"message": "ok", "log_id": log_id})
+    else:
+        response = JsonResponse({"message": "ok"})
+
+    return response
 #API VIEWS
 class CourseViewSet(viewsets.ModelViewSet):
@@ -1011,6 +1058,7 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
         context['subject'] = subject
         context['subjects'] = subject.course.subjects.all()
         context['topic'] = topic
+        context['title'] = subject.name
         return context
     def form_valid(self, form):
@@ -1065,6 +1113,7 @@ class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificat
         context['course'] = course
         context['subjects'] = course.subjects.filter(Q(visible=True) | Q(professors__in=[self.request.user]))
         context['subject'] = subject
+        context['title'] = course.name
         if (has_role(self.request.user,'system_admin')):
             context['subjects'] = course.subjects.all()
         return context
 from django.contrib import admin
-from .models import Exam, Answer, AnswersStudent
+from .models import Exam, Answer, AnswersStudent, Question, Alternative
 class ExamAdmin(admin.ModelAdmin):
 	list_display = ['name', 'slug','begin_date','limit_date']
@@ -17,3 +17,5 @@ class AnswersStudentAdmin(admin.ModelAdmin):
 admin.site.register(Exam, ExamAdmin)
 admin.site.register(Answer, AnswerAdmin)
 admin.site.register(AnswersStudent, AnswersStudentAdmin)
+admin.site.register(Question)
+admin.site.register(Alternative)
@@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm):
     class Meta:
         model = Exam
-        fields = ['name','begin_date','limit_date','students','all_students']
+        fields = ['name','begin_date','limit_date','students','all_students', 'begin_exam', 'end_exam']
         widgets = {
             'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-11-25 11:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('exam', '0002_auto_20161124_1217'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exam',
+            name='begin_exam',
+            field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='Begin of Exam'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='exam',
+            name='end_exam',
+            field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='End of Exam'),
+            preserve_default=False,
+        ),
+    ]
@@ -6,15 +6,17 @@ from core.models import Resource
 from courses.models import Activity
 class Exam(Activity):
-	begin_date = models.DateField(_('Begin of Course Date'), blank=True)
-	exibe = models.BooleanField(_('Exibe?'), default=False)
+    begin_date = models.DateField(_('Begin of Course Date'), blank=True)
+    begin_exam = models.DateField(_('Begin of Exam'), blank = True)
+    end_exam = models.DateField(_('End of Exam'), blank = True)
+    exibe = models.BooleanField(_('Exibe?'), default=False)
-	class Meta:
-		verbose_name = _('Exam')
-		verbose_name_plural = _('Exams')
+    class Meta:
+        verbose_name = _('Exam')
+        verbose_name_plural = _('Exams')
-		def __str__(self):
-			return str(self.name) + str("/") + str(self.topic)
+        def __str__(self):
+            return str(self.name) + str("/") + str(self.topic)
 class Answer(models.Model):
@@ -43,3 +45,12 @@ class AnswersStudent(models.Model):
     def __str__(self):
         return str(self.student) + str("/") + str(self.exam)
+
+class Question(models.Model):
+    exam = models.ForeignKey(Exam, verbose_name=_('Exam'), related_name='question_exam')
+    statement = models.TextField(_("Statement"), blank=False)
+
+class Alternative(models.Model):
+    question = models.ForeignKey(Question, verbose_name=_("Question"), related_name="alternative_question")
+    statement = models.TextField(_("Statement"), blank=False)
+    answer = models.BooleanField(_("answer"), default=False)
 \ No newline at end of file
@@ -95,7 +95,7 @@
   }
 //Bug quando criamos sem ser na ordem
 function functionNewAlternative(Question_Id){
-  var alternative = parseInt($("div input").last().val()) + 1;
+  var alternative = parseInt($(Question_Id).find("input:last").val()) + 1;
    var element = '<div class="radio radio-primary form-group">' +
     '<label>' +
       '<input type="radio" name="alternatives" id="alternative_'+alternative+'_'+Question_Id+'"' + 'value="'+alternative+'">' +
@@ -106,9 +106,9 @@ function functionNewAlternative(Question_Id){
     $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
 }
 function functionNewAlternativeTF(Question_Id){
-  var alternative = parseInt($("div").last().val()) + 1;
+  var alternative = parseInt($('#radiosTF_1').find('div:last').attr('value')) + 1;
    var element =
-    '<div class="radio form-group">'+
+    '<div class="radio  radio-primary form-group"  value="'+alternative+'">'+
       '<label class="primary-label-TF" >'+
         '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
       '</label>'+
@@ -122,4 +122,9 @@ function functionNewAlternativeTF(Question_Id){
     $(Question_Id).append(element);
     $('.primary-label-TF').css('padding-left', '0px');
     $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
-}
 \ No newline at end of file
+}
+var locale = navigator.language || navigator.userLanguage;
+
+    $('.date-picker').datepicker({
+        language: locale,
+    });
 \ No newline at end of file
@@ -13,22 +13,40 @@
     <h4 class="panel-title" id="exam-title">{% trans "Create a Exam" %}</h4>
   </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-4">
-        <input type="date" name="begin_date" class="form-control" id="begin_date" placeholder='{% trans "Begin Date" %}'>
-      </div>
-      <label for="end_date" class="col-md-2 control-label">{% trans "Exam's end date" %}</label>
-      <div class="col-md-4">
-        <input type="date" name="end_date" class="form-control" id="end_date" placeholder='{% trans "End Date" %}'>
+    {% csrf_token %}
+    {% for field in form %}
+      {% if field.auto_id != 'id_begin_exam' and field.auto_id != 'id_end_exam'  and field.auto_id != 'id_begin_date' and field.auto_id != 'id_limit_date' %}
+        <div class="row form-group">
+          {% if field.field.required %}
+            <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+            {% else %}
+            <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+          {% endif %}
+          <div class="col-md-10">
+          {% if field.auto_id == 'id_all_students' %}
+            {% render_field field class='form-control input-sm' %}
+          {% else %}
+            {% render_field field class='form-control input-sm' %}
+          {% endif %}
+          </div>
+        </div>
+      {% endif %}
+    {% endfor %}
+      <div class="row form-group">
+        {% for field in form %}
+          {% if field.auto_id == 'id_begin_date' or field.auto_id == 'id_limit_date' %}
+            {% if field.field.required %}
+              <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+            {% else %}
+              <label for="{{ field.auto_id }}" class="col-md-2 control-label">{{ field.label }}</label>
+            {% endif %}
+            <div class="col-md-4">
+              {% render_field field class='form-control date-picker' %}
+            </div>
+          {% endif %}
+        {% endfor %}
       </div>
-    </div>
+
     <div class="row form-group">
       <div class="col-md-10">
         <div class="checkbox">
@@ -38,6 +56,7 @@
         </div>
       </div>
     </div>
+
     <div class="row form-group" id="buttonAddQuestion">
       <div class="col-md-10">
         <button id="addQuestion" type="button" class="btn btn-raised btn-default">Add new question buton</button>
@@ -54,7 +73,6 @@
 </div>
 {% block javascript %}
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
   <script type="text/javascript">
     //Insert Create select with question type
     var idQuestionType = 1;
 from bs4 import BeautifulSoup
 from urllib.request import urlopen
+from urllib.parse import urlparse
 import urllib.request
 def make_soup(url):
@@ -20,6 +21,8 @@ def get_images(url,slug):
         return ("Use default image",downloaded)
     images = [img for img in soup.findAll('img')]
     image_links = [each.get('src') for each in images]
+    parsed_uri = urlparse(url)
+    domain = '{uri.scheme}://{uri.netloc}/'.format(uri=parsed_uri)
     link_slug = slug
     filename = ''
     for each in image_links:
@@ -46,15 +49,25 @@ def get_images(url,slug):
                 filename = '.jpeg'
             if not booleano:
                 continue
-
-            if each[0] + each[1] == '//' or each[0] == '/':
-                each = 'http:'+each
-            if each[0:4] != 'http' and each[0:5] != 'https':
-                each = url[0:url.index('/',8)] + each
             caminho = "links/static/images/"
             try:
                 urllib.request.urlretrieve(each,"%s"%(caminho)+str(link_slug)+filename)
                 downloaded = True
             except Exception:
-                continue
+                try:
+                    aux = domain + each
+                    urllib.request.urlretrieve(aux,"%s"%(caminho)+str(link_slug)+filename)
+                    downloaded = True
+                except Exception as e:
+                    try:
+                        aux2 = url[0:url.index('/',8)] + each
+                        urllib.request.urlretrieve(aux2,"%s"%(caminho)+str(link_slug)+filename)
+                        downloaded = True
+                    except Exception as e:
+                        try:
+                            aux3 = 'http:' + each
+                            urllib.request.urlretrieve(aux3,"%s"%(caminho)+str(link_slug)+filename)
+                            downloaded = True
+                        except Exception as e:
+                            continue
     return filename,downloaded
@@ -14,7 +14,7 @@
            <div class="card-block">
               <b class="card-title">{{link.name}}</b><p></p>
               <p class="card-text"> </p><p>{{link.link_description}}</p>
-              <a href="{{ link.link_url }}" class="btn btn-raised btn-primary">{% trans 'Read more' %}</a>
+              <a href="{{ link.link_url }}" class="btn btn-raised btn-primary" target="_blank">{% trans 'Read more' %}</a>
            </div>
         </article>
         <!-- .end Card -->
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-23 23:09-0300\n"
+"POT-Creation-Date: 2016-11-26 00:29-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -217,7 +217,7 @@ msgstr &quot;Início&quot;
 msgid "Manage Users"
 msgstr "Gerenciar Usuários"
-#: .\templates\users\profile.html:16 .\views.py:75
+#: .\templates\users\profile.html:16 .\views.py:80
 msgid "Add User"
 msgstr "Adicionar usuário"
@@ -313,28 +313,30 @@ msgstr &quot;CPF&quot;
 msgid "Birth date:"
 msgstr "Data de nascimento:"
-#: .\views.py:70 .\views.py:103
+#: .\views.py:75 .\views.py:108
 #, fuzzy
 #| msgid "User"
 msgid "User "
-msgstr "Usuário"
+msgstr "Usuário "
+
+#: .\views.py:75
+msgid " created successfully!"
+msgstr " criado com sucesso!"
+
+#: .\views.py:108
+msgid " updated successfully!"
+msgstr " editado com sucesso!"
-#: .\views.py:120 .\views.py:126
+#: .\views.py:125 .\views.py:131
 #, fuzzy
 #| msgid "User edited successfully!"
 msgid "User deleted Successfully!"
-msgstr "Usuário editado com sucesso!"
+msgstr "Usuário apagado com sucesso!"
-#: .\views.py:156
+#: .\views.py:161
 msgid "Profile edited successfully!"
 msgstr "Perfil editado com sucesso!"
-#~ msgid "User created successfully!"
-#~ msgstr "Usuário criado com sucesso!"
-
-#~ msgid "User edited successfully!"
-#~ msgstr "Usuário editado com sucesso!"
-
 #~ msgid "Administrador"
 #~ msgstr "Administrador"
@@ -11,12 +11,6 @@
 {% endblock %}
-{% 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 %}
 		{% for message in messages %}
@@ -45,6 +45,11 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 		return users
+	def get_context_data (self, **kwargs):
+		context = super(UsersListView, self).get_context_data(**kwargs)
+		context['title'] = 'Manage Users | Amadeus'
+		return context
+
 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 	allowed_roles = ['system_admin']
@@ -67,12 +72,12 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 		self.object.save()
-		messages.success(self.request, _('User ')+self.object.name+(' created successfully!'))
+		messages.success(self.request, ('User ')+self.object.name+(' created successfully!'))
 		return super(Create, self).form_valid(form)
 	def get_context_data (self, **kwargs):
 		context = super(Create, self).get_context_data(**kwargs)
-		context['title'] = _("Add User")
+		context['title'] = "Add User | Amadeus"
 		return context
 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
@@ -100,10 +105,15 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 		self.object.save()
-		messages.success(self.request, _('User ')+self.object.name+(' updated successfully!'))
+		messages.success(self.request, _('User ')+self.object.name+_(' updated successfully!'))
 		return super(Update, self).form_valid(form)
+	def get_context_data (self, **kwargs):
+		context = super(Update, self).get_context_data(**kwargs)
+		context['title'] = "Update User | Amadeus"
+		return context
+
 class View(LoginRequiredMixin, generic.DetailView):
 	login_url = reverse_lazy("core:home")
@@ -114,6 +124,11 @@ class View(LoginRequiredMixin, generic.DetailView):
 	slug_field = 'username'
 	slug_url_kwarg = 'username'
+	def get_context_data (self, **kwargs):
+		context = super(View, self).get_context_data(**kwargs)
+		context['title'] = "User | Amadeus"
+		return context
+
 def delete_user(request,username):
 	user = get_object_or_404(User,username = username)
 	user.delete()
@@ -129,9 +144,18 @@ def remove_account(request,username):
 class Change_password(generic.TemplateView):
 	template_name = 'users/change_password.html'
+	def get_context_data (self, **kwargs):
+		context = super(Change_password, self).get_context_data(**kwargs)
+		context['title'] = "Change Password | Amadeus"
+		return context
+
 class Remove_account(generic.TemplateView):
 	template_name = 'users/remove_account.html'
+	def get_context_data (self, **kwargs):
+		context = super(Remove_account, self).get_context_data(**kwargs)
+		context['title'] = "Remove Account | Amadeus"
+		return context
 class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 	login_url = reverse_lazy("core:home")
@@ -145,6 +169,7 @@ class UpdateProfile(LoginRequiredMixin, generic.edit.UpdateView):
 	def get_context_data(self, **kwargs):
 		context = super(UpdateProfile, self).get_context_data(**kwargs)
+		context['title'] = 'Update Profile | Amadeus'
 		if has_role(self.request.user, 'system_admin'):
 			context['form'] = UpdateProfileFormAdmin(instance = self.object)
 		else:
@@ -179,6 +204,12 @@ class Profile(LoginRequiredMixin, generic.DetailView):
 	def get_object(self):
 		user = get_object_or_404(User, username = self.request.user.username)
 		return user
+
+	def get_context_data (self, **kwargs):
+		context = super(Profile, self).get_context_data(**kwargs)
+		context['title'] = "Profile | Amadeus"
+		return context
+
 class SearchView(LoginRequiredMixin, generic.ListView):
 	login_url = reverse_lazy("core:home")
1	from django.conf import settings	1	from django.conf import settings
2	import json	2	import json
		3	+import time
3	from functools import wraps	4	from functools import wraps
		5	+from django.shortcuts import get_object_or_404
4	from .models import Action, Resource, Action_Resource, Log, Notification	6	from .models import Action, Resource, Action_Resource, Log, Notification
5		7
6	def log_decorator(log_component = '', log_action = '', log_resource = ''):	8	def log_decorator(log_component = '', log_action = '', log_resource = ''):
	@@ -38,7 +40,6 @@ def log_decorator(log_component = '', log_action = '', log_resource = ''):		@@ -38,7 +40,6 @@ def log_decorator(log_component = '', log_action = '', log_resource = ''):
38	log = Log()	40	log = Log()
39	log.user = request.user	41	log.user = request.user
40	log.component = log_component	42	log.component = log_component
41	- #log.context = json.dumps(request.log_context)
42	log.context = request.log_context	43	log.context = request.log_context
43	log.action_resource = action_resource	44	log.action_resource = action_resource
44		45
	@@ -51,6 +52,75 @@ def log_decorator(log_component = '', log_action = '', log_resource = ''):		@@ -51,6 +52,75 @@ def log_decorator(log_component = '', log_action = '', log_resource = ''):
51	return _log_decorator	52	return _log_decorator
52		53
53		54
		55	+def log_decorator_ajax(log_component = '', log_action = '', log_resource = ''):
		56	+
		57	+ def _log_decorator_ajax(view_function):
		58	+
		59	+ def _decorator(request, args, *kwargs):
		60	+ view_action = request.GET.get("action")
		61	+
		62	+ if view_action == 'open':
		63	+ if request.user.is_authenticated:
		64	+ action = Action.objects.filter(name = log_action)
		65	+ resource = Resource.objects.filter(name = log_resource)
		66	+
		67	+ if not action:
		68	+ action = Action(name = log_action)
		69	+ action.save()
		70	+ else:
		71	+ action = action[0]
		72	+
		73	+ if not resource:
		74	+ resource = Resource(name = log_resource)
		75	+ resource.save()
		76	+ else:
		77	+ resource = resource[0]
		78	+
		79	+ action_resource = Action_Resource.objects.filter(action = action, resource = resource)
		80	+
		81	+ if not action_resource:
		82	+ action_resource = Action_Resource(action = action, resource = resource)
		83	+ action_resource.save()
		84	+ else:
		85	+ action_resource = action_resource[0]
		86	+
		87	+ log = Log()
		88	+ log.user = request.user
		89	+ log.component = log_component
		90	+ log.context = ""
		91	+ log.action_resource = action_resource
		92	+
		93	+ log.save()
		94	+
		95	+ response = view_function(request, args, *kwargs)
		96	+
		97	+ log = Log.objects.latest('id')
		98	+ log.context = request.log_context
		99	+ log.save()
		100	+ elif view_action == 'close':
		101	+ if request.user.is_authenticated:
		102	+ log = get_object_or_404(Log, id = request.GET.get('log_id'))
		103	+
		104	+ if type(log.context) == dict:
		105	+ log_context = log.context
		106	+ else:
		107	+ log_context = json.loads(log.context)
		108	+
		109	+ log_context['timestamp_end'] = str(int(time.time()))
		110	+
		111	+ log.context = log_context
		112	+
		113	+ log.save()
		114	+
		115	+ response = view_function(request, args, *kwargs)
		116	+
		117	+ return response
		118	+
		119	+ return wraps(view_function)(_decorator)
		120	+
		121	+ return _log_decorator_ajax
		122	+
		123	+
54	def notification_decorator(read = False, message = '', actor = None, users = [], not_action='', not_resource='', resource_link=''):	124	def notification_decorator(read = False, message = '', actor = None, users = [], not_action='', not_resource='', resource_link=''):
55		125
56	def _notification_decorator(view_function):	126	def _notification_decorator(view_function):
	@@ -8,7 +8,7 @@ msgid ""		@@ -8,7 +8,7 @@ msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: PACKAGE VERSION\n"	9	"Project-Id-Version: PACKAGE VERSION\n"
10	"Report-Msgid-Bugs-To: \n"	10	"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2016-11-23 23:16-0300\n"	11	+"POT-Creation-Date: 2016-11-26 12:44-0300\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
	@@ -32,3 +32,17 @@ class TimeSpentMiddleware(object):		@@ -32,3 +32,17 @@ class TimeSpentMiddleware(object):
32	log.save()	32	log.save()
33		33
34	request.session['log_id'] = None	34	request.session['log_id'] = None
		35	+
		36	+ oppened_logs = Log.objects.filter(user = request.user, context__contains={'timestamp_end': '-1'})
		37	+
		38	+ for op_log in oppened_logs:
		39	+ if type(op_log.context) == dict:
		40	+ log_context = op_log.context
		41	+ else:
		42	+ log_context = json.loads(op_log.context)
		43	+
		44	+ log_context['timestamp_end'] = str(int(time.time()))
		45	+
		46	+ op_log.context = log_context
		47	+
		48	+ op_log.save()
	@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
		1	+function openTopic(url, topic, btn) {
		2	+ var icon = btn.find('i');
		3	+ var action = '', log_id;
		4	+
		5	+ if (icon.hasClass('fa-caret-square-o-down')) {
		6	+ icon.removeClass('fa-caret-square-o-down');
		7	+ icon.addClass('fa-caret-square-o-up');
		8	+ action = 'open';
		9	+ log_id = -1;
		10	+ } else {
		11	+ icon.addClass('fa-caret-square-o-down');
		12	+ icon.removeClass('fa-caret-square-o-up');
		13	+ action = 'close';
		14	+ log_id = $(".topic_" + topic).find(".log_id").val();
		15	+ }
		16	+
		17	+ $.ajax({
		18	+ url: url,
		19	+ data: {"action": action, "log_id": log_id},
		20	+ dataType: 'json',
		21	+ success: function (data) {
		22	+ if (action == 'open') {
		23	+ $(".topic_" + topic).find(".log_id").val(data.log_id);
		24	+ }
		25	+ },
		26	+ error: function(data) {
		27	+ console.log('Error');
		28	+ }
		29	+ });
		30	+}
0	\ No newline at end of file	31	\ No newline at end of file
	@@ -26,7 +26,7 @@		@@ -26,7 +26,7 @@
26	<form id="searchform" method="get" accept-charset="utf-8">	26	<form id="searchform" method="get" accept-charset="utf-8">
27	<div class="input-group">	27	<div class="input-group">
28	<div class="form-group is-empty">	28	<div class="form-group is-empty">
29	- <input type="text" class="form-control" placeholder="Search Courses" name="q"></div>	29	+ <input type="text" class="form-control" placeholder="{% trans 'Search for Courses' %}" name="q"></div>
30	<span class="input-group-btn input-group-sm">	30	<span class="input-group-btn input-group-sm">
31	<button type="submit" class="btn btn-fab btn-fab-mini">	31	<button type="submit" class="btn btn-fab btn-fab-mini">
32	<i class="fa fa-search" aria-hidden="true"></i>	32	<i class="fa fa-search" aria-hidden="true"></i>
	@@ -33,7 +33,7 @@		@@ -33,7 +33,7 @@
33	</button>	33	</button>
34	<ul class="dropdown-menu pull-right" aria-labelledby="moreActions">	34	<ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
35	<li>	35	<li>
36	- <a href="javascript:void(0)"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>  {% trans "Replicate" %}</a>	36	+ <a href="{% url 'course:replicate_topic' topic.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>  {% trans "Replicate" %}</a>
37	</li>	37	</li>
38	<li>	38	<li>
39	<a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>  {% trans "Edit" %}</a>	39	<a href="{% url 'course:update_subject' subject.slug %}" data-toggle="modal" data-target="#editSubject"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>  {% trans "Edit" %}</a>
	@@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm):		@@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm):
25		25
26	class Meta:	26	class Meta:
27	model = Exam	27	model = Exam
28	- fields = ['name','begin_date','limit_date','students','all_students']	28	+ fields = ['name','begin_date','limit_date','students','all_students', 'begin_exam', 'end_exam']
29		29
30	widgets = {	30	widgets = {
31	'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),	31	'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2016-11-25 11:08
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+import django.utils.timezone
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('exam', '0002_auto_20161124_1217'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AddField(
	17	+ model_name='exam',
	18	+ name='begin_exam',
	19	+ field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='Begin of Exam'),
	20	+ preserve_default=False,
	21	+ ),
	22	+ migrations.AddField(
	23	+ model_name='exam',
	24	+ name='end_exam',
	25	+ field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='End of Exam'),
	26	+ preserve_default=False,
	27	+ ),
	28	+ ]
	@@ -14,7 +14,7 @@		@@ -14,7 +14,7 @@
14	<div class="card-block">	14	<div class="card-block">
15	<b class="card-title">{{link.name}}</b><p></p>	15	<b class="card-title">{{link.name}}</b><p></p>
16	<p class="card-text"> </p><p>{{link.link_description}}</p>	16	<p class="card-text"> </p><p>{{link.link_description}}</p>
17	- <a href="{{ link.link_url }}" class="btn btn-raised btn-primary">{% trans 'Read more' %}</a>	17	+ <a href="{{ link.link_url }}" class="btn btn-raised btn-primary" target="_blank">{% trans 'Read more' %}</a>
18	</div>	18	</div>
19	</article>	19	</article>
20	<!-- .end Card -->	20	<!-- .end Card -->
	@@ -11,12 +11,6 @@		@@ -11,12 +11,6 @@
11		11
12	{% endblock %}	12	{% endblock %}
13		13
14	-{% block menu %}
15	- {% if user\|has_role:'system_admin' %}
16	- <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
17	- {% endif %}
18	-{% endblock %}
19	-
20	{% block content %}	14	{% block content %}
21	{% if messages %}	15	{% if messages %}
22	{% for message in messages %}	16	{% for message in messages %}