diff --git a/app/locale/pt_BR/LC_MESSAGES/django.po b/app/locale/pt_BR/LC_MESSAGES/django.po index 2f49127..236a4cd 100644 --- a/app/locale/pt_BR/LC_MESSAGES/django.po +++ b/app/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-03 00:18-0300\n" +"POT-Creation-Date: 2016-09-05 20:28-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/app/views.py b/app/views.py index 53840e2..a6cde56 100644 --- a/app/views.py +++ b/app/views.py @@ -1,15 +1,15 @@ from django.shortcuts import render 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 django.core.urlresolvers import reverse_lazy from core.mixins import LogMixin from courses.models import Course class AppIndex(LoginRequiredMixin, LogMixin, TemplateView): log_action = "Acessou home" + login_url = reverse_lazy("core:home") + redirect_field_name = 'next' template_name = "home_professor.html" def render_to_response(self, context, **response_kwargs): diff --git a/core/locale/pt_BR/LC_MESSAGES/django.po b/core/locale/pt_BR/LC_MESSAGES/django.po index c8b3550..5754d0d 100644 --- a/core/locale/pt_BR/LC_MESSAGES/django.po +++ b/core/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-03 00:18-0300\n" +"POT-Creation-Date: 2016-09-05 20:28-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/courses/locale/pt_BR/LC_MESSAGES/django.po b/courses/locale/pt_BR/LC_MESSAGES/django.po index 7bca265..88548b1 100644 --- a/courses/locale/pt_BR/LC_MESSAGES/django.po +++ b/courses/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-03 00:18-0300\n" +"POT-Creation-Date: 2016-09-05 20:28-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" "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/forms.py:11 courses/forms.py:25 courses/forms.py:58 #: courses/models.py:7 courses/models.py:20 courses/models.py:44 #: courses/templates/category/index.html:38 msgid "Name" @@ -104,23 +104,23 @@ msgstr "" msgid "Category which the course belongs" msgstr "" -#: courses/forms.py:56 courses/models.py:46 +#: courses/forms.py:59 courses/models.py:46 msgid "Description" msgstr "" -#: courses/forms.py:57 +#: courses/forms.py:60 msgid "Is it visible?" msgstr "" -#: courses/forms.py:60 +#: courses/forms.py:63 msgid "Module's name" msgstr "" -#: courses/forms.py:61 +#: courses/forms.py:64 msgid "Modules's description" msgstr "" -#: courses/forms.py:62 +#: courses/forms.py:65 msgid "Is the module visible?" msgstr "" @@ -176,7 +176,7 @@ 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/home.html:16 courses/templates/course/index.html:15 #: courses/templates/course/update.html:16 #: courses/templates/course/view.html:15 #: courses/templates/module/create.html:17 @@ -204,9 +204,9 @@ msgstr "Modulos" #: 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/course/delete.html:7 courses/templates/course/home.html:8 +#: 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" @@ -303,6 +303,12 @@ msgstr "" msgid "Categories:" msgstr "" +#: courses/templates/course/home.html:9 +#, fuzzy +#| msgid "Course" +msgid "Home Course" +msgstr "Curso" + #: courses/templates/course/index.html:8 msgid "Manage Courses" msgstr "" diff --git a/logs/log_file_03-09-2016.txt b/logs/log_file_03-09-2016.txt new file mode 100644 index 0000000..f5934d4 --- /dev/null +++ b/logs/log_file_03-09-2016.txt @@ -0,0 +1,3 @@ +03/09/2016 20:13:26 - zambom - Entrou no sistema +03/09/2016 20:13:26 - zambom - Acessou home +03/09/2016 20:13:45 - zambom - Acessou home diff --git a/logs/log_file_05-09-2016.txt b/logs/log_file_05-09-2016.txt index bcb48e8..610d270 100644 --- a/logs/log_file_05-09-2016.txt +++ b/logs/log_file_05-09-2016.txt @@ -42,3 +42,10 @@ 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 15:28:49 - zambom - Acessou home +05/09/2016 15:29:02 - zambom - Entrou no sistema +05/09/2016 15:29:02 - zambom - Acessou home +05/09/2016 15:31:13 - zambom - Entrou no sistema +05/09/2016 15:31:13 - zambom - Acessou home +05/09/2016 20:20:12 - admin - Entrou no sistema +05/09/2016 20:20:13 - admin - Acessou home diff --git a/users/locale/pt_BR/LC_MESSAGES/django.po b/users/locale/pt_BR/LC_MESSAGES/django.po index 6ee0fa3..dea9f7a 100644 --- a/users/locale/pt_BR/LC_MESSAGES/django.po +++ b/users/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-03 00:18-0300\n" +"POT-Creation-Date: 2016-09-05 20:28-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,7 +30,7 @@ msgstr "Entrar" msgid "" "Type a valid username. This fields should only contain letters, numbers and " "the characteres: @/./+/-/_ ." -msgstr "" +msgstr "Digite um nome de usuário válido. Esse campo deve conter apenas letras, números e os caracteres: @/./+/-/_ ." #: users/models.py:16 msgid "" @@ -40,9 +40,9 @@ msgstr "" #: users/models.py:17 msgid "Mail" -msgstr "" +msgstr "Email" -#: users/models.py:18 +#: users/models.py:18 users/templates/list_users.html:41 msgid "Name" msgstr "Nome" @@ -72,7 +72,7 @@ msgstr "Imagem" #: users/models.py:23 msgid "Birth Date" -msgstr "" +msgstr "Data de nascimento" #: users/models.py:24 msgid "Phone" @@ -80,15 +80,15 @@ msgstr "Telefone" #: users/models.py:25 users/templates/users/profile.html:42 msgid "Cpf" -msgstr "" +msgstr "Cpf" #: users/models.py:26 msgid "Type" -msgstr "" +msgstr "Tipo" #: users/models.py:26 msgid "Professor" -msgstr "" +msgstr "Professor" #: users/models.py:26 msgid "Student" @@ -96,11 +96,11 @@ msgstr "Aluno" #: users/models.py:27 msgid "Create Date" -msgstr "" +msgstr "Data de criação" #: users/models.py:28 msgid "Administrador" -msgstr "" +msgstr "Administrador" #: users/models.py:29 msgid "Active" @@ -114,18 +114,17 @@ msgstr "Usuário" 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/list_users.html:9 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:10 users/templates/users/index.html:8 +msgid "Manage Users" +msgstr "Gerenciar Usuários" + #: users/templates/list_users.html:23 msgid "Add user" msgstr "Adicionar usuário" @@ -134,14 +133,36 @@ msgstr "Adicionar usuário" msgid "Send email" msgstr "Enviar e-mail" +#: users/templates/list_users.html:42 +#: users/templates/users/edit_profile.html:16 +#: users/templates/users/profile.html:9 users/templates/users/profile.html:16 +msgid "Profile" +msgstr "Perfil" + +#: users/templates/list_users.html:43 +msgid "Email" +msgstr "Email" + +#: users/templates/list_users.html:44 +msgid "Contact" +msgstr "Contato" + +#: users/templates/list_users.html:46 +msgid "Edit" +msgstr "Editar" + +#: users/templates/list_users.html:47 +msgid "Delete" +msgstr "Apagar" + #: users/templates/users/create.html:9 msgid "New User" -msgstr "" +msgstr "Novo usuário" #: 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 "" +msgstr "Usuários do sistema" #: users/templates/users/create.html:19 users/templates/users/index.html:18 #: users/templates/users/update.html:19 users/templates/users/view.html:18 @@ -171,11 +192,6 @@ msgstr "" 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" diff --git a/users/templates/list_users.html b/users/templates/list_users.html index af19787..21ba545 100644 --- a/users/templates/list_users.html +++ b/users/templates/list_users.html @@ -3,11 +3,6 @@ {% load i18n %} {% block breadcrumbs %} -
-
-

{% trans 'Manage Users' %}

-
-