Register user

Ailson da Cruz
2 parents afe9a157 6adb9412
Showing 32 changed files with 1835 additions and 490 deletions Show diff stats
amadeus/settings.py
app/locale/pt_BR/LC_MESSAGES/django.po
app/templates/app/index.html
app/templates/home_professor.html
app/templates/home_student.html
app/urls.py
app/views.py
core/decorators.py
core/forms.py
core/locale/pt_BR/LC_MESSAGES/django.po
core/mixins.py
core/static/css/base/amadeus.css
core/templates/base.html
core/templates/index.html
core/templates/register_user.html
core/templates/remember_password.html
core/tests.py
core/urls.py
core/views.py
courses/forms.py
-
-"""
-Django settings for amadeus project.
-
-Generated by 'django-admin startproject' using Django 1.9.7.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.9/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.9/ref/settings/
-"""
-
-import os
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-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 = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-
-    'widget_tweaks',
-    'rolepermissions',
-    'rest_framework',
-
-    'core',
-    'app',
-    'courses',
-    'users',
-]
-
-MIDDLEWARE_CLASSES = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-]
-
-ROOT_URLCONF = 'amadeus.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'amadeus.wsgi.application'
-
-
-# Database
-# https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'amadeus',
-        'USER': 'amadeus_admin',
-        'PASSWORD': 'amadeus',
-        'HOST': '127.0.0.1',
-        'PORT': '5432',
-    }
-}
-
-
-#superuser: admin pass: amadeus2358
-
-# Password validation
-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.9/topics/i18n/
-
-LANGUAGE_CODE = 'pt-br'
-
-TIME_ZONE = 'America/Recife'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.9/howto/static-files/
-
-STATIC_URL = '/static/'
-
-# Files
-MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'uploads')
-MEDIA_URL = '/uploads/'
-
-# Users
-LOGIN_REDIRECT_URL = 'app:index'
-LOGIN_URL = 'home'
-AUTH_USER_MODEL = 'users.User'
-AUTHENTICATION_BACKENDS = [
-    'django.contrib.auth.backends.ModelBackend',
-]
-ROLEPERMISSIONS_MODULE = 'amadeus.roles'
-
-
-#https://github.com/squ1b3r/Djaneiro
 \ No newline at end of file
