Adjusting template [Issue: #13]

Zambom
1 parent 6adb9412
Showing 8 changed files with 103 additions and 47 deletions Show diff stats
app/locale/pt_BR/LC_MESSAGES/django.po
app/views.py
core/locale/pt_BR/LC_MESSAGES/django.po
courses/locale/pt_BR/LC_MESSAGES/django.po
logs/log_file_03-09-2016.txt
logs/log_file_05-09-2016.txt
users/locale/pt_BR/LC_MESSAGES/django.po
users/templates/list_users.html
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 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):
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr &quot;&quot;
 "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 &quot;&quot;
 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 &quot;Curso&quot;
 #: 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 &quot;Modulos&quot;
 #: 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 &quot;&quot;
 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 ""
@@ -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
@@ -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
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,7 +30,7 @@ msgstr &quot;Entrar&quot;
 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 &quot;&quot;
 #: 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 &quot;Imagem&quot;
 #: users/models.py:23
 msgid "Birth Date"
-msgstr ""
+msgstr "Data de nascimento"
 #: users/models.py:24
 msgid "Phone"
@@ -80,15 +80,15 @@ msgstr &quot;Telefone&quot;
 #: 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 &quot;Aluno&quot;
 #: 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 &quot;Usuário&quot;
 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 &quot;Adicionar usuário&quot;
 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 &quot;&quot;
 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"
@@ -3,11 +3,6 @@
 {% load i18n %}
 {% block breadcrumbs %}
- 	<div class="row">
-      	<div class="col-md-12">
-        	<h4>{% trans 'Manage Users' %}</h4>
-      	</div>
-    </div>
     <div class="row">
       	<div class="col-md-12">
         	<ul class="breadcrumb" style="margin-bottom: 5px;">
@@ -19,12 +14,41 @@
 {% endblock %}
 {% block sidebar %}
-	<div class="btn-group-vertical">
-  		<a href="{% url 'users:create' %}" class="btn btn-raised">{% trans 'Add user' %}</a>
-  		<a href="javascript:void(0)" class="btn btn-raised">{% trans 'Send email' %}</a>
+    <div class="panel panel-primary navigation">
+        <div class="panel-heading">
+            <h5>Menu</h5>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
+                <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
+            </ul>
+        </div>
     </div>
 {% endblock %}
 {% block content %}
 	<input type="text" class="form-control" name="search" placeholder="search..">
+
+    {% if users|length > 0 %}
+        {% for acc in users %}
+            <div class="row panel panel-default">
+                <div class="panel-body">
+                    <div class="col-md-4">
+                        <img src="{{ acc.image.url }}" alt="photoUser" class="img-circle img-responsive">
+                    </div>
+                    <div class="col-md-8">
+                        <p>{% trans 'Name' %}: {{ acc.name }}</p>
+                        <p>{% trans 'Profile' %}: {{ acc.get_type_profile_display }}</p>
+                        <p>{% trans 'Email' %}: {{ acc.email }}</p>
+                        <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
+                        <div align="right">
+                            <a href="javascript:void(0)" class="btn btn-raised btn-inverse">{% trans 'Edit' %}</a>
+                            <a href="javascript:void(0)" class="btn btn-raised btn-danger">{% trans 'Delete' %}</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {% endfor %}
+    {% endif %}
 {% endblock %}
	@@ -8,7 +8,7 @@ msgid ""		@@ -8,7 +8,7 @@ msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: PACKAGE VERSION\n"	9	"Project-Id-Version: PACKAGE VERSION\n"
10	"Report-Msgid-Bugs-To: \n"	10	"Report-Msgid-Bugs-To: \n"
11	-"POT-Creation-Date: 2016-09-03 00:18-0300\n"	11	+"POT-Creation-Date: 2016-09-05 20:28-0300\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+03/09/2016 20:13:26 - zambom - Entrou no sistema
	2	+03/09/2016 20:13:26 - zambom - Acessou home
	3	+03/09/2016 20:13:45 - zambom - Acessou home
	@@ -42,3 +42,10 @@		@@ -42,3 +42,10 @@
42	05/09/2016 04:39:39 - test - Entrou no sistema	42	05/09/2016 04:39:39 - test - Entrou no sistema
43	05/09/2016 04:39:39 - test - Acessou home	43	05/09/2016 04:39:39 - test - Acessou home
44	05/09/2016 04:40:28 - matheuslins - Acessou home	44	05/09/2016 04:40:28 - matheuslins - Acessou home
		45	+05/09/2016 15:28:49 - zambom - Acessou home
		46	+05/09/2016 15:29:02 - zambom - Entrou no sistema
		47	+05/09/2016 15:29:02 - zambom - Acessou home
		48	+05/09/2016 15:31:13 - zambom - Entrou no sistema
		49	+05/09/2016 15:31:13 - zambom - Acessou home
		50	+05/09/2016 20:20:12 - admin - Entrou no sistema
		51	+05/09/2016 20:20:13 - admin - Acessou home
	@@ -3,11 +3,6 @@		@@ -3,11 +3,6 @@
3	{% load i18n %}	3	{% load i18n %}
4		4
5	{% block breadcrumbs %}	5	{% block breadcrumbs %}
6	- <div class="row">
7	- <div class="col-md-12">
8	- <h4>{% trans 'Manage Users' %}</h4>
9	- </div>
10	- </div>
11	<div class="row">	6	<div class="row">
12	<div class="col-md-12">	7	<div class="col-md-12">
13	<ul class="breadcrumb" style="margin-bottom: 5px;">	8	<ul class="breadcrumb" style="margin-bottom: 5px;">
	@@ -19,12 +14,41 @@		@@ -19,12 +14,41 @@
19	{% endblock %}	14	{% endblock %}
20		15
21	{% block sidebar %}	16	{% block sidebar %}
22	- <div class="btn-group-vertical">
23	- <a href="{% url 'users:create' %}" class="btn btn-raised">{% trans 'Add user' %}</a>
24	- <a href="javascript:void(0)" class="btn btn-raised">{% trans 'Send email' %}</a>	17	+ <div class="panel panel-primary navigation">
		18	+ <div class="panel-heading">
		19	+ <h5>Menu</h5>
		20	+ </div>
		21	+ <div class="panel-body">
		22	+ <ul class="nav nav-pills nav-stacked">
		23	+ <li><a href="{% url 'users:create' %}">{% trans 'Add user' %}</a></li>
		24	+ <li><a href="javascript:void(0)">{% trans 'Send email' %}</a></li>
		25	+ </ul>
		26	+ </div>
25	</div>	27	</div>
26	{% endblock %}	28	{% endblock %}
27		29
28	{% block content %}	30	{% block content %}
29	<input type="text" class="form-control" name="search" placeholder="search..">	31	<input type="text" class="form-control" name="search" placeholder="search..">
		32	+
		33	+ {% if users\|length > 0 %}
		34	+ {% for acc in users %}
		35	+ <div class="row panel panel-default">
		36	+ <div class="panel-body">
		37	+ <div class="col-md-4">
		38	+ <img src="{{ acc.image.url }}" alt="photoUser" class="img-circle img-responsive">
		39	+ </div>
		40	+ <div class="col-md-8">
		41	+ <p>{% trans 'Name' %}: {{ acc.name }}</p>
		42	+ <p>{% trans 'Profile' %}: {{ acc.get_type_profile_display }}</p>
		43	+ <p>{% trans 'Email' %}: {{ acc.email }}</p>
		44	+ <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
		45	+ <div align="right">
		46	+ <a href="javascript:void(0)" class="btn btn-raised btn-inverse">{% trans 'Edit' %}</a>
		47	+ <a href="javascript:void(0)" class="btn btn-raised btn-danger">{% trans 'Delete' %}</a>
		48	+ </div>
		49	+ </div>
		50	+ </div>
		51	+ </div>
		52	+ {% endfor %}
		53	+ {% endif %}
30	{% endblock %}	54	{% endblock %}