+"""
+Django settings for amadeus project.
+
+Generated by 'django-admin startproject' using Django 1.9.7.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.9/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.9/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+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 = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+
+    'widget_tweaks',
+    'rolepermissions',
+    'rest_framework',
+
+    'core',
+    'app',
+    'courses',
+    'users',
+]
+
+MIDDLEWARE_CLASSES = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
+]
+
+ROOT_URLCONF = 'amadeus.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'amadeus.wsgi.application'
+
+
+# Database
+# https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'amadeus',
+        'USER': 'amadeus_admin',
+        'PASSWORD': 'amadeus',
+        'HOST': '127.0.0.1',
+        'PORT': '5432',
+    }
+}
+
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+#     }
+# }
+
+#superuser: admin pass: amadeus2358
+
+# Password validation
+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.9/topics/i18n/
+
+LANGUAGE_CODE = 'pt-br'
+
+TIME_ZONE = 'America/Recife'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.9/howto/static-files/
+
+STATIC_URL = '/static/'
+
+# Files
+MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'uploads')
+MEDIA_URL = '/uploads/'
+
+# Users
+LOGIN_REDIRECT_URL = 'app:index'
+LOGIN_URL = 'core:home'
+AUTH_USER_MODEL = 'users.User'
+AUTHENTICATION_BACKENDS = [
+    'django.contrib.auth.backends.ModelBackend',
+]
+ROLEPERMISSIONS_MODULE = 'amadeus.roles'
+
+LOGS_URL = 'logs/'
+#https://github.com/squ1b3r/Djaneiro
+<<<<<<< HEAD
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -128,3 +129,168 @@ msgstr &quot;Metas&quot;
  
 #~ msgid "Amadeus"
 #~ msgstr "Amadeus"
+=======
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-03 00:18-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: app/templates/app/base.html:10
+msgid "The Project"
+msgstr ""
+
+#: app/templates/app/base.html:11
+msgid "CCTE Group"
+msgstr ""
+
+#: app/templates/app/base.html:14
+msgid "Hi"
+msgstr ""
+
+#: app/templates/app/base.html:16
+#, fuzzy
+#| msgid "Profile"
+msgid "See Profile"
+msgstr "Perfil"
+
+#: app/templates/app/base.html:17
+msgid "Settings"
+msgstr "Configurações"
+
+#: app/templates/app/base.html:18
+msgid "Logout"
+msgstr "Sair"
+
+#: app/templates/app/index.html:6
+msgid "You have:"
+msgstr ""
+
+#: app/templates/app/index.html:10
+#, fuzzy
+#| msgid "Pending tasks"
+msgid "Pending Tasks"
+msgstr "Tarefas Pendentes"
+
+#: app/templates/app/index.html:14
+msgid "Users Online"
+msgstr "Usuários Online"
+
+#: app/templates/app/index.html:20
+msgid "You can:"
+msgstr ""
+
+#: app/templates/app/index.html:24 app/templates/home_professor.html:23
+msgid "Create Course"
+msgstr "Criar Curso"
+
+#: app/templates/app/index.html:29
+#, fuzzy
+#| msgid "Manage Course"
+msgid "Manage Users"
+msgstr "Gerenciar Curso"
+
+#: app/templates/app/index.html:33
+#, fuzzy
+#| msgid "Manage Course"
+msgid "Manage Courses"
+msgstr "Gerenciar Curso"
+
+#: app/templates/app/index.html:37
+msgid "Gerenciar Categorias"
+msgstr ""
+
+#: app/templates/app/index.html:45
+msgid "Your course(s):"
+msgstr ""
+
+#: app/templates/app/index.html:46
+msgid "No courses subscribed yet"
+msgstr ""
+
+#: app/templates/app/index.html:56
+msgid "Search course:"
+msgstr ""
+
+#: app/templates/app/index.html:62
+msgid "Search"
+msgstr ""
+
+#: app/templates/app/index.html:67
+msgid "Most popular keywords:"
+msgstr ""
+
+#: app/templates/home_professor.html:9 app/templates/home_student.html:9
+msgid "Home"
+msgstr "Início"
+
+#: app/templates/home_professor.html:18 app/templates/home_student.html:18
+msgid "Menu"
+msgstr "Menu"
+
+#: app/templates/home_professor.html:22
+msgid "Pending tasks"
+msgstr "Tarefas Pendentes"
+
+#: app/templates/home_professor.html:24
+msgid "Manage Course"
+msgstr "Gerenciar Curso"
+
+#: app/templates/home_professor.html:31
+msgid "Courses"
+msgstr "Cursos"
+
+#: app/templates/home_professor.html:40
+msgid "Students:"
+msgstr "Alunos"
+
+#: app/templates/home_professor.html:41
+msgid "Beginning:"
+msgstr "Começo"
+
+#: app/templates/home_professor.html:42
+msgid "End:"
+msgstr "Fim"
+
+#: app/templates/home_professor.html:48
+msgid "You didn't create any course yet."
+msgstr "Você não criou nenhum curso ainda."
+
+#: app/templates/home_professor.html:54 app/templates/home_student.html:60
+msgid "Goals"
+msgstr "Metas"
+
+#: app/templates/home_student.html:22
+msgid "Profile"
+msgstr "Perfil"
+
+#: app/templates/home_student.html:23
+msgid "My Courses"
+msgstr "Meus Cursos"
+
+#: app/templates/home_student.html:24
+msgid "Google accounts"
+msgstr "Contas do Google"
+
+#: app/templates/home_student.html:31
+msgid "Notifications"
+msgstr "Notificações"
+
+#: app/templates/home_student.html:63
+msgid "Favorites"
+msgstr "Favoritos"
+>>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012
@@ -20,20 +20,20 @@
 	<h4>{% trans 'You can:' %} </h4>
 	<div class="list-group">
 		{% if user|has_role:'professor' %}
-			<a href="{% url 'app:course:create' %}" class="list-group-item">
+			<a href="{% url 'course:create' %}" class="list-group-item">
 				{% trans 'Create Course' %}
 			</a>
 		{% endif %}
 		{% if user|has_role:'professor' %}
-			<a href="{% url 'app:users:manage' %}" class="list-group-item">
+			<a href="{% url 'users:manage' %}" class="list-group-item">
 				{% trans 'Manage Users' %}
 			</a>
 		{% endif %}
-		<a href="{% url 'app:course:manage' %}" class="list-group-item">
+		<a href="{% url 'course:manage' %}" class="list-group-item">
 			{% trans 'Manage Courses' %}
 		</a>
 		{% if user|has_role:'professor' %}
-			<a href="{% url 'app:course:manage_cat' %}" class="list-group-item">
+			<a href="{% url 'course:manage_cat' %}" class="list-group-item">
 				{% trans 'Gerenciar Categorias' %}
 			</a>
 		{% endif %}
@@ -178,4 +178,4 @@
 			</div>
 		</div>
 	</div>
-{% endblock %}
 \ No newline at end of file
+{% endblock %}
@@ -0,0 +1,56 @@
+{% extends 'base.html' %}
+
+{% load i18n %}
+
+{% block breadcrumbs %}
+	<div class="row">
+      	<div class="col-md-12">
+            <ul class="breadcrumb">
+          		<li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
+            </ul>
+      	</div>
+    </div>
+{% 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="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 %}
+    <h3>{% trans 'Courses' %}</h3>
+  	{% if courses|length > 0 %}
+  		{% for course in courses %}
+		  	<div class="panel panel-default courseHome">
+                <div class="panel-body">
+                    <p>{{ course }}</p>
+                </div>
+                <div class="panel-footer">
+                    <ul>
+                        <li>{% trans 'Students:' %} 5</li>
+                        <li>{% trans 'Beginning:' %} {{ course.init_date }}</li>
+                        <li>{% trans 'End:' %} {{ course.end_date }}</li>
+                    </ul>
+                </div>
+            </div>
+		{% endfor %}
+	{% else %}
+		<p>{% trans "You didn't create any course yet." %}</p>
+	{% endif %}
+{% endblock %}
+
+{% block rightbar %}
+	<div class="well well-lg goal">
+        {% trans 'Goals' %}
+    </div>
+{% endblock rightbar %}
@@ -0,0 +1,65 @@
+{% extends 'base.html' %}
+
+{% load i18n %}
+
+{% block breadcrumbs %}
+	<div class="row">
+      	<div class="col-md-12">
+            <ul class="breadcrumb">
+          		<li><a href="{% url 'core:home' %}">{% trans 'Home' %} {{ logged }}</a></li>
+            </ul>
+      	</div>
+    </div>
+{% 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="javascript:void(0)">{% trans 'My Courses' %}</a></li>
+              	<li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
+            </ul>
+        </div>
+    </div>
+{% endblock %}
+
+{% block content %}
+	<h3>{% trans 'Notifications' %}</h3>
+    <div class="panel panel-default">
+      	<div class="panel-body">
+        	His course has notified a new activity!
+      	</div>
+      	<div class="panel-footer">
+        	Go
+      	</div>
+    </div>
+    <div class="panel panel-default">
+      	<div class="panel-body">
+        	His teacher has notified a new material!
+      	</div>
+      	<div class="panel-footer">
+        	Go
+      	</div>
+    </div>
+    <div class="panel panel-default">
+      	<div class="panel-body">
+            You have a new guardian!
+      	</div>
+      	<div class="panel-footer">
+        	Go
+      	</div>
+    </div>
+{% endblock %}
+
+{% block rightbar %}
+	<div class="well well-lg goal">
+        {% trans 'Goals' %}
+    </div>
+    <div class="well well-lg favorites">
+      	{% trans 'Favorites' %}
+    </div>
+{% endblock rightbar %}
@@ -3,5 +3,5 @@ from django.conf.urls import url, include
 from . import views
  
 urlpatterns = [
-    url(r'^$', views.index, name='index'),
+    url(r'^$', views.AppIndex.as_view(), name='index'),
 ]
 from django.shortcuts import render
-from django.contrib.auth.decorators import login_required
+from django.views.generic import TemplateView
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.utils.decorators import decorator_from_middleware_with_args
+from django.utils.decorators import decorator_from_middleware
+from django.utils.decorators import method_decorator
+from core.mixins import LogMixin
  
 from courses.models import Course
  
-@login_required
-def index(request):
-	context = {}
+class AppIndex(LoginRequiredMixin, LogMixin, TemplateView):
+	log_action = "Acessou home"
+	template_name = "home_professor.html"
  
-	context['courses'] = Course.objects.filter(user = request.user)
+	def render_to_response(self, context, **response_kwargs):
+		context = {}
  
-	return render(request, "home_app.html", context)
 \ No newline at end of file
+		if self.request.user.type_profile == 2:
+			template = "home_student.html"
+			context['courses'] = Course.objects.filter(user = self.request.user)
+		else:
+			template = self.get_template_names()
+			context['courses'] = Course.objects.filter(user = self.request.user)
+
+		context['title'] = 'Amadeus'
+
+		return self.response_class(request = self.request, template = template, context = context, using = self.template_engine, **response_kwargs)
 \ No newline at end of file
@@ -0,0 +1,31 @@
+import os
+import datetime
+from django.conf import settings
+from functools import wraps
+
+def log_decorator(log_action = ''):
+
+	def _log_decorator(view_function):
+
+		def _decorator(request, *args, **kwargs):
+
+			response = view_function(request, *args, **kwargs)
+
+			if request.user.is_authenticated and request.POST:
+				date = datetime.datetime.now()
+
+				message = date.strftime("%d/%m/%Y %H:%M:%S") + ' - ' + request.user.username + ' - ' + log_action + '\n'
+
+				file_name = 'log_file_' + date.strftime("%d-%m-%Y") + '.txt'
+
+				log_path = os.path.join(settings.LOGS_URL, file_name)
+
+				log_file = open(log_path,'a+')
+				log_file.write(message)
+				log_file.close()
+
+			return response
+
+		return wraps(view_function)(_decorator)
+
+	return _log_decorator
 \ No newline at end of file
@@ -2,12 +2,38 @@ from django import forms
  
 from users.models import User
  
-class CreateUserForm(forms.ModelForm):
+class RegisterUserForm(forms.ModelForm):
  
     password = forms.CharField(label='Senha', widget=forms.PasswordInput)
+    password2 = forms.CharField(label = 'Confirmacao de Senha', widget = forms.PasswordInput)
+
+    MIN_LENGTH = 8
+
+    def clean_password(self):
+        password = self.cleaned_data.get('password')
+
+        # At least MIN_LENGTH long
+        if len(password) < self.MIN_LENGTH:
+            raise forms.ValidationError("A senha deve conter  no minimo %d caracteres." % self.MIN_LENGTH)
+
+        # At least one letter and one non-letter
+        first_isalpha = password[0].isalpha()
+        if all(c.isalpha() == first_isalpha for c in password):
+            raise forms.ValidationError("A senha deve conter pelo menos uma letra e pelo menos um digito ou "\
+                                        "um caractere de pontuacao.")
+
+        return password
+
+    def clean_password2(self):
+        password = self.cleaned_data.get("password")
+        password2 = self.cleaned_data.get("password2")
+
+        if password and password2 and password != password2:
+            raise forms.ValidationError('A confirmmacao de senha esta incorreta')
+        return password2
  
     def save(self, commit=True):
-        super(CreateUserForm, self).save(commit=False)
+        super(RegisterUserForm, self).save(commit=False)
         self.instance.set_password(self.cleaned_data['password'])
  
         self.instance.save()
+<<<<<<< HEAD
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -37,3 +38,68 @@ msgstr &quot;&quot;
 #: core/templates/index.html:52
 msgid "Most popular keywords:"
 msgstr ""
+=======
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-03 00:18-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: core/templates/base.html:56
+msgid "Log out"
+msgstr "Sair"
+
+#: core/templates/index.html:30
+msgid "Username"
+msgstr "Usuário"
+
+#: core/templates/index.html:36
+msgid "Password"
+msgstr "Senha"
+
+#: core/templates/index.html:44
+msgid "Remember Email"
+msgstr ""
+
+#: core/templates/index.html:53
+msgid "Guest"
+msgstr ""
+
+#: core/templates/index.html:56
+msgid "Login"
+msgstr "Entrar"
+
+#: core/templates/index.html:65
+msgid "Sign Up"
+msgstr "Cadastrar"
+
+#: core/templates/remember_password.html:18
+msgid "E-mail"
+msgstr "E-mail"
+
+#: core/templates/remember_password.html:22
+msgid "Registration"
+msgstr ""
+
+#: core/templates/remember_password.html:26
+msgid "Send"
+msgstr "Enviar"
+
+#: core/views.py:25
+msgid "E-mail or password are incorrect!"
+msgstr "O E-mail e/ou a senha estão incorretos"
+>>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012
@@ -0,0 +1,21 @@
+import os
+import datetime
+from django.conf import settings
+
+class LogMixin(object):
+	log_action = ""
+
+	def dispatch(self, request, *args, **kwargs):
+		date = datetime.datetime.now()
+
+		message = date.strftime("%d/%m/%Y %H:%M:%S") + ' - ' + request.user.username + ' - ' + self.log_action + '\n'
+
+		file_name = 'log_file_' + date.strftime("%d-%m-%Y") + '.txt'
+
+		log_path = os.path.join(settings.LOGS_URL, file_name)
+
+		log_file = open(log_path,'a+')
+		log_file.write(message)
+		log_file.close()
+
+		return super(LogMixin, self).dispatch(request, *args, **kwargs)
 \ No newline at end of file
@@ -0,0 +1,41 @@
+.navigation{
+    margin: 10% 10% 5% 5%;
+}
+.breadcrumb{
+    margin-bottom: 5px;
+}
+.courseHome{
+    text-align: center;
+}
+.courseHome ul{
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+    margin-left: 2%;
+}
+.courseHome ul li{
+    display:inline;
+    text-align: center;
+    padding: 16px;
+}
+.goal{
+    margin: 0%;
+    margin-top: 10%;
+    padding-bottom: 200px;
+}
+.favorites{
+    margin: 0%;
+    margin-top: 20%;
+    padding-bottom: 200px;
+}
+.panel-info{
+    padding-bottom: 50px;
+}
+h3{
+    text-align: center;
+}
+h5{
+    text-align: center;
+}
+
@@ -11,9 +11,15 @@
 	<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
  
-	<link href="{% static 'bootstrap-3.3.7/css/bootstrap.min.css' %}" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" type="text/css" href="{% static 'bootstrap-3.3.7/css/bootstrap.min.css' %}" />
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/bootstrap-material-design.min.css' %}">
 	<link rel="stylesheet" type="text/css" href="{% static 'material/css/ripples.min.css' %}">
+	<link rel="stylesheet" type="text/css" href="{% static 'font-awesome-4.6.3/css/font-awesome.min.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/base/header.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'css/base/amadeus.css' %}">
+    <script>
+    	$.material.init();
+    </script>
 	<!--CSS block for specific-app ones -->
 	{% block style %}
 	{% endblock %}
@@ -31,28 +37,36 @@
 </head>
 <body>
 	{% block nav %}
-		<div class="bs-component">
-	      	<div class="navbar navbar-default">
-	            <div class="container-fluid">
-	          		<div class="navbar-header">
-	                	<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-	                  		<span class="icon-bar"></span>
-	                  		<span class="icon-bar"></span>
-	                  		<span class="icon-bar"></span>
-	                	</button>
-	                	<a class="navbar-brand" href="{% url 'app:index' %}"><h3>{% trans 'Amadeus' %}</h3></a>
-	              	</div>
-	            </div>
-	      	</div>
-	    </div>
+		<div class="row">
+        	<div class="navbar navbar-default">
+            	<div class="container-fluid">
+              		<div class="navbar-header">
+                		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                  			<span class="icon-bar"></span>
+                  			<span class="icon-bar"></span>
+                  			<span class="icon-bar"></span>
+                		</button>
+                		<a class="navbar-brand" href="javascript:void(0)"><img class="logo" src="{% static 'img/topo-amadeus.png'  %}" alt="Logo"/></a>
+              		</div>
+              		<div class="navbar-collapse collapse navbar-responsive-collapse">
+                		<ul class="nav navbar-nav navbar-right notifications">
+                  			<li> <a href="#"><i class="fa fa-bell-o" aria-hidden="true"></i></a> </li>
+                  			<li> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
+                  			<li> <a href="{% url 'users:profile' %}">{{ user }}</a></li>
+                  			<li> <a href="{% url 'core:logout' %}">{% trans 'Log out' %}</a></li>
+                		</ul>
+              		</div>
+            	</div>
+        	</div>
+    	</div>
 	{% endblock %}
  
-    <div class="container-fluid">
+    <div class="container">
     	{% block breadcrumbs %}
  
     	{% endblock %}
     	<div class="row">
-    		<div class="col-md-2 col-sm-2">
+    		<div class="col-md-3 col-sm-3">
 				{% block sidebar %}
  
 				{% endblock %}
@@ -62,7 +76,7 @@
  
 				{% endblock %}
 			</div>
-			<div class="col-md-4 col-sm-4">
+			<div class="col-md-3 col-sm-3">
 				{% block rightbar %}
  
 				{% endblock rightbar %}
@@ -3,165 +3,66 @@
 {% load static i18n %}
 {% load widget_tweaks %}
  
-{% block sidebar %}
-	<form class="form-horizontal" action="" method="post">
-		{% csrf_token %}
-
-		{% for error in form.non_field_errors %}
-			<div class="alert alert-danger">
-				{{ error }}
-			</div>
-		{% endfor %}
-
-		{% for field in form %}
-			<div class="form-group {% if form.has_error %} error {% endif %}">
-				<label for="{{ field.auto_id }}" class="col-sm-2 control-label">{{ field.label }}</label>
-				<div class="col-sm-10">
-					{% render_field field class='form-control input-sm' %}
-					{% for error in field.errors %}
-						<span class="help-block">{{ error }}</span>
-					{% endfor %}
-				</div>
-			</div>
-		{% endfor %}
-		<div class="form-group">
-			<div class="col-sm-12">
-				<input type="submit" class="btn btn-sm btn-success pull-right" value="{% trans 'Entrar' %}" />
-			</div>
-		</div>
-	</form>
+{% block nav %}
 {% endblock %}
  
 {% block content %}
-	<div class="row">
-		<div class="col-sm-12">
-			<form class="form-horizontal" method="post">
-				<div class="col-sm-10">
-					<div class="form-group">
-						<label for="search_keyword" class="control-label col-sm-3">{% trans 'Search course:' %} </label>
-						<div class="col-sm-9">
-							<input type="text" class="form-control input-sm" id="search_keyword" />
-						</div>
-					</div>
-				</div>
-				<button type="submit" class="btn btn-sm btn-success">{% trans 'Search' %}</button>
-			</form>
+	<div class="row logo-row">
+        <div class="col-lg-offset-2 col-lg-9">
+            <img src="..." class="img-responsive center-block " alt="logo amadeus">
+        </div>
+    </div>
  
-			<hr />
+	<div class="row ">
+        <div class="col-lg-9 col-lg-offset-2">
+            <div class="card">
+							{% if message %}
+							<div class="alert alert-danger">
+								{{message}}
+							</div>
  
-			<h5>{% trans 'Most popular keywords:' %}</h5>
-			<div class="well">
-				<center>
-					<ul class="cloud">
-					    <li>
-					    	<a href="">
-					    		teste amadeus prospb
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		programação fácil
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		intermediário
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		amadeus
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		palavra02
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		programação para iniciantes
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		django
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		aluno teste
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		curso0101
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		kjsdnksa
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		palavra01
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		programming
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		python
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		curso
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		mvc
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		programação web
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		ionic
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		framework
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		web
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		android
-				    		</a>
-			    		</li>
-			    		<li>
-					    	<a href="">
-					    		programação
-				    		</a>
-			    		</li>
-					</ul>
-				</center>
-			</div>
-		</div>
-	</div>
+							{% endif %}
+                <div class="card-content">
+                    <div class="card-body">
+						<form id="form-login" class="form-group" method="post" action="">
+							{% csrf_token %}
+							<div class="form-group is-empty">
+								<label for="inputEmail" class="col-md-4 control-label"> {% trans 'Username' %}</label>
+                                <div class="col-md-8">
+                                    <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username">
+                                </div>
+							</div>
+                            <div class="form-group is-empty">
+                                <label for="inputPassword" class="col-md-4 control-label"> {% trans 'Password' %}</label>
+                                <div class="col-md-8">
+                                    <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
+                                </div>
+                            </div>
+                            <div class="col-md-offset-2 col-md-10">
+                                <div class="checkbox">
+                                    <label>
+                                        <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
+                                    </label>
+                                </div>
+                            </div>
+						</form>
+                    </div>
  
-{% endblock %}
 \ No newline at end of file
+                    <footer class="card-footer" style="display: -webkit-box;">
+                        <div class="col-md-6">
+                            <button type="button" class="btn btn-flat" formaction="#" style="position: initial;">{% trans 'Guest' %}</button>
+                        </div>
+                        <div class="col-md-6">
+                            <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
+                        </div>
+                    </footer>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-offset-2 col-lg-9">
+            <a class="btn btn-raised btn-primary btn-lg btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
+        </div>
+    </div>
+{% endblock%}
@@ -17,12 +17,9 @@
 {% endblock %}
  
 {% block content %}
-	{% if form.has_error %}
-		<div class="alert alert-info alert-dismissible" role="alert">
-			<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true">&times;</span>
-			</button>
-			<p>{{ form.error }}</p>
+	{% if message %}
+		<div class="alert alert-danger">
+			{{message}}
 		</div>
 	{% endif %}
  
@@ -30,10 +27,10 @@
 		{% csrf_token %}
 		{% for field in form %}
 			<div class="form-group{% if form.has_error %} has-error {% endif %}">
-				<label for="{{ field.auto_id }}">{{ field.label }}</label>
+				<label for="{{ field.auto_id }}" class="clearfix">{{ field.label }}</label>
 				{% render_field field class='form-control input-sm' %}
 				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
-				{% if field.errors.length > 0 %}
+				{% if field.errors %}
 					<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>
@@ -0,0 +1,40 @@
+{% extends "index.html" %}
+{% load i18n %}
+{% block content %}
+
+	<div class="row logo-row">
+	<div class="col-lg-offset-2 col-lg-9">
+		<img src="..." class="img-responsive center-block " alt="logo amadeus">
+	</div>
+	</div>
+	<div class="row ">
+	<div class="col-lg-9 col-lg-offset-2">
+		<div class="card">
+		    <div class="card-content">
+
+		        <div class="card-body">
+		        	<form class="form-group ">
+								<div class="form-group">
+		        			<label for="inputEmail" class="control-label label-static"> {% trans 'E-mail' %}</label>
+		        			<input type="email" class="form-control" id="inputEmail" placeholder="Email">
+		        		</div>
+								<div class="form-group">
+			        		<label for="inputRegistration" class=" control-label"> {% trans 'Registration' %} </label>
+			        		<input type="text" class="form-control" id="inputRegistration" placeholder="Registration">
+								</div>
+						<div class="col-lg-offset-4 col-lg-4">
+							<button class="btn btn-raised btn-primary btn-lg btn-block">{% trans 'Send' %}</button>
+
+						</div>
+
+		        	</form>
+		        </div>
+
+		    </div>
+
+
+		</div>
+	</div>
+	</div>
+
+{% endblock content %}
-from django.test import TestCase
+from django.test import TestCase, Client
+from django.core.urlresolvers import reverse
+from rolepermissions.shortcuts import assign_role
+from users.models import User
+# from django.core import mail
  
-# Create your tests here.
+class LoginTestCase(TestCase):
+
+    def setUp(self):
+        self.client = Client()
+
+        self.user = User.objects.create_user(
+            username = 'test', 
+            email = 'testing@amadeus.com', 
+            is_staff = True, 
+            is_active = True, 
+            password = 'testing'
+        )
+        assign_role(self.user, 'system_admin')
+
+        self.url = reverse('core:home')
+
+    def test_ok(self):
+        response = self.client.get(self.url)
+        self.assertEquals(response.status_code, 200)
+        self.assertTemplateUsed(response, 'index.html')
+        data = {'username': 'test', 'password': 'testing'}
+        response = self.client.post(self.url, data)
+        self.assertRedirects(response, reverse("app:index"))
+
+    # def test_not_ok(self):
+    #     response = self.client.get(self.url)
+    #     self.assertEquals(response.status_code, 200)
+    #     self.assertTemplateUsed(response, 'index.html')
+    #     data = {'username': 'test', 'password': 'senhaerrada'}
+    #     response = self.client.post(self.url, data)
+    #     self.assertTrue('message' in response.context)
+    #     self.assertEquals(response.context['message'], "Email ou senha incorretos!")
-from django.conf.urls import url, include
-from django.contrib.auth import views as auth_views
-
-from . import views
-
-urlpatterns = [
-    url(r'^$', views.index, name='index'),
-    url(r'^register/$', views.CreateUser.as_view(), name='register'),
-	url(r'^login/$', auth_views.login, {'template_name': 'index.html'}, name='home'),
-    url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'),
-
-]
+from django.conf.urls import url, include
+from django.contrib.auth import views as auth_views
+
+from . import views
+
+
+urlpatterns = [
+	url(r'^login/$', views.login, name='home'),
+	url(r'^register/$', views.RegisterUser.as_view(), name='register'),
+	url(r'^remember_password/$', views.remember_password, name='remember_password'),
+    url(r'^logout/$', auth_views.logout, {'next_page': 'core:home'}, name='logout'),
+]
-from rolepermissions.shortcuts import assign_role
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse_lazy
-from django.contrib import messages
-from django.shortcuts import render
-from django.views.generic import CreateView
-from django.http import HttpResponse
-from  .forms import CreateUserForm
-from users.models import User
-
-def index(request):
-	context = {
-		'subscribed_courses': 'testando'
-	}
-	return render(request, "index.html", context)
-
-class CreateUser(CreateView):
-	model = User
-	form_class = CreateUserForm
-	template_name = 'register_user.html'
-
-	success_url = reverse_lazy('core:home')
-
-	def form_valid(self, form):
-		form.save()
-		assign_role(form.instance, 'student')
-
-		messages.success(self.request, _('User successfully registered!'))
-		
-		return super(CreateUser, self).form_valid(form)
-
-def create_account(request):
-	return render(request, "create_account.html")
-
-def lembrar_senha(request):
-	return render(request, "lembrar_senha.html")
+from rolepermissions.shortcuts import assign_role
+from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import reverse_lazy, reverse
+from django.contrib.auth import authenticate, login as login_user
+from .decorators import log_decorator
+from django.contrib import messages
+from django.shortcuts import render, redirect
+from django.views.generic import CreateView
+from django.http import HttpResponse
+from  .forms import RegisterUserForm
+from users.models import User
+
+def index(request):
+	context = {
+		'subscribed_courses': 'testando'
+	}
+	return render(request, "index.html", context)
+
+class RegisterUser(CreateView):
+	model = User
+	form_class = RegisterUserForm
+	template_name = 'register_user.html'
+
+	success_url = reverse_lazy('core:home')
+
+	def form_valid(self, form):
+		form.save()
+		assign_role(form.instance, 'student')
+
+		messages.success(self.request, _('User successfully registered!'))
+		
+		return super(RegisterUser, self).form_valid(form)
+
+def create_account(request):
+	return render(request, "create_account.html")
+
+
+def remember_password(request):
+	return render(request, "remember_password.html")
+
+@log_decorator('Entrou no sistema')
+def login(request):
+	context = {}
+	if request.POST:
+		username = request.POST['username']
+		password = request.POST['password']
+		user = authenticate(username=username, password=password)
+		if user is not None:
+			login_user(request, user)
+			return redirect(reverse("app:index"))
+		else:
+			context["message"] = _("E-mail or password are incorrect!")
+	return render(request,"index.html",context)
+
+
+# class LoginClass(LoginView):
+# 	template_name='index.html'
+#
+# 	def get_context_data(self, **kwargs):
+# 		context = super(LoginClass,self).get_context_data(**kwargs)
+# 		print ("deu certo")
+# 		return context
@@ -45,6 +45,9 @@ class CourseForm(forms.ModelForm):
 			'image': _('Representative image of the course'),
 			'category': _('Category which the course belongs'),
 		}
+		widgets = {
+			'categoy': forms.Select(),
+		}
  
 class ModuleForm(forms.ModelForm):
  
+<<<<<<< HEAD
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -455,3 +456,462 @@ msgstr &quot;&quot;
 #: courses/views.py:291
 msgid "Module deleted successfully!"
 msgstr ""
+=======
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-03 00:18-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: courses/forms.py:11 courses/forms.py:25 courses/forms.py:55
+#: courses/models.py:7 courses/models.py:20 courses/models.py:44
+#: courses/templates/category/index.html:38
+msgid "Name"
+msgstr "Nome"
+
+#: courses/forms.py:14
+msgid "Category name"
+msgstr ""
+
+#: courses/forms.py:26
+msgid "Objectives"
+msgstr ""
+
+#: courses/forms.py:27 courses/models.py:23
+msgid "Content"
+msgstr ""
+
+#: courses/forms.py:28
+msgid "Number of studets maximum"
+msgstr "Número máximo de estudantes"
+
+#: courses/forms.py:29
+msgid "Course registration start date"
+msgstr ""
+
+#: courses/forms.py:30
+msgid "Course registration end date"
+msgstr ""
+
+#: courses/forms.py:31
+msgid "Course start date"
+msgstr "Data de inicio do Curso"
+
+#: courses/forms.py:32
+msgid "Course end date"
+msgstr "Data de termino do curso"
+
+#: courses/forms.py:33 courses/models.py:30
+msgid "Image"
+msgstr "Imagem"
+
+#: courses/forms.py:34 courses/models.py:12 courses/models.py:31
+msgid "Category"
+msgstr "Categoria"
+
+#: courses/forms.py:37
+msgid "Course name"
+msgstr ""
+
+#: courses/forms.py:38
+msgid "Course objective"
+msgstr ""
+
+#: courses/forms.py:39
+msgid "Course modules"
+msgstr ""
+
+#: courses/forms.py:40
+msgid "Max number of students that a class can have"
+msgstr ""
+
+#: courses/forms.py:41
+msgid "Date that starts the registration period of the course (dd/mm/yyyy)"
+msgstr ""
+
+#: courses/forms.py:42
+msgid "Date that ends the registration period of the course (dd/mm/yyyy)"
+msgstr ""
+
+#: courses/forms.py:43
+msgid "Date that the course starts (dd/mm/yyyy)"
+msgstr ""
+
+#: courses/forms.py:44
+msgid "Date that the course ends (dd/mm/yyyy)"
+msgstr ""
+
+#: courses/forms.py:45
+msgid "Representative image of the course"
+msgstr ""
+
+#: courses/forms.py:46
+msgid "Category which the course belongs"
+msgstr ""
+
+#: courses/forms.py:56 courses/models.py:46
+msgid "Description"
+msgstr ""
+
+#: courses/forms.py:57
+msgid "Is it visible?"
+msgstr ""
+
+#: courses/forms.py:60
+msgid "Module's name"
+msgstr ""
+
+#: courses/forms.py:61
+msgid "Modules's description"
+msgstr ""
+
+#: courses/forms.py:62
+msgid "Is the module visible?"
+msgstr ""
+
+#: courses/models.py:8 courses/models.py:21 courses/models.py:45
+#: courses/templates/category/index.html:39
+msgid "Slug"
+msgstr ""
+
+#: courses/models.py:9 courses/models.py:25 courses/models.py:48
+msgid "Creation Date"
+msgstr ""
+
+#: courses/models.py:13 courses/templates/category/create.html:16
+#: courses/templates/category/delete.html:15
+#: courses/templates/category/index.html:15
+#: courses/templates/category/update.html:16
+#: courses/templates/category/view.html:15
+msgid "Categories"
+msgstr "Categorias"
+
+#: courses/models.py:22
+msgid "Objectivies"
+msgstr ""
+
+#: courses/models.py:24
+msgid "Maximum Students"
+msgstr ""
+
+#: courses/models.py:26
+msgid "Register Date (Begin)"
+msgstr ""
+
+#: courses/models.py:27
+msgid "Register Date (End)"
+msgstr ""
+
+#: courses/models.py:28
+msgid "Begin of Course Date"
+msgstr ""
+
+#: courses/models.py:29
+msgid "End of Course Date"
+msgstr ""
+
+#: courses/models.py:32
+msgid "User"
+msgstr ""
+
+#: courses/models.py:36 courses/models.py:49
+msgid "Course"
+msgstr "Curso"
+
+#: courses/models.py:37 courses/templates/course/create.html:16
+#: courses/templates/course/delete.html:15
+#: courses/templates/course/filtered.html:8
+#: courses/templates/course/index.html:15
+#: courses/templates/course/update.html:16
+#: courses/templates/course/view.html:15
+#: courses/templates/module/create.html:17
+#: courses/templates/module/delete.html:16
+#: courses/templates/module/index.html:16
+#: courses/templates/module/update.html:17
+msgid "Courses"
+msgstr "Cursos"
+
+#: courses/models.py:47 courses/templates/module/index.html:107
+msgid "Visible"
+msgstr "Visível"
+
+#: courses/models.py:53
+msgid "Module"
+msgstr "Modulo"
+
+#: courses/models.py:54 courses/templates/module/index.html:92
+msgid "Modules"
+msgstr "Modulos"
+
+#: courses/templates/category/create.html:8
+#: courses/templates/category/delete.html:7
+#: courses/templates/category/index.html:7
+#: courses/templates/category/update.html:8
+#: courses/templates/category/view.html:7
+#: courses/templates/course/create.html:8
+#: courses/templates/course/delete.html:7 courses/templates/course/index.html:7
+#: courses/templates/course/update.html:8 courses/templates/course/view.html:7
+#: courses/templates/module/create.html:8
+#: courses/templates/module/delete.html:7 courses/templates/module/index.html:7
+#: courses/templates/module/update.html:8
+msgid "Home"
+msgstr "Inicio"
+
+#: courses/templates/category/create.html:9
+#: courses/templates/category/delete.html:18
+#: courses/templates/category/index.html:18
+#: courses/templates/category/view.html:18
+msgid "Create Category"
+msgstr "Criar Categoria"
+
+#: courses/templates/category/create.html:26
+#: courses/templates/category/update.html:26
+#: courses/templates/course/create.html:26
+#: courses/templates/course/update.html:32
+#: courses/templates/module/create.html:52
+#: courses/templates/module/update.html:52
+msgid "All fields are required"
+msgstr "Todos os campos são obrigatótios"
+
+#: courses/templates/category/create.html:51
+#: courses/templates/category/update.html:51
+#: courses/templates/course/create.html:51
+#: courses/templates/course/update.html:57
+#: courses/templates/module/create.html:77
+#: courses/templates/module/update.html:77
+msgid "Save"
+msgstr "Salvar"
+
+#: courses/templates/category/delete.html:8
+#: courses/templates/category/index.html:8
+msgid "Manage Categories"
+msgstr ""
+
+#: courses/templates/category/delete.html:26
+msgid "Are you sure you want to delete the category"
+msgstr ""
+
+#: courses/templates/category/delete.html:27
+#: courses/templates/course/delete.html:28
+#: courses/templates/module/delete.html:50
+msgid "Yes"
+msgstr "Sim"
+
+#: courses/templates/category/delete.html:28
+#: courses/templates/course/delete.html:29
+#: courses/templates/module/delete.html:51
+msgid "No"
+msgstr "Não"
+
+#: courses/templates/category/index.html:40
+msgid "Actions"
+msgstr ""
+
+#: courses/templates/category/index.html:59
+msgid "No categories found"
+msgstr ""
+
+#: courses/templates/category/update.html:9
+#: courses/templates/category/view.html:21
+msgid "Edit Category"
+msgstr ""
+
+#: courses/templates/category/view.html:24
+msgid "Remove Category"
+msgstr ""
+
+#: courses/templates/category/view.html:32
+msgid "Name:"
+msgstr ""
+
+#: courses/templates/category/view.html:33
+msgid "Slug:"
+msgstr ""
+
+#: courses/templates/course/create.html:9
+#: courses/templates/course/delete.html:18
+#: courses/templates/course/filtered.html:11
+#: courses/templates/course/index.html:18 courses/templates/course/view.html:25
+#: courses/templates/module/create.html:20
+#: courses/templates/module/delete.html:19
+#: courses/templates/module/index.html:26
+#: courses/templates/module/update.html:20
+msgid "Create Course"
+msgstr ""
+
+#: courses/templates/course/delete.html:27
+msgid "Are you sure you want to delete the couse"
+msgstr ""
+
+#: courses/templates/course/filtered.html:19
+#: courses/templates/course/index.html:26
+msgid "Categories:"
+msgstr ""
+
+#: courses/templates/course/index.html:8
+msgid "Manage Courses"
+msgstr ""
+
+#: courses/templates/course/index.html:80
+msgid "students tops"
+msgstr ""
+
+#: courses/templates/course/index.html:86
+msgid "Subscribe Period:"
+msgstr ""
+
+#: courses/templates/course/index.html:88 courses/templates/course/view.html:59
+#: courses/templates/module/index.html:83
+msgid "Period:"
+msgstr ""
+
+#: courses/templates/course/index.html:104
+msgid "No courses found"
+msgstr ""
+
+#: courses/templates/course/update.html:9 courses/templates/course/view.html:28
+#: courses/templates/module/create.html:26
+#: courses/templates/module/delete.html:25
+#: courses/templates/module/index.html:29
+#: courses/templates/module/update.html:26
+msgid "Edit Course"
+msgstr ""
+
+#: courses/templates/course/update.html:19
+#: courses/templates/course/view.html:21
+#: courses/templates/module/create.html:29
+#: courses/templates/module/delete.html:9
+#: courses/templates/module/delete.html:28
+#: courses/templates/module/index.html:9 courses/templates/module/index.html:22
+#: courses/templates/module/update.html:29
+msgid "Manage Modules"
+msgstr ""
+
+#: courses/templates/course/update.html:22
+#: courses/templates/course/view.html:31
+#: courses/templates/module/create.html:32
+#: courses/templates/module/delete.html:31
+#: courses/templates/module/index.html:32
+#: courses/templates/module/update.html:32
+msgid "Participants"
+msgstr ""
+
+#: courses/templates/course/view.html:18
+#: courses/templates/module/create.html:23
+#: courses/templates/module/delete.html:22
+#: courses/templates/module/index.html:19
+#: courses/templates/module/update.html:23
+msgid "Course Info"
+msgstr ""
+
+#: courses/templates/course/view.html:34
+#: courses/templates/module/create.html:35
+#: courses/templates/module/delete.html:34
+#: courses/templates/module/index.html:35
+#: courses/templates/module/update.html:35
+msgid "Course avaliations"
+msgstr ""
+
+#: courses/templates/course/view.html:37
+#: courses/templates/module/create.html:38
+#: courses/templates/module/delete.html:37
+#: courses/templates/module/index.html:38
+#: courses/templates/module/update.html:38
+msgid "Duplicate Course"
+msgstr ""
+
+#: courses/templates/course/view.html:40
+#: courses/templates/module/create.html:41
+#: courses/templates/module/delete.html:40
+#: courses/templates/module/index.html:41
+#: courses/templates/module/update.html:41
+msgid "Delete Course"
+msgstr ""
+
+#: courses/templates/course/view.html:56
+msgid "Subscribes:"
+msgstr ""
+
+#: courses/templates/course/view.html:66
+msgid "Objectives:"
+msgstr ""
+
+#: courses/templates/course/view.html:69
+msgid "Work Plan:"
+msgstr ""
+
+#: courses/templates/module/create.html:10
+#: courses/templates/module/index.html:70
+msgid "Create Module"
+msgstr ""
+
+#: courses/templates/module/delete.html:49
+msgid "Are you sure you want to delete the module"
+msgstr ""
+
+#: courses/templates/module/index.html:80
+msgid "students maximum"
+msgstr ""
+
+#: courses/templates/module/index.html:109
+msgid "Invisible"
+msgstr ""
+
+#: courses/templates/module/index.html:125
+msgid "No modules found"
+msgstr ""
+
+#: courses/templates/module/update.html:10
+msgid "Edit Module"
+msgstr ""
+
+#: courses/views.py:48
+msgid "Course created successfully!"
+msgstr ""
+
+#: courses/views.py:70
+msgid "Course edited successfully!"
+msgstr ""
+
+#: courses/views.py:92
+msgid "Course deleted successfully!"
+msgstr ""
+
+#: courses/views.py:142
+msgid "Category created successfully!"
+msgstr ""
+
+#: courses/views.py:164
+msgid "Category edited successfully!"
+msgstr ""
+
+#: courses/views.py:185
+msgid "Category deleted successfully!"
+msgstr ""
+
+#: courses/views.py:237
+msgid "Module created successfully!"
+msgstr ""
+
+#: courses/views.py:268
+msgid "Module edited successfully!"
+msgstr ""
+
+#: courses/views.py:291
+msgid "Module deleted successfully!"
+msgstr ""
+>>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012
@@ -0,0 +1,23 @@
+{% 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 %}
@@ -12,52 +12,76 @@ class CourseViewTestCase(TestCase):
  
 	def setUp(self):
 		self.client = Client()
-    	
-		self.user = User.objects.create_user(username = 'test', email = 'testing@amadeus.com', is_staff = True, is_active = True, password = 'testing')
-		assign_role(self.user, 'system_admin')
-
-		category = Category(name = 'Categoria Teste', slug = 'categoria_teste')
-		category.save()
  
-		course = Course(name = 'Curso Teste', slug = 'curso_teste', max_students = 50, init_register_date = '2016-08-26', end_register_date = '2016-10-01', init_date = '2016-10-05', end_date = '2017-10-05', category = category)
-		course.save()
+		self.user = User.objects.create_user(
+			username = 'test', 
+			email = 'testing@amadeus.com', 
+			is_staff = True, 
+			is_active = True, 
+			password = 'testing'
+		)
+		assign_role(self.user, 'system_admin')
  
-		self.category = category
-		self.course = course
+		self.category = Category(
+			name = 'Categoria Teste', 
+			slug = 'categoria_teste'
+		)
+		self.category.save()
+
+		self.course = Course(
+			name = 'Curso Teste', 
+			slug = 'curso_teste', 
+			max_students = 50, 
+			init_register_date = '2016-08-26', 
+			end_register_date = '2016-10-01', 
+			init_date = '2016-10-05', 
+			end_date = '2017-10-05', 
+			category = self.category
+		)
+		self.course.save()
  
 	def test_index(self):
 		self.client.login(username='test', password='testing')
-		
-		url = reverse('app:course:manage')
-		
+
+		url = reverse('course:manage')
+
 		response = self.client.get(url)
  
 		self.assertEquals(response.status_code, 200)
 		self.assertTemplateUsed(response, 'course/index.html')
  
 	def test_index_not_logged(self):
-		url = reverse('app:course:manage')
-		
+		url = reverse('course:manage')
+
 		response = self.client.get(url, follow = True)
  
-		self.assertRedirects(response, '%s?next=%s' % (reverse('home'), url), 302, 200)
+		self.assertRedirects(response, '%s?next=%s' % (reverse('core:home'), url), 302, 200)
  
 	def test_create(self):
 		self.client.login(username='test', password='testing')
  
-		url = reverse('app:course:create')
-
-		response = self.client.get(url)
-
-		self.assertEquals(response.status_code, 200)
+		url = reverse('course:create')
+		data = {
+			"name": 'Curso Teste', 
+			"slug":'curso_teste', 
+			"max_students": 50, 
+			"init_register_date": '2016-08-26', 
+			"end_register_date": '2016-10-01', 
+			"init_date":'2016-10-05', 
+			"end_date":'2017-10-05', 
+			"category": self.category
+		}
+
+		response = self.client.post(url, data, format='json')
+		self.assertEqual(response.status_code, 200)
 		self.assertTemplateUsed(response, 'course/create.html')
  
 	def test_create_not_logged(self):
-		url = reverse('app:course:create')
-		
+		url = reverse('course:create')
+
 		response = self.client.get(url, follow = True)
  
-		self.assertRedirects(response, '%s?next=%s' % (reverse('home'), url), 302, 200)
+		self.assertRedirects(response, '%s?next=%s' % (reverse('core:home'), url), 302, 200)
  
 	def test_create_no_permission(self):
 		self.user = User.objects.create_user(username = 'student', email = 'student@amadeus.com', type_profile = 2, is_staff = False, is_active = True, password = 'testing')
@@ -66,8 +90,8 @@ class CourseViewTestCase(TestCase):
  
 		self.client.login(username='student', password='testing')
  
-		url = reverse('app:course:create')
-		
+		url = reverse('course:create')
+
 		response = self.client.get(url)
  
 		self.assertEquals(response.status_code, 403)
@@ -76,7 +100,7 @@ class CourseViewTestCase(TestCase):
 	def test_update(self):
 		self.client.login(username = 'test', password = 'testing')
  
-		url = reverse('app:course:update', kwargs = {'slug': self.course.slug})
+		url = reverse('course:update', kwargs = {'slug': self.course.slug})
  
 		response = self.client.get(url)
  
@@ -84,11 +108,11 @@ class CourseViewTestCase(TestCase):
 		self.assertTemplateUsed(response, 'course/update.html')
  
 	def test_update_not_logged(self):
-		url = reverse('app:course:update', kwargs = {'slug': self.course.slug})
-		
+		url = reverse('course:update', kwargs = {'slug': self.course.slug})
+
 		response = self.client.get(url, follow = True)
  
-		self.assertRedirects(response, '%s?next=%s' % (reverse('home'), url), 302, 200)
+		self.assertRedirects(response, '%s?next=%s' % (reverse('core:home'), url), 302, 200)
  
 	def test_update_no_permission(self):
 		self.user = User.objects.create_user(username = 'student', email = 'student@amadeus.com', type_profile = 2, is_staff = False, is_active = True, password = 'testing')
@@ -97,8 +121,8 @@ class CourseViewTestCase(TestCase):
  
 		self.client.login(username='student', password='testing')
  
-		url = reverse('app:course:update', kwargs = {'slug': self.course.slug})
-		
+		url = reverse('course:update', kwargs = {'slug': self.course.slug})
+
 		response = self.client.get(url)
  
 		self.assertEquals(response.status_code, 403)
@@ -106,7 +130,7 @@ class CourseViewTestCase(TestCase):
 	def test_view(self):
 		self.client.login(username = 'test', password = 'testing')
  
-		url = reverse('app:course:view', kwargs = {'slug': self.course.slug})
+		url = reverse('course:view', kwargs = {'slug': self.course.slug})
  
 		response = self.client.get(url)
  
@@ -114,8 +138,8 @@ class CourseViewTestCase(TestCase):
 		self.assertTemplateUsed(response, 'course/view.html')
  
 	def test_update_not_logged(self):
-		url = reverse('app:course:view', kwargs = {'slug': self.course.slug})
-		
+		url = reverse('course:view', kwargs = {'slug': self.course.slug})
+
 		response = self.client.get(url, follow = True)
  
-		self.assertRedirects(response, '%s?next=%s' % (reverse('home'), url), 302, 200)
 \ No newline at end of file
+		self.assertRedirects(response, '%s?next=%s' % (reverse('core:home'), url), 302, 200)
@@ -15,7 +15,7 @@ from .models import Course, Module, Category
  
 class IndexView(LoginRequiredMixin, generic.ListView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	queryset = Course.objects.all()
 	template_name = 'course/index.html'
@@ -31,33 +31,33 @@ class IndexView(LoginRequiredMixin, generic.ListView):
 class CreateView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'course/create.html'
 	form_class = CourseForm
-	success_url = reverse_lazy('app:course:manage')
-
+	success_url = reverse_lazy('course:manage')
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
 		self.object.slug = slugify(self.object.name)
+		print('Fooooiiii!!')
 		self.object.save()
  
 		return super(CreateView, self).form_valid(form)
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Course created successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'course/update.html'
 	model = Course
 	form_class = CourseForm
-	success_url = reverse_lazy('app:course:manage')
+	success_url = reverse_lazy('course:manage')
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
@@ -68,12 +68,12 @@ class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Course edited successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class View(LoginRequiredMixin, generic.DetailView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Course
 	context_object_name = 'course'
@@ -82,20 +82,20 @@ class View(LoginRequiredMixin, generic.DetailView):
 class DeleteView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Course
 	template_name = 'course/delete.html'
-	success_url = reverse_lazy('app:course:manage')
+	success_url = reverse_lazy('course:manage')
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Course deleted successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class FilteredView(LoginRequiredMixin, generic.ListView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'course/filtered.html'
 	context_object_name = 'courses'
@@ -115,7 +115,7 @@ class FilteredView(LoginRequiredMixin, generic.ListView):
  
 class IndexCatView(LoginRequiredMixin, generic.ListView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	queryset = Category.objects.all()
 	template_name = 'category/index.html'
@@ -125,11 +125,11 @@ class IndexCatView(LoginRequiredMixin, generic.ListView):
 class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'category/create.html'
 	form_class = CategoryForm
-	success_url = reverse_lazy('app:course:manage_cat')
+	success_url = reverse_lazy('course:manage_cat')
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
@@ -140,18 +140,18 @@ class CreateCatView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Category created successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'category/update.html'
 	model = Category
 	form_class = CategoryForm
-	success_url = reverse_lazy('app:course:manage_cat')
+	success_url = reverse_lazy('course:manage_cat')
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
@@ -162,33 +162,33 @@ class UpdateCatView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Category edited successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class ViewCat(LoginRequiredMixin, generic.DetailView):
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Category
 	template_name = 'category/view.html'
 	context_object_name = 'category'
  
 class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
-	
+
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Category
 	template_name = 'category/delete.html'
-	success_url = reverse_lazy('app:course:manage_cat')
+	success_url = reverse_lazy('course:manage_cat')
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Category deleted successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class ModulesView(LoginRequiredMixin, generic.ListView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'module/index.html'
 	context_object_name = 'modules'
@@ -208,13 +208,13 @@ class ModulesView(LoginRequiredMixin, generic.ListView):
 class CreateModView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'module/create.html'
 	form_class = ModuleForm
  
 	def get_success_url(self):
-		return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug})
+		return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug})
  
 	def get_context_data(self, **kwargs):
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
@@ -235,20 +235,20 @@ class CreateModView(LoginRequiredMixin, HasRoleMixin, generic.edit.CreateView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Module created successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class UpdateModView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'module/update.html'
 	model = Module
 	form_class = ModuleForm
  
 	def get_success_url(self):
-		return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug})
+		return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug})
  
 	def get_context_data(self, **kwargs):
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug_course'))
@@ -266,19 +266,19 @@ class UpdateModView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Module edited successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class DeleteModView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
  
 	allowed_roles = ['professor', 'system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = Module
 	template_name = 'module/delete.html'
  
 	def get_success_url(self):
-		return reverse_lazy('app:course:manage_mods', kwargs={'slug' : self.object.course.slug})
+		return reverse_lazy('course:manage_mods', kwargs={'slug' : self.object.course.slug})
  
 	def get_context_data(self, **kwargs):
 		course = get_object_or_404(Course, slug = self.kwargs.get('slug_course'))
@@ -289,5 +289,5 @@ class DeleteModView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
  
 	def render_to_response(self, context, **response_kwargs):
 		messages.success(self.request, _('Module deleted successfully!'))
-    
+
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
@@ -0,0 +1,6 @@
+02/09/2016 23:34:45 - zambom - Entrou no sistema
+02/09/2016 23:34:45 - zambom - Acessou home
+02/09/2016 23:55:55 - jailson - Entrou no sistema
+02/09/2016 23:55:55 - jailson - Acessou home
+02/09/2016 23:56:05 - jailson - Acessou home
+02/09/2016 23:56:25 - jailson - Acessou home
@@ -0,0 +1,52 @@
+05/09/2016 02:41:58 - matheuslins - Entrou no sistema
+05/09/2016 02:41:58 - matheuslins - Acessou home
+05/09/2016 02:43:00 - matheuslins - Acessou home
+05/09/2016 02:43:14 - matheuslins - Entrou no sistema
+05/09/2016 02:43:14 - matheuslins - Acessou home
+05/09/2016 02:43:18 - matheuslins - Acessou home
+05/09/2016 02:44:46 - matheuslins - Acessou home
+05/09/2016 02:45:32 - matheuslins - Entrou no sistema
+05/09/2016 02:45:32 - matheuslins - Acessou home
+05/09/2016 03:09:26 - matheuslins - Acessou home
+05/09/2016 03:09:29 - matheuslins - Acessou home
+05/09/2016 03:11:13 - matheuslins - Acessou home
+05/09/2016 04:07:13 - test - Entrou no sistema
+05/09/2016 04:07:13 - test - Acessou home
+05/09/2016 04:08:48 - test - Entrou no sistema
+05/09/2016 04:08:48 - test - Acessou home
+05/09/2016 04:09:55 - test - Entrou no sistema
+05/09/2016 04:09:55 - test - Acessou home
+05/09/2016 04:12:37 - test - Entrou no sistema
+05/09/2016 04:12:37 - test - Acessou home
+05/09/2016 04:13:00 - test - Entrou no sistema
+05/09/2016 04:13:00 - test - Acessou home
+05/09/2016 04:13:23 - test - Entrou no sistema
+05/09/2016 04:13:23 - test - Acessou home
+05/09/2016 04:15:02 - test - Entrou no sistema
+05/09/2016 04:15:02 - test - Acessou home
+05/09/2016 04:20:19 - matheuslins - Entrou no sistema
+05/09/2016 04:20:19 - matheuslins - Acessou home
+05/09/2016 04:21:11 - matheuslins - Acessou home
+05/09/2016 04:36:46 - test - Entrou no sistema
+05/09/2016 04:36:46 - test - Acessou home
+05/09/2016 04:37:23 - test - Entrou no sistema
+05/09/2016 04:37:23 - test - Acessou home
+05/09/2016 04:37:41 - test - Entrou no sistema
+05/09/2016 04:37:41 - test - Acessou home
+05/09/2016 04:38:01 - test - Entrou no sistema
+05/09/2016 04:38:01 - test - Acessou home
+05/09/2016 04:38:23 - test - Entrou no sistema
+05/09/2016 04:38:23 - test - Acessou home
+05/09/2016 04:38:39 - test - Entrou no sistema
+05/09/2016 04:38:39 - test - Acessou home
+05/09/2016 04:39:39 - test - Entrou no sistema
+05/09/2016 04:39:39 - test - Acessou home
+05/09/2016 04:40:28 - matheuslins - Acessou home
+05/09/2016 13:14:23 - ailson - Acessou home
+05/09/2016 13:17:28 - ailson - Entrou no sistema
+05/09/2016 13:17:38 - ailson - Entrou no sistema
+05/09/2016 13:18:20 - ailson - Entrou no sistema
+05/09/2016 13:18:57 - ailson - Entrou no sistema
+05/09/2016 15:04:41 - ailson - Acessou home
+05/09/2016 15:16:39 - ailson - Acessou home
+05/09/2016 15:41:52 - ailson - Acessou home
@@ -25,4 +25,10 @@ class UserForm(forms.ModelForm):
  
 	class Meta:
 		model = User
-		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
 \ No newline at end of file
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'type_profile', 'cpf', 'phone', 'image', 'is_staff', 'is_active']
+
+class EditUserForm(forms.ModelForm):
+
+	class Meta:
+		model = User
+		fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image']
 \ No newline at end of file
+<<<<<<< HEAD
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
@@ -227,3 +228,235 @@ msgstr &quot;&quot;
 #: users/views.py:125
 msgid "Profile edited successfully!"
 msgstr ""
+=======
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-09-03 00:18-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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: users/forms.py:10
+msgid "Password"
+msgstr "Senha"
+
+#: users/models.py:10
+msgid "Login"
+msgstr "Entrar"
+
+#: users/models.py:13
+msgid ""
+"Type a valid username. This fields should only contain letters, numbers and "
+"the characteres: @/./+/-/_ ."
+msgstr ""
+
+#: users/models.py:16
+msgid ""
+"A short name that will be used to identify you in the platform and to access "
+"it"
+msgstr ""
+
+#: users/models.py:17
+msgid "Mail"
+msgstr ""
+
+#: users/models.py:18
+msgid "Name"
+msgstr "Nome"
+
+#: users/models.py:19
+msgid "City"
+msgstr "Cidade"
+
+#: users/models.py:20
+msgid "State"
+msgstr "Estado"
+
+#: users/models.py:21
+msgid "Gender"
+msgstr "Genero"
+
+#: users/models.py:21
+msgid "Male"
+msgstr "Masculino"
+
+#: users/models.py:21
+msgid "Female"
+msgstr "Feminino"
+
+#: users/models.py:22
+msgid "Image"
+msgstr "Imagem"
+
+#: users/models.py:23
+msgid "Birth Date"
+msgstr ""
+
+#: users/models.py:24
+msgid "Phone"
+msgstr "Telefone"
+
+#: users/models.py:25 users/templates/users/profile.html:42
+msgid "Cpf"
+msgstr ""
+
+#: users/models.py:26
+msgid "Type"
+msgstr ""
+
+#: users/models.py:26
+msgid "Professor"
+msgstr ""
+
+#: users/models.py:26
+msgid "Student"
+msgstr "Aluno"
+
+#: users/models.py:27
+msgid "Create Date"
+msgstr ""
+
+#: users/models.py:28
+msgid "Administrador"
+msgstr ""
+
+#: users/models.py:29
+msgid "Active"
+msgstr ""
+
+#: users/models.py:37
+msgid "User"
+msgstr "Usuário"
+
+#: users/models.py:38
+msgid "Users"
+msgstr "Usuários"
+
+#: users/templates/list_users.html:8 users/templates/list_users.html:15
+#: users/templates/users/index.html:8
+msgid "Manage Users"
+msgstr "Gerenciar Usuários"
+
+#: users/templates/list_users.html:14 users/templates/users/create.html:8
+#: users/templates/users/edit_profile.html:8 users/templates/users/index.html:7
+#: users/templates/users/profile.html:8 users/templates/users/update.html:8
+#: users/templates/users/view.html:7
+msgid "Home"
+msgstr "Início"
+
+#: users/templates/list_users.html:23
+msgid "Add user"
+msgstr "Adicionar usuário"
+
+#: users/templates/list_users.html:24
+msgid "Send email"
+msgstr "Enviar e-mail"
+
+#: users/templates/users/create.html:9
+msgid "New User"
+msgstr ""
+
+#: users/templates/users/create.html:16 users/templates/users/index.html:15
+#: users/templates/users/update.html:16 users/templates/users/view.html:15
+msgid "System Users"
+msgstr ""
+
+#: users/templates/users/create.html:19 users/templates/users/index.html:18
+#: users/templates/users/update.html:19 users/templates/users/view.html:18
+msgid "New Account"
+msgstr ""
+
+#: users/templates/users/create.html:22 users/templates/users/index.html:21
+#: users/templates/users/update.html:22 users/templates/users/view.html:27
+msgid "Send Mail"
+msgstr ""
+
+#: users/templates/users/create.html:32
+#: users/templates/users/edit_profile.html:29
+#: users/templates/users/update.html:32
+msgid "All fields are required"
+msgstr ""
+
+#: users/templates/users/create.html:57
+#: users/templates/users/edit_profile.html:64
+#: users/templates/users/update.html:57
+msgid "Save"
+msgstr ""
+
+#: users/templates/users/edit_profile.html:9
+#: users/templates/users/edit_profile.html:19
+#: users/templates/users/profile.html:19
+msgid "Edit Profile"
+msgstr ""
+
+#: users/templates/users/edit_profile.html:16
+#: users/templates/users/profile.html:9 users/templates/users/profile.html:16
+msgid "Profile"
+msgstr ""
+
+#: users/templates/users/index.html:56 users/templates/users/profile.html:32
+#: users/templates/users/view.html:39
+msgid "Administrator"
+msgstr ""
+
+#: users/templates/users/index.html:74
+msgid "No users found"
+msgstr ""
+
+#: users/templates/users/profile.html:36 users/templates/users/view.html:43
+msgid "Mail:"
+msgstr ""
+
+#: users/templates/users/profile.html:39 users/templates/users/view.html:46
+msgid "Phone:"
+msgstr ""
+
+#: users/templates/users/profile.html:45
+msgid "Birth date"
+msgstr ""
+
+#: users/templates/users/update.html:9
+msgid "Edit user"
+msgstr ""
+
+#: users/templates/users/view.html:21
+msgid "View User Account"
+msgstr ""
+
+#: users/templates/users/view.html:24
+msgid "Edit User Account"
+msgstr ""
+
+#: users/templates/users/view.html:49
+msgid "Cpf:"
+msgstr ""
+
+#: users/templates/users/view.html:52
+msgid "Birth date:"
+msgstr ""
+
+#: users/views.py:47
+msgid "User created successfully!"
+msgstr ""
+
+#: users/views.py:76
+msgid "User edited successfully!"
+msgstr ""
+
+#: users/views.py:125
+msgid "Profile edited successfully!"
+msgstr ""
+>>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012
-from django.test import TestCase
+from django.test import TestCase, Client
+from rolepermissions.shortcuts import assign_role
+from django.core.urlresolvers import reverse
+from .models import *
+from .forms import *
  
 # Create your tests here.
+class TestCreateUser(TestCase):
+
+	def setUp(self):
+		self.client = Client()
+
+		self.user = User.objects.create_user(
+			username = 'test', 
+			email = 'testing@amadeus.com', 
+			is_staff = True, 
+			is_active = True, 
+			password = 'testing'
+		)
+		assign_role(self.user, 'system_admin')
+
+	def test_edit_users(self):
+		self.client.login(username='test', password='testing')
+
+		url = reverse('users:edit_profile', kwargs={'pk': self.user.id})        
+		data = EditUserForm(self.data['email']).data
+		data['email'] = "testing2@amadeus.com"
+
+		response = self.client.put(url, data, format='json')        
+		self.assertEqual(response.status_code, 200)        
+		self.assertEqual(response.data['email'], data['email'])
+
+
+
+
+
@@ -8,5 +8,5 @@ urlpatterns = [
 	url(r'^usuario/editar/(?P<username>[\w_-]+)/$', views.Update.as_view(), name='update'),
 	url(r'^usuario/dados/(?P<username>[\w_-]+)/$', views.View.as_view(), name='view'),
 	url(r'^perfil/$', views.Profile.as_view(), name='profile'),
-	url(r'^perfil/editar/$', views.EditProfile.as_view(), name='edit_profile'),
-]
 \ No newline at end of file
+	url(r'^perfil/editar/(?P<username>[\w_-]+)/$', views.EditProfile.as_view(), name='edit_profile'),
+]
@@ -10,9 +10,9 @@ from .models import User
 from .forms import UserForm, ProfileForm
  
 class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
-	
+
 	allowed_roles = ['system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'list_users.html'
 	context_object_name = 'users'
@@ -25,12 +25,12 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
  
 	allowed_roles = ['system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'users/create.html'
 	form_class = UserForm
 	context_object_name = 'acc'
-	success_url = reverse_lazy('app:user:manage')
+	success_url = reverse_lazy('user:manage')
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
@@ -51,7 +51,7 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
  
 	allowed_roles = ['system_admin']
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'users/update.html'
 	slug_field = 'username'
@@ -59,11 +59,11 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 	context_object_name = 'acc'
 	model = User
 	form_class = UserForm
-	success_url = reverse_lazy('app:users:manage')
+	success_url = reverse_lazy('users:manage')
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
-		
+
 		if self.object.type_profile == 2:
 			assign_role(self.object, 'student')
 		elif self.object.type_profile == 1:
@@ -72,14 +72,14 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 			assign_role(self.object, 'system_admin')
  
 		self.object.save()
-		
+
 		messages.success(self.request, _('User edited successfully!'))
  
 		return super(Update, self).form_valid(form)
-	
+
 class View(LoginRequiredMixin, generic.DetailView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	model = User
 	context_object_name = 'acc'
@@ -89,18 +89,18 @@ class View(LoginRequiredMixin, generic.DetailView):
  
 class Profile(LoginRequiredMixin, generic.DetailView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	context_object_name = 'user'
 	template_name = 'users/profile.html'
  
 	def get_object(self):
 		user = get_object_or_404(User, username = self.request.user.username)
-		return user	
+		return user
  
 class EditProfile(LoginRequiredMixin, generic.UpdateView):
  
-	login_url = '/'
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'users/edit_profile.html'
 	form_class = UserForm
@@ -112,7 +112,7 @@ class EditProfile(LoginRequiredMixin, generic.UpdateView):
  
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
-		
+
 		if self.object.type_profile == 2:
 			assign_role(self.object, 'student')
 		elif self.object.type_profile == 1:
@@ -124,4 +124,4 @@ class EditProfile(LoginRequiredMixin, generic.UpdateView):
  
 		messages.success(self.request, _('Profile edited successfully!'))
  
-		return super(EditProfile, self).form_valid(form)
 \ No newline at end of file
+		return super(EditProfile, self).form_valid(form)
1		-
2		-"""
3		-Django settings for amadeus project.
4		-
5		-Generated by 'django-admin startproject' using Django 1.9.7.
6		-
7		-For more information on this file, see
8		-https://docs.djangoproject.com/en/1.9/topics/settings/
9		-
10		-For the full list of settings and their values, see
11		-https://docs.djangoproject.com/en/1.9/ref/settings/
12		-"""
13		-
14		-import os
15		-
16		-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
17		-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
18		-
19		-
20		-# Quick-start development settings - unsuitable for production
21		-# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
22		-
23		-# SECURITY WARNING: keep the secret key used in production secret!
24		-SECRET_KEY = '$=8)c!5)iha85a&8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4'
25		-
26		-# SECURITY WARNING: don't run with debug turned on in production!
27		-DEBUG = True
28		-
29		-ALLOWED_HOSTS = []
30		-
31		-
32		-# Application definition
33		-
34		-INSTALLED_APPS = [
35		- 'django.contrib.admin',
36		- 'django.contrib.auth',
37		- 'django.contrib.contenttypes',
38		- 'django.contrib.sessions',
39		- 'django.contrib.messages',
40		- 'django.contrib.staticfiles',
41		-
42		- 'widget_tweaks',
43		- 'rolepermissions',
44		- 'rest_framework',
45		-
46		- 'core',
47		- 'app',
48		- 'courses',
49		- 'users',
50		-]
51		-
52		-MIDDLEWARE_CLASSES = [
53		- 'django.middleware.security.SecurityMiddleware',
54		- 'django.contrib.sessions.middleware.SessionMiddleware',
55		- 'django.middleware.common.CommonMiddleware',
56		- 'django.middleware.csrf.CsrfViewMiddleware',
57		- 'django.contrib.auth.middleware.AuthenticationMiddleware',
58		- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
59		- 'django.contrib.messages.middleware.MessageMiddleware',
60		- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
61		- 'django.middleware.locale.LocaleMiddleware',
62		-]
63		-
64		-ROOT_URLCONF = 'amadeus.urls'
65		-
66		-TEMPLATES = [
67		- {
68		- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
69		- 'DIRS': [],
70		- 'APP_DIRS': True,
71		- 'OPTIONS': {
72		- 'context_processors': [
73		- 'django.template.context_processors.debug',
74		- 'django.template.context_processors.request',
75		- 'django.contrib.auth.context_processors.auth',
76		- 'django.contrib.messages.context_processors.messages',
77		- ],
78		- },
79		- },
80		-]
81		-
82		-WSGI_APPLICATION = 'amadeus.wsgi.application'
83		-
84		-
85		-# Database
86		-# https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
87		-
88		-DATABASES = {
89		- 'default': {
90		- 'ENGINE': 'django.db.backends.postgresql',
91		- 'NAME': 'amadeus',
92		- 'USER': 'amadeus_admin',
93		- 'PASSWORD': 'amadeus',
94		- 'HOST': '127.0.0.1',
95		- 'PORT': '5432',
96		- }
97		-}
98		-
99		-
100		-#superuser: admin pass: amadeus2358
101		-
102		-# Password validation
103		-# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
104		-
105		-AUTH_PASSWORD_VALIDATORS = [
106		- {
107		- 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
108		- },
109		- {
110		- 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
111		- },
112		- {
113		- 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
114		- },
115		- {
116		- 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
117		- },
118		-]
119		-
120		-
121		-# Internationalization
122		-# https://docs.djangoproject.com/en/1.9/topics/i18n/
123		-
124		-LANGUAGE_CODE = 'pt-br'
125		-
126		-TIME_ZONE = 'America/Recife'
127		-
128		-USE_I18N = True
129		-
130		-USE_L10N = True
131		-
132		-USE_TZ = True
133		-
134		-
135		-# Static files (CSS, JavaScript, Images)
136		-# https://docs.djangoproject.com/en/1.9/howto/static-files/
137		-
138		-STATIC_URL = '/static/'
139		-
140		-# Files
141		-MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'uploads')
142		-MEDIA_URL = '/uploads/'
143		-
144		-# Users
145		-LOGIN_REDIRECT_URL = 'app:index'
146		-LOGIN_URL = 'home'
147		-AUTH_USER_MODEL = 'users.User'
148		-AUTHENTICATION_BACKENDS = [
149		- 'django.contrib.auth.backends.ModelBackend',
150		-]
151		-ROLEPERMISSIONS_MODULE = 'amadeus.roles'
152		-
153		-
154		-#https://github.com/squ1b3r/Djaneiro
155	1	\ No newline at end of file
	2	+"""
	3	+Django settings for amadeus project.
	4	+
	5	+Generated by 'django-admin startproject' using Django 1.9.7.
	6	+
	7	+For more information on this file, see
	8	+https://docs.djangoproject.com/en/1.9/topics/settings/
	9	+
	10	+For the full list of settings and their values, see
	11	+https://docs.djangoproject.com/en/1.9/ref/settings/
	12	+"""
	13	+
	14	+import os
	15	+
	16	+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
	17	+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
	18	+
	19	+
	20	+# Quick-start development settings - unsuitable for production
	21	+# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/
	22	+
	23	+# SECURITY WARNING: keep the secret key used in production secret!
	24	+SECRET_KEY = '$=8)c!5)iha85a&8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4'
	25	+
	26	+# SECURITY WARNING: don't run with debug turned on in production!
	27	+DEBUG = True
	28	+
	29	+ALLOWED_HOSTS = []
	30	+
	31	+
	32	+# Application definition
	33	+
	34	+INSTALLED_APPS = [
	35	+ 'django.contrib.admin',
	36	+ 'django.contrib.auth',
	37	+ 'django.contrib.contenttypes',
	38	+ 'django.contrib.sessions',
	39	+ 'django.contrib.messages',
	40	+ 'django.contrib.staticfiles',
	41	+
	42	+ 'widget_tweaks',
	43	+ 'rolepermissions',
	44	+ 'rest_framework',
	45	+
	46	+ 'core',
	47	+ 'app',
	48	+ 'courses',
	49	+ 'users',
	50	+]
	51	+
	52	+MIDDLEWARE_CLASSES = [
	53	+ 'django.middleware.security.SecurityMiddleware',
	54	+ 'django.contrib.sessions.middleware.SessionMiddleware',
	55	+ 'django.middleware.common.CommonMiddleware',
	56	+ 'django.middleware.csrf.CsrfViewMiddleware',
	57	+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
	58	+ 'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
	59	+ 'django.contrib.messages.middleware.MessageMiddleware',
	60	+ 'django.middleware.clickjacking.XFrameOptionsMiddleware',
	61	+ 'django.middleware.locale.LocaleMiddleware',
	62	+]
	63	+
	64	+ROOT_URLCONF = 'amadeus.urls'
	65	+
	66	+TEMPLATES = [
	67	+ {
	68	+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
	69	+ 'DIRS': [],
	70	+ 'APP_DIRS': True,
	71	+ 'OPTIONS': {
	72	+ 'context_processors': [
	73	+ 'django.template.context_processors.debug',
	74	+ 'django.template.context_processors.request',
	75	+ 'django.contrib.auth.context_processors.auth',
	76	+ 'django.contrib.messages.context_processors.messages',
	77	+ ],
	78	+ },
	79	+ },
	80	+]
	81	+
	82	+WSGI_APPLICATION = 'amadeus.wsgi.application'
	83	+
	84	+
	85	+# Database
	86	+# https://docs.djangopr/*oject.com/en/1.9/ref/settings/#databases
	87	+
	88	+DATABASES = {
	89	+ 'default': {
	90	+ 'ENGINE': 'django.db.backends.postgresql',
	91	+ 'NAME': 'amadeus',
	92	+ 'USER': 'amadeus_admin',
	93	+ 'PASSWORD': 'amadeus',
	94	+ 'HOST': '127.0.0.1',
	95	+ 'PORT': '5432',
	96	+ }
	97	+}
	98	+
	99	+# DATABASES = {
	100	+# 'default': {
	101	+# 'ENGINE': 'django.db.backends.sqlite3',
	102	+# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
	103	+# }
	104	+# }
	105	+
	106	+#superuser: admin pass: amadeus2358
	107	+
	108	+# Password validation
	109	+# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
	110	+
	111	+AUTH_PASSWORD_VALIDATORS = [
	112	+ {
	113	+ 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
	114	+ },
	115	+ {
	116	+ 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
	117	+ },
	118	+ {
	119	+ 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
	120	+ },
	121	+ {
	122	+ 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
	123	+ },
	124	+]
	125	+
	126	+
	127	+# Internationalization
	128	+# https://docs.djangoproject.com/en/1.9/topics/i18n/
	129	+
	130	+LANGUAGE_CODE = 'pt-br'
	131	+
	132	+TIME_ZONE = 'America/Recife'
	133	+
	134	+USE_I18N = True
	135	+
	136	+USE_L10N = True
	137	+
	138	+USE_TZ = True
	139	+
	140	+
	141	+# Static files (CSS, JavaScript, Images)
	142	+# https://docs.djangoproject.com/en/1.9/howto/static-files/
	143	+
	144	+STATIC_URL = '/static/'
	145	+
	146	+# Files
	147	+MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'uploads')
	148	+MEDIA_URL = '/uploads/'
	149	+
	150	+# Users
	151	+LOGIN_REDIRECT_URL = 'app:index'
	152	+LOGIN_URL = 'core:home'
	153	+AUTH_USER_MODEL = 'users.User'
	154	+AUTHENTICATION_BACKENDS = [
	155	+ 'django.contrib.auth.backends.ModelBackend',
	156	+]
	157	+ROLEPERMISSIONS_MODULE = 'amadeus.roles'
	158	+
	159	+LOGS_URL = 'logs/'
	160	+#https://github.com/squ1b3r/Djaneiro
...	...
	1	+<<<<<<< HEAD
1	2	# SOME DESCRIPTIVE TITLE.
2	3	# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3	4	# This file is distributed under the same license as the PACKAGE package.
...	...	@@ -128,3 +129,168 @@ msgstr "Metas"
128	129
129	130	#~ msgid "Amadeus"
130	131	#~ msgstr "Amadeus"
	132	+=======
	133	+# SOME DESCRIPTIVE TITLE.
	134	+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
	135	+# This file is distributed under the same license as the PACKAGE package.
	136	+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
	137	+#
	138	+#, fuzzy
	139	+msgid ""
	140	+msgstr ""
	141	+"Project-Id-Version: PACKAGE VERSION\n"
	142	+"Report-Msgid-Bugs-To: \n"
	143	+"POT-Creation-Date: 2016-09-03 00:18-0300\n"
	144	+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
	145	+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
	146	+"Language-Team: LANGUAGE <LL@li.org>\n"
	147	+"Language: \n"
	148	+"MIME-Version: 1.0\n"
	149	+"Content-Type: text/plain; charset=UTF-8\n"
	150	+"Content-Transfer-Encoding: 8bit\n"
	151	+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
	152	+
	153	+#: app/templates/app/base.html:10
	154	+msgid "The Project"
	155	+msgstr ""
	156	+
	157	+#: app/templates/app/base.html:11
	158	+msgid "CCTE Group"
	159	+msgstr ""
	160	+
	161	+#: app/templates/app/base.html:14
	162	+msgid "Hi"
	163	+msgstr ""
	164	+
	165	+#: app/templates/app/base.html:16
	166	+#, fuzzy
	167	+#\| msgid "Profile"
	168	+msgid "See Profile"
	169	+msgstr "Perfil"
	170	+
	171	+#: app/templates/app/base.html:17
	172	+msgid "Settings"
	173	+msgstr "Configurações"
	174	+
	175	+#: app/templates/app/base.html:18
	176	+msgid "Logout"
	177	+msgstr "Sair"
	178	+
	179	+#: app/templates/app/index.html:6
	180	+msgid "You have:"
	181	+msgstr ""
	182	+
	183	+#: app/templates/app/index.html:10
	184	+#, fuzzy
	185	+#\| msgid "Pending tasks"
	186	+msgid "Pending Tasks"
	187	+msgstr "Tarefas Pendentes"
	188	+
	189	+#: app/templates/app/index.html:14
	190	+msgid "Users Online"
	191	+msgstr "Usuários Online"
	192	+
	193	+#: app/templates/app/index.html:20
	194	+msgid "You can:"
	195	+msgstr ""
	196	+
	197	+#: app/templates/app/index.html:24 app/templates/home_professor.html:23
	198	+msgid "Create Course"
	199	+msgstr "Criar Curso"
	200	+
	201	+#: app/templates/app/index.html:29
	202	+#, fuzzy
	203	+#\| msgid "Manage Course"
	204	+msgid "Manage Users"
	205	+msgstr "Gerenciar Curso"
	206	+
	207	+#: app/templates/app/index.html:33
	208	+#, fuzzy
	209	+#\| msgid "Manage Course"
	210	+msgid "Manage Courses"
	211	+msgstr "Gerenciar Curso"
	212	+
	213	+#: app/templates/app/index.html:37
	214	+msgid "Gerenciar Categorias"
	215	+msgstr ""
	216	+
	217	+#: app/templates/app/index.html:45
	218	+msgid "Your course(s):"
	219	+msgstr ""
	220	+
	221	+#: app/templates/app/index.html:46
	222	+msgid "No courses subscribed yet"
	223	+msgstr ""
	224	+
	225	+#: app/templates/app/index.html:56
	226	+msgid "Search course:"
	227	+msgstr ""
	228	+
	229	+#: app/templates/app/index.html:62
	230	+msgid "Search"
	231	+msgstr ""
	232	+
	233	+#: app/templates/app/index.html:67
	234	+msgid "Most popular keywords:"
	235	+msgstr ""
	236	+
	237	+#: app/templates/home_professor.html:9 app/templates/home_student.html:9
	238	+msgid "Home"
	239	+msgstr "Início"
	240	+
	241	+#: app/templates/home_professor.html:18 app/templates/home_student.html:18
	242	+msgid "Menu"
	243	+msgstr "Menu"
	244	+
	245	+#: app/templates/home_professor.html:22
	246	+msgid "Pending tasks"
	247	+msgstr "Tarefas Pendentes"
	248	+
	249	+#: app/templates/home_professor.html:24
	250	+msgid "Manage Course"
	251	+msgstr "Gerenciar Curso"
	252	+
	253	+#: app/templates/home_professor.html:31
	254	+msgid "Courses"
	255	+msgstr "Cursos"
	256	+
	257	+#: app/templates/home_professor.html:40
	258	+msgid "Students:"
	259	+msgstr "Alunos"
	260	+
	261	+#: app/templates/home_professor.html:41
	262	+msgid "Beginning:"
	263	+msgstr "Começo"
	264	+
	265	+#: app/templates/home_professor.html:42
	266	+msgid "End:"
	267	+msgstr "Fim"
	268	+
	269	+#: app/templates/home_professor.html:48
	270	+msgid "You didn't create any course yet."
	271	+msgstr "Você não criou nenhum curso ainda."
	272	+
	273	+#: app/templates/home_professor.html:54 app/templates/home_student.html:60
	274	+msgid "Goals"
	275	+msgstr "Metas"
	276	+
	277	+#: app/templates/home_student.html:22
	278	+msgid "Profile"
	279	+msgstr "Perfil"
	280	+
	281	+#: app/templates/home_student.html:23
	282	+msgid "My Courses"
	283	+msgstr "Meus Cursos"
	284	+
	285	+#: app/templates/home_student.html:24
	286	+msgid "Google accounts"
	287	+msgstr "Contas do Google"
	288	+
	289	+#: app/templates/home_student.html:31
	290	+msgid "Notifications"
	291	+msgstr "Notificações"
	292	+
	293	+#: app/templates/home_student.html:63
	294	+msgid "Favorites"
	295	+msgstr "Favoritos"
	296	+>>>>>>> 6adb9412b8b77c81ef8cc33a0b481885dadb6012
...	...
...	...	@@ -20,20 +20,20 @@
20	20	<h4>{% trans 'You can:' %} </h4>
21	21	<div class="list-group">
22	22	{% if user\|has_role:'professor' %}
23		- <a href="{% url 'app:course:create' %}" class="list-group-item">
	23	+ <a href="{% url 'course:create' %}" class="list-group-item">
24	24	{% trans 'Create Course' %}
25	25	</a>
26	26	{% endif %}
27	27	{% if user\|has_role:'professor' %}
28		- <a href="{% url 'app:users:manage' %}" class="list-group-item">
	28	+ <a href="{% url 'users:manage' %}" class="list-group-item">
29	29	{% trans 'Manage Users' %}
30	30	</a>
31	31	{% endif %}
32		- <a href="{% url 'app:course:manage' %}" class="list-group-item">
	32	+ <a href="{% url 'course:manage' %}" class="list-group-item">
33	33	{% trans 'Manage Courses' %}
34	34	</a>
35	35	{% if user\|has_role:'professor' %}
36		- <a href="{% url 'app:course:manage_cat' %}" class="list-group-item">
	36	+ <a href="{% url 'course:manage_cat' %}" class="list-group-item">
37	37	{% trans 'Gerenciar Categorias' %}
38	38	</a>
39	39	{% endif %}
...	...	@@ -178,4 +178,4 @@
178	178	</div>
179	179	</div>
180	180	</div>
181		-{% endblock %}
182	181	\ No newline at end of file
	182	+{% endblock %}
...	...
...	...	@@ -0,0 +1,56 @@
	1	+{% extends 'base.html' %}
	2	+
	3	+{% load i18n %}
	4	+
	5	+{% block breadcrumbs %}
	6	+ <div class="row">
	7	+ <div class="col-md-12">
	8	+ <ul class="breadcrumb">
	9	+ <li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
	10	+ </ul>
	11	+ </div>
	12	+ </div>
	13	+{% endblock %}
	14	+
	15	+{% block sidebar %}
	16	+ <div class="panel panel-primary navigation">
	17	+ <div class="panel-heading">
	18	+ <h5>{% trans 'Menu' %}</h5>
	19	+ </div>
	20	+ <div class="panel-body">
	21	+ <ul class="nav nav-pills nav-stacked">
	22	+ <li><a href="javascript:void(0)">{% trans 'Pending tasks' %}</a></li>
	23	+ <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li>
	24	+ <li><a href="{% url 'course:manage' %}">{% trans 'Manage Course' %}</a></li>
	25	+ </ul>
	26	+ </div>
	27	+ </div>
	28	+{% endblock %}
	29	+
	30	+{% block content %}
	31	+ <h3>{% trans 'Courses' %}</h3>
	32	+ {% if courses\|length > 0 %}
	33	+ {% for course in courses %}
	34	+ <div class="panel panel-default courseHome">
	35	+ <div class="panel-body">
	36	+ <p>{{ course }}</p>
	37	+ </div>
	38	+ <div class="panel-footer">
	39	+ <ul>
	40	+ <li>{% trans 'Students:' %} 5</li>
	41	+ <li>{% trans 'Beginning:' %} {{ course.init_date }}</li>
	42	+ <li>{% trans 'End:' %} {{ course.end_date }}</li>
	43	+ </ul>
	44	+ </div>
	45	+ </div>
	46	+ {% endfor %}
	47	+ {% else %}
	48	+ <p>{% trans "You didn't create any course yet." %}</p>
	49	+ {% endif %}
	50	+{% endblock %}
	51	+
	52	+{% block rightbar %}
	53	+ <div class="well well-lg goal">
	54	+ {% trans 'Goals' %}
	55	+ </div>
	56	+{% endblock rightbar %}
...	...
...	...	@@ -0,0 +1,65 @@
	1	+{% extends 'base.html' %}
	2	+
	3	+{% load i18n %}
	4	+
	5	+{% block breadcrumbs %}
	6	+ <div class="row">
	7	+ <div class="col-md-12">
	8	+ <ul class="breadcrumb">
	9	+ <li><a href="{% url 'core:home' %}">{% trans 'Home' %} {{ logged }}</a></li>
	10	+ </ul>
	11	+ </div>
	12	+ </div>
	13	+{% endblock %}
	14	+
	15	+{% block sidebar %}
	16	+ <div class="panel panel-primary navigation">
	17	+ <div class="panel-heading">
	18	+ <h5>{% trans 'Menu' %}</h5>
	19	+ </div>
	20	+ <div class="panel-body">
	21	+ <ul class="nav nav-pills nav-stacked">
	22	+ <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
	23	+ <li><a href="javascript:void(0)">{% trans 'My Courses' %}</a></li>
	24	+ <li><a href="javascript:void(0)">{% trans 'Google accounts' %}</a></li>
	25	+ </ul>
	26	+ </div>
	27	+ </div>
	28	+{% endblock %}
	29	+
	30	+{% block content %}
	31	+ <h3>{% trans 'Notifications' %}</h3>
	32	+ <div class="panel panel-default">
	33	+ <div class="panel-body">
	34	+ His course has notified a new activity!
	35	+ </div>
	36	+ <div class="panel-footer">
	37	+ Go
	38	+ </div>
	39	+ </div>
	40	+ <div class="panel panel-default">
	41	+ <div class="panel-body">
	42	+ His teacher has notified a new material!
	43	+ </div>
	44	+ <div class="panel-footer">
	45	+ Go
	46	+ </div>
	47	+ </div>
	48	+ <div class="panel panel-default">
	49	+ <div class="panel-body">
	50	+ You have a new guardian!
	51	+ </div>
	52	+ <div class="panel-footer">
	53	+ Go
	54	+ </div>
	55	+ </div>
	56	+{% endblock %}
	57	+
	58	+{% block rightbar %}
	59	+ <div class="well well-lg goal">
	60	+ {% trans 'Goals' %}
	61	+ </div>
	62	+ <div class="well well-lg favorites">
	63	+ {% trans 'Favorites' %}
	64	+ </div>
	65	+{% endblock rightbar %}
...	...
...	...	@@ -3,5 +3,5 @@ from django.conf.urls import url, include
3	3	from . import views
4	4
5	5	urlpatterns = [
6		- url(r'^$', views.index, name='index'),
	6	+ url(r'^$', views.AppIndex.as_view(), name='index'),
7	7	]
...	...
1	1	from django.shortcuts import render
2		-from django.contrib.auth.decorators import login_required
	2	+from django.views.generic import TemplateView
	3	+from django.contrib.auth.mixins import LoginRequiredMixin
	4	+from django.utils.decorators import decorator_from_middleware_with_args
	5	+from django.utils.decorators import decorator_from_middleware
	6	+from django.utils.decorators import method_decorator
	7	+from core.mixins import LogMixin
3	8
4	9	from courses.models import Course
5	10
6		-@login_required
7		-def index(request):
8		- context = {}
	11	+class AppIndex(LoginRequiredMixin, LogMixin, TemplateView):
	12	+ log_action = "Acessou home"
	13	+ template_name = "home_professor.html"
9	14
10		- context['courses'] = Course.objects.filter(user = request.user)
	15	+ def render_to_response(self, context, **response_kwargs):
	16	+ context = {}
11	17
12		- return render(request, "home_app.html", context)
13	18	\ No newline at end of file
	19	+ if self.request.user.type_profile == 2:
	20	+ template = "home_student.html"
	21	+ context['courses'] = Course.objects.filter(user = self.request.user)
	22	+ else:
	23	+ template = self.get_template_names()
	24	+ context['courses'] = Course.objects.filter(user = self.request.user)
	25	+
	26	+ context['title'] = 'Amadeus'
	27	+
	28	+ return self.response_class(request = self.request, template = template, context = context, using = self.template_engine, **response_kwargs)
14	29	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,31 @@
	1	+import os
	2	+import datetime
	3	+from django.conf import settings
	4	+from functools import wraps
	5	+
	6	+def log_decorator(log_action = ''):
	7	+
	8	+ def _log_decorator(view_function):
	9	+
	10	+ def _decorator(request, args, *kwargs):
	11	+
	12	+ response = view_function(request, args, *kwargs)
	13	+
	14	+ if request.user.is_authenticated and request.POST:
	15	+ date = datetime.datetime.now()
	16	+
	17	+ message = date.strftime("%d/%m/%Y %H:%M:%S") + ' - ' + request.user.username + ' - ' + log_action + '\n'
	18	+
	19	+ file_name = 'log_file_' + date.strftime("%d-%m-%Y") + '.txt'
	20	+
	21	+ log_path = os.path.join(settings.LOGS_URL, file_name)
	22	+
	23	+ log_file = open(log_path,'a+')
	24	+ log_file.write(message)
	25	+ log_file.close()
	26	+
	27	+ return response
	28	+
	29	+ return wraps(view_function)(_decorator)
	30	+
	31	+ return _log_decorator
0	32	\ No newline at end of file
...	...
...	...	@@ -2,12 +2,38 @@ from django import forms
2	2
3	3	from users.models import User
4	4
5		-class CreateUserForm(forms.ModelForm):
	5	+class RegisterUserForm(forms.ModelForm):
6	6
7	7	password = forms.CharField(label='Senha', widget=forms.PasswordInput)
	8	+ password2 = forms.CharField(label = 'Confirmacao de Senha', widget = forms.PasswordInput)
	9	+
	10	+ MIN_LENGTH = 8
	11	+
	12	+ def clean_password(self):
	13	+ password = self.cleaned_data.get('password')
	14	+
	15	+ # At least MIN_LENGTH long
	16	+ if len(password) < self.MIN_LENGTH:
	17	+ raise forms.ValidationError("A senha deve conter no minimo %d caracteres." % self.MIN_LENGTH)
	18	+
	19	+ # At least one letter and one non-letter
	20	+ first_isalpha = password[0].isalpha()
	21	+ if all(c.isalpha() == first_isalpha for c in password):
	22	+ raise forms.ValidationError("A senha deve conter pelo menos uma letra e pelo menos um digito ou "\
	23	+ "um caractere de pontuacao.")
	24	+
	25	+ return password
	26	+
	27	+ def clean_password2(self):
	28	+ password = self.cleaned_data.get("password")
	29	+ password2 = self.cleaned_data.get("password2")
	30	+
	31	+ if password and password2 and password != password2:
	32	+ raise forms.ValidationError('A confirmmacao de senha esta incorreta')
	33	+ return password2
8	34
9	35	def save(self, commit=True):
10		- super(CreateUserForm, self).save(commit=False)
	36	+ super(RegisterUserForm, self).save(commit=False)
11	37	self.instance.set_password(self.cleaned_data['password'])
12	38
13	39	self.instance.save()
...	...
...	...	@@ -0,0 +1,21 @@
	1	+import os
	2	+import datetime
	3	+from django.conf import settings
	4	+
	5	+class LogMixin(object):
	6	+ log_action = ""
	7	+
	8	+ def dispatch(self, request, args, *kwargs):
	9	+ date = datetime.datetime.now()
	10	+
	11	+ message = date.strftime("%d/%m/%Y %H:%M:%S") + ' - ' + request.user.username + ' - ' + self.log_action + '\n'
	12	+
	13	+ file_name = 'log_file_' + date.strftime("%d-%m-%Y") + '.txt'
	14	+
	15	+ log_path = os.path.join(settings.LOGS_URL, file_name)
	16	+
	17	+ log_file = open(log_path,'a+')
	18	+ log_file.write(message)
	19	+ log_file.close()
	20	+
	21	+ return super(LogMixin, self).dispatch(request, args, *kwargs)
0	22	\ No newline at end of file
...	...