conflite

Matheus Lins
1 parent 83fc54c7
Showing 11 changed files with 272 additions and 248 deletions Show diff stats
app/templates/home.html
core/locale/pt_BR/LC_MESSAGES/django.po
core/templates/guest.html
core/templates/register_user.html
core/views.py
users/locale/pt_BR/LC_MESSAGES/django.po
users/models.py
users/templates/list_users.html
users/templates/users/create.html
users/templates/users/index.html
users/views.py
@@ -96,8 +96,26 @@
               {% endblock %}
                 {% if user|has_role:'system_admin' %}
-                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-                    <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>
+                    
+                    <li>
+                      <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
+                      <div id="menu_users" class="collapse">
+                        <ul class="nav nav-pill nav-stacked accordion_list">
+                          <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+                          <li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>
+                        </ul>
+                      </div> 
+                    </li>
+                    <li> 
+                      <a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
+                      <div id="menu_settings" class="collapse">
+                        <ul class="nav nav-pill nav-stacked accordion_list">
+                            <li> <a href="{% url 'app:settings' %}">{% trans "System" %}</a></li>
+                            <li> <a href="{% url 'app:settings' %}">{% trans "Mail Sender" %}</a></li>
+                            <li> <a href="{% url 'app:settings' %}">{% trans "Security" %}</a></li>
+                        </ul>
+                      </div>
+                    </li>
                 {% endif %}
             </ul>
         </div>
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-16 11:23-0300\n"
+"POT-Creation-Date: 2016-11-19 10:24-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"
@@ -23,10 +23,8 @@ msgid &quot;Password&quot;
 msgstr "Senha"
 #: .\forms.py:13
-#, fuzzy
-#| msgid "Confirm password:"
 msgid "Confirm Password"
-msgstr "Confirmação de senha:"
+msgstr "Confirme a senha:"
 #: .\forms.py:27
 msgid "There is already a registered User with this e-mail"
@@ -40,7 +38,7 @@ msgstr &quot;Por favor, insira uma data válida&quot;
 #, fuzzy
 #| msgid "There is already a registeres User with this CPF"
 msgid "There is already a registered User with this CPF"
-msgstr "Já existem usuários cadastrados com este CPF"
+msgstr "Já existe usuário cadastrado com este CPF"
 #: .\forms.py:52
 #, python-format
@@ -138,7 +136,7 @@ msgstr &quot;Autor&quot;
 msgid "Notification"
 msgstr "Notificação"
-#: .\models.py:99 .\templates\base.html:92 .\templates\guest.html:70
+#: .\models.py:99 .\templates\base.html:92
 msgid "Notifications"
 msgstr "Notificações"
@@ -166,11 +164,11 @@ msgstr &quot;Logs&quot;
 msgid "Search Files (.pdf, others) and/or activities"
 msgstr "Pesquisar arquivos (.pdf, outros) e/ou atividades"
-#: .\templates\base.html:98 .\templates\guest.html:77
+#: .\templates\base.html:98
 msgid "See More"
 msgstr "Ver Mais"
-#: .\templates\base.html:105 .\templates\guest.html:83
+#: .\templates\base.html:105
 msgid "messages"
 msgstr "Mensagens"
@@ -196,14 +194,22 @@ msgstr &quot;Mudar senha&quot;
 msgid "Remove account"
 msgstr "Remover conta"
-#: .\templates\guest.html:97
+#: .\templates\guest.html:67 .\templates\index.html:67 .\views.py:115
+msgid "Guest"
+msgstr "Convidado"
+
+#: .\templates\guest.html:80
 msgid "Menu"
 msgstr "Menu"
-#: .\templates\guest.html:101 .\templates\register_user.html:110
+#: .\templates\guest.html:84 .\templates\register_user.html:110
 msgid "Register"
 msgstr "Cadastrar"
+#: .\templates\guest.html:98
+msgid "Search Courses"
+msgstr "Pesquisar Cursos"
+
 #: .\templates\index.html:37
 msgid "Sign in with your account to continue"
 msgstr "Faça login com sua conta para continuar"
@@ -220,10 +226,6 @@ msgstr &quot;Lembrar E-mail&quot;
 msgid "Log in"
 msgstr "Acessar"
-#: .\templates\index.html:67
-msgid "Guest"
-msgstr "Convidado"
-
 #: .\templates\index.html:72
 msgid "Forgot your password?"
 msgstr "Esqueceu sua senha?"
@@ -236,9 +238,11 @@ msgstr &quot;Cadastrar&quot;
 msgid "User Register"
 msgstr "Cadastro de usuário"
+#: .\templates\register_user.html:61
+msgid "Choose your photo..."
+msgstr ""
+
 #: .\templates\register_user.html:71
-#, fuzzy
-#| msgid "Chose your file ..."
 msgid "Choose the file ..."
 msgstr "Escolha o arquivo..."
@@ -249,7 +253,7 @@ msgstr &quot;Entrar&quot;
 #: .\templates\registration\passwor_reset_complete.html:19
 msgid "Your password was reseted successful"
-msgstr ""
+msgstr "Sua senha foi resetada com sucesso"
 #: .\templates\registration\passwor_reset_confirm.html:19
 #: .\templates\registration\passwor_reset_done.html:18
@@ -389,9 +393,6 @@ msgstr &quot;E-mail ou senha incorretos.&quot;
 #~ msgid "Manage Users"
 #~ msgstr "Gerenciar usuários"
-#~ msgid "Manage Courses"
-#~ msgstr "Gerenciar cursos"
-
 #~ msgid "Category"
 #~ msgstr "Categoria"
@@ -64,24 +64,7 @@
                 </div>
                 <div class="navbar-collapse collapse navbar-responsive-collapse">
                 <ul class="nav navbar-nav navbar-right notifications">
-                         <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
-                 <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
-                   <ul id="notification-dropdown" class="dropdown-menu">
-                   <li class="dropdown-header">{% trans 'Notifications' %}</li>
-                        {% include "notifications.html" %}
-
-                        <li>
-                         <a onclick="getNotifications(5)">
-                            <div id="notification-see-more" class="list-group-item">
-                                  <div class="row-content">
-                                    <p class="list-group-item-text">{% trans 'See More' %}</p>
-                                </div>
-                       </a>
-                        </li>
-                    </ul>
-               </li>
-             			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
-             			<li > <a  class="link" href="{% url 'app:index' %}">{{ user }}</a></li>
+             			<li > <a  class="link" href="{% url 'app:index' %}">{% trans 'Guest' %}</a></li>
                         <li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'app:index' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
            		</ul>
          		</div>
@@ -107,21 +90,6 @@
     		</div>
 		   <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
 				{% block breadcrumbs %}
-
-					<div class="col-md-12">
-						<form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
-							<div class="input-group">
-							  <div class="form-group is-empty">
-							  <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
-							    <span class="input-group-btn input-group-sm">
-							      <button type="button" class="btn btn-fab btn-fab-mini">
-							        <i class="material-icons">search</i>
-							      </button>
-							    </span>
-							</div>
-						</form>
-					</div>
-
 				{% endblock %}
 				{% block render_breadcrumbs %}{% endblock %}
 			<div>
@@ -137,7 +105,7 @@
                                         <h4 class="panel-title">
                                             <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
                                         </h4>
-                                        
+
                                     </div>
                                     <div id="{{category.slug}}" class="panel-collapse collapse">
                                         {% for course in category.course_category.all %}
@@ -150,6 +118,27 @@
                             </div>
                         {% endfor %}
                     </div>
+                    <div class="col-md-12">
+                  		<nav aria-label="Page navigation">
+                  			<ul class="pagination">
+                  				{% if page_obj.has_previous %}
+                  				    <li>
+                  				        <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
+                  				    </li>
+                  				{% endif %}
+                  			    {% for page_number in paginator.page_range %}
+                  					<li{% if page_obj.number == page_number %} class="active"{% endif %}>
+                  	    				<a href="?page={{ page_number }}">{{ page_number }}</a>
+                  					</li>
+                  				{% endfor %}
+                  				{% if page_obj.has_next %}
+                  				    <li>
+                  				        <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
+                  				    </li>
+                  				{% endif %}
+                  			</ul>
+                  		</nav>
+                  	</div>
 				{% endblock %}
 			</div>
 		</div>
@@ -161,4 +150,4 @@
 	{% endblock script_file %}
 </body>
-</html>
 \ No newline at end of file
+</html>
@@ -58,7 +58,7 @@
 								{% elif field.auto_id == 'id_image' %}
 								{% render_field field class='form-control' %}
 								<div class="input-group">
-									<input type="text" readonly="" class="form-control" placeholder="Choose your photo...">
+									<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
 									<span class="input-group-btn input-group-sm">
 										<button type="button" class="btn btn-fab btn-fab-mini">
 											<i class="material-icons">image</i>
@@ -14,6 +14,8 @@ from core.mixins import NotificationMixin
 from .models import Notification, Log
 from rolepermissions.shortcuts import assign_role
 from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+
 #API REST IMPORTS
 from .serializers import LogSerializer
 from rest_framework import status, serializers, permissions, viewsets
@@ -103,15 +105,24 @@ class GuestView (ListView):
 	template_name = 'guest.html'
 	context_object_name = 'courses'
+	queryset = CourseCategory.objects.all()
 	paginate_by = 10
-	def get_queryset(self):
-		return Course.objects.filter(public=True)
-
-
 	def get_context_data (self, **kwargs):
 		context = super(GuestView, self).get_context_data(**kwargs)
-		context['categorys_courses'] = CourseCategory.objects.all()
+		context['title'] = _("Guest")
+		queryset_list = CourseCategory.objects.all()
+
+		paginator = Paginator(queryset_list, 10)
+		page = self.request.GET.get('page')
+		try:
+			queryset_list = paginator.page(page)
+		except PageNotAnInteger:
+			queryset_list = paginator.page(1)
+		except EmptyPage:
+			queryset_list = paginator.page(paginator.num_pages)
+
+		context['categorys_courses'] = queryset_list
 		return context
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-26 14:47-0300\n"
+"POT-Creation-Date: 2016-11-17 09:46-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,19 +18,19 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: users/forms.py:60
+#: .\forms.py:60
 msgid "Please enter a valid CPF"
 msgstr "Por favor, insira um CPF válido"
-#: users/forms.py:67
+#: .\forms.py:66
 msgid "Please enter a valid date"
 msgstr "Por favor, insira uma data válida"
-#: users/models.py:11 users/templates/users/profile.html:61
+#: .\models.py:11 .\templates\users\profile.html:64
 msgid "Login"
 msgstr "Login"
-#: users/models.py:14
+#: .\models.py:14
 msgid ""
 "Type a valid username. This fields should only contain letters, numbers and "
 "the characteres: @/./+/-/_ ."
@@ -38,361 +38,359 @@ msgstr &quot;&quot;
 "Digite um nome de usuário válido. Esse campo deve conter apenas letras, "
 "números e os caracteres: @/./+/-/_ ."
-#: users/models.py:17
+#: .\models.py:17
 msgid ""
 "A short name that will be used to identify you in the platform and to access "
 "it"
 msgstr ""
 "Um nome curto que será usado para se identificar no acesso à plataforma"
-#: users/models.py:18
+#: .\models.py:18
 msgid "Mail"
 msgstr "Email"
-#: users/models.py:19 users/templates/list_users.html:67
+#: .\models.py:19 .\templates\list_users.html:58
+#: .\templates\users\profile.html:60
 msgid "Name"
 msgstr "Nome"
-#: users/models.py:20
+#: .\models.py:20
 msgid "City"
 msgstr "Cidade"
-#: users/models.py:21
+#: .\models.py:21
 msgid "State"
 msgstr "Estado"
-#: users/models.py:22 users/templates/users/profile.html:105
+#: .\models.py:22 .\templates\users\profile.html:108
 msgid "Gender"
 msgstr "Gênero"
-#: users/models.py:22
+#: .\models.py:22
 msgid "Male"
 msgstr "Masculino"
-#: users/models.py:22
+#: .\models.py:22
 msgid "Female"
 msgstr "Feminino"
-#: users/models.py:23
-msgid "Image"
-msgstr "Imagem"
+#: .\models.py:23
+msgid "Photo"
+msgstr "Foto"
-#: users/models.py:24 users/templates/users/profile.html:109
+#: .\models.py:24 .\templates\users\profile.html:112
 msgid "Birth Date"
 msgstr "Data de nascimento"
-#: users/models.py:25
+#: .\models.py:25
 msgid "Phone"
 msgstr "Telefone"
-#: users/models.py:26
-msgid "Cpf"
+#: .\models.py:26 .\templates\users\profile.html:89
+msgid "CPF"
 msgstr "CPF"
-#: users/models.py:27
+#: .\models.py:27
 msgid "Type"
 msgstr "Tipo"
-#: users/models.py:27
+#: .\models.py:27
 msgid "Professor"
 msgstr "Professor"
-#: users/models.py:27 users/templates/users/profile.html:81
+#: .\models.py:27 .\templates\users\profile.html:84
 msgid "Student"
 msgstr "Aluno"
-#: users/models.py:28
+#: .\models.py:28
 msgid "Titration"
 msgstr "Título"
-#: users/models.py:29
+#: .\models.py:29
 msgid "Year of titration"
 msgstr "Ano do título"
-#: users/models.py:30
-msgid "Institution where he had titration"
-msgstr "Instituição o qual obteve o título"
+#: .\models.py:30 .\templates\users\profile.html:128
+msgid "Institution"
+msgstr "Instituição"
-#: users/models.py:31 users/templates/users/profile.html:135
+#: .\models.py:31 .\templates\users\profile.html:136
 msgid "Curriculum"
 msgstr "Currículo"
-#: users/models.py:32
+#: .\models.py:32
 msgid "Create Date"
 msgstr "Data de criação"
-#: users/models.py:33
-msgid "Administrador"
+#: .\models.py:33 .\templates\users\index.html:46
+#: .\templates\users\view.html:19
+msgid "Administrator"
 msgstr "Administrador"
-#: users/models.py:34
+#: .\models.py:34
 msgid "Active"
 msgstr "Ativo"
-#: users/models.py:42
+#: .\models.py:42
 msgid "User"
 msgstr "Usuário"
-#: users/models.py:43
+#: .\models.py:43
 msgid "Users"
 msgstr "Usuários"
-#: users/templates/list_users.html:15 users/templates/users/profile.html:17
-msgid "Menu"
-msgstr "Menu"
-
-#: users/templates/list_users.html:19 users/templates/users/index.html:7
-#: users/templates/users/view.html:7
-msgid "Home"
-msgstr "Início"
-
-#: users/templates/list_users.html:20
-msgid "Add user"
+#: .\templates\list_users.html:14 .\templates\users\index.html:13
+#: .\templates\users\profile.html:16
+msgid "Add User"
 msgstr "Adicionar usuário"
-#: users/templates/list_users.html:21
-msgid "Send email"
-msgstr "Enviar e-mail"
-
-#: users/templates/list_users.html:41
+#: .\templates\list_users.html:32
 msgid "Search..."
 msgstr "Pesquisar..."
-#: users/templates/list_users.html:45
-msgid "Search"
-msgstr "Pesquisar"
-
-#: users/templates/list_users.html:68
+#: .\templates\list_users.html:59
 msgid "Profile"
 msgstr "Perfil"
-#: users/templates/list_users.html:69 users/templates/users/profile.html:65
+#: .\templates\list_users.html:60 .\templates\users\profile.html:68
 msgid "Email"
 msgstr "Email"
-#: users/templates/list_users.html:70
+#: .\templates\list_users.html:61
 msgid "Contact"
 msgstr "Contato"
-#: users/templates/list_users.html:72
+#: .\templates\list_users.html:63
 msgid "Edit"
 msgstr "Editar"
-#: users/templates/list_users.html:73 users/templates/list_users.html:91
+#: .\templates\list_users.html:64 .\templates\list_users.html:82
 msgid "Delete"
 msgstr "Apagar"
-#: users/templates/list_users.html:84
+#: .\templates\list_users.html:75
 msgid "Confirm delete"
 msgstr "Confirmar"
-#: users/templates/list_users.html:87
+#: .\templates\list_users.html:78
 msgid "Are you sure you want to delete the user"
 msgstr "Você tem certeza que deseja deletar o usuário"
-#: users/templates/list_users.html:90
-#: users/templates/users/change_password.html:47
-#: users/templates/users/create.html:130
-#: users/templates/users/edit_profile.html:79
-#: users/templates/users/remove_account.html:35
-#: users/templates/users/update.html:83
+#: .\templates\list_users.html:81 .\templates\users\change_password.html:47
+#: .\templates\users\create.html:130 .\templates\users\edit_profile.html:102
+#: .\templates\users\remove_account.html:35 .\templates\users\update.html:83
 msgid "Cancel"
 msgstr "Cancelar"
-#: users/templates/list_users.html:103 users/templates/users/index.html:74
+#: .\templates\list_users.html:94 .\templates\users\index.html:64
 msgid "No users found"
 msgstr "Nenhum usuário encontrado"
-#: users/templates/users/change_password.html:31
-#, fuzzy
-#| msgid "Password"
+#: .\templates\users\change_password.html:31
 msgid "Current Password"
-msgstr "Senha"
+msgstr "Senha atual"
-#: users/templates/users/change_password.html:35
+#: .\templates\users\change_password.html:35
 #, fuzzy
 #| msgid "Password"
 msgid "New Password"
 msgstr "Senha"
-#: users/templates/users/change_password.html:39
+#: .\templates\users\change_password.html:39
 msgid "Confirmation"
 msgstr "Confirmação"
-#: users/templates/users/change_password.html:44
-#: users/templates/users/create.html:127
-#: users/templates/users/edit_profile.html:76
-#: users/templates/users/update.html:80
+#: .\templates\users\change_password.html:44 .\templates\users\create.html:127
+#: .\templates\users\edit_profile.html:99 .\templates\users\update.html:80
 msgid "Save"
 msgstr "Salvar"
-#: users/templates/users/create.html:51
-#: users/templates/users/edit_profile.html:39
-#: users/templates/users/update.html:42
+#: .\templates\users\create.html:51
 msgid "Choose your photo..."
 msgstr "Envie sua foto..."
-#: users/templates/users/create.html:67
+#: .\templates\users\create.html:67 .\templates\users\edit_profile.html:47
+#: .\templates\users\update.html:42
 msgid "Choose your file..."
-msgstr "Envie um arquivo..."
-
-#: users/templates/users/index.html:8
-msgid "Manage Users"
-msgstr "Gerenciar Usuários"
-
-#: users/templates/users/index.html:15 users/templates/users/view.html:15
-msgid "System Users"
-msgstr "Usuários do sistema"
-
-#: users/templates/users/index.html:18 users/templates/users/view.html:18
-msgid "New Account"
-msgstr "Nova conta"
+msgstr "Escolha o arquivo..."
-#: users/templates/users/index.html:21 users/templates/users/view.html:27
-msgid "Send Mail"
-msgstr "Enviar email"
-
-#: users/templates/users/index.html:56 users/templates/users/view.html:39
-msgid "Administrator"
-msgstr "Administrador"
-
-#: users/templates/users/profile.html:21
-#, fuzzy
-#| msgid "Home"
-msgid "Home page"
+#: .\templates\users\index.html:7 .\templates\users\view.html:7
+msgid "Home"
 msgstr "Início"
-#: users/templates/users/profile.html:22
-#, fuzzy
-#| msgid "Edit Profile"
-msgid "View Profile"
-msgstr "Editar perfil"
-
-#: users/templates/users/profile.html:23
-msgid "Edit Profile"
-msgstr "Editar perfil"
-
-#: users/templates/users/profile.html:24
-#, fuzzy
-#| msgid "Password"
-msgid "Change Password"
-msgstr "Senha"
-
-#: users/templates/users/profile.html:25
-#, fuzzy
-#| msgid "New Account"
-msgid "Remove account"
-msgstr "Nova conta"
+#: .\templates\users\index.html:8
+msgid "Manage Users"
+msgstr "Gerenciar Usuários"
-#: users/templates/users/profile.html:53
+#: .\templates\users\profile.html:51
 #, fuzzy
 #| msgid "State"
 msgid "Status"
 msgstr "Estado"
-#: users/templates/users/profile.html:77
+#: .\templates\users\profile.html:53
+msgid "Online"
+msgstr "Conectado"
+
+#: .\templates\users\profile.html:55
+msgid "OffLine"
+msgstr "Desconectado"
+
+#: .\templates\users\profile.html:80
 msgid "User role"
 msgstr "Tipo de usuário"
-#: users/templates/users/profile.html:79
+#: .\templates\users\profile.html:82
 msgid "Teacher"
 msgstr "Professor"
-#: users/templates/users/profile.html:86
-msgid "CPF"
-msgstr "CPF"
-
-#: users/templates/users/profile.html:91
-msgid "doesn't posssess CPF"
+#: .\templates\users\profile.html:94
+#, fuzzy
+#| msgid "doesn't posssess CPF"
+msgid "doesn't possess CPF"
 msgstr "Não possui CPF"
-#: users/templates/users/profile.html:96
+#: .\templates\users\profile.html:99
 msgid "Phone Number"
 msgstr "Telefone"
-#: users/templates/users/profile.html:100
-msgid "doesn't posssess Phone"
+#: .\templates\users\profile.html:103
+#, fuzzy
+#| msgid "doesn't posssess Phone"
+msgid "doesn't possess Phone"
 msgstr "Não possui telefone"
-#: users/templates/users/profile.html:113
+#: .\templates\users\profile.html:116
 msgid "State and City"
 msgstr "Estado e cidade"
-#: users/templates/users/profile.html:117
+#: .\templates\users\profile.html:120
 msgid "Title"
 msgstr "Título"
-#: users/templates/users/profile.html:121
+#: .\templates\users\profile.html:124
 msgid "Year"
 msgstr "Ano"
-#: users/templates/users/profile.html:125
-msgid "Institution"
-msgstr "Instituição"
-
-#: users/templates/users/profile.html:129
+#: .\templates\users\profile.html:132
 msgid "Didn't inform institution"
 msgstr "Não informou a instituição"
-#: users/templates/users/profile.html:139
+#: .\templates\users\profile.html:142
 msgid "Didn't upload any curriculum"
 msgstr "Não enviou nenhum currículo"
-#: users/templates/users/remove_account.html:28
+#: .\templates\users\remove_account.html:28
 msgid "Are you sure you want delete this account?"
 msgstr "Voce tem certeza que deseja remover esta conta?"
-#: users/templates/users/remove_account.html:29
-msgid ""
-"All data will be lost and havent how recover it."
-msgstr "Todos os seus dados serão removidos e não haverá como recupera-los posteriormente."
+#: .\templates\users\remove_account.html:29
+msgid "All data will be lost and havent how recover it."
+msgstr ""
+"Todos os seus dados serão removidos e não haverá como recupera-los "
+"posteriormente."
-#: users/templates/users/remove_account.html:32
+#: .\templates\users\remove_account.html:32
 msgid "Remove"
 msgstr "Remover"
-#: users/templates/users/view.html:21
-msgid "View User Account"
-msgstr "Visualizar perfil"
-
-#: users/templates/users/view.html:24
-msgid "Edit User Account"
-msgstr "Editar perfil"
+#: .\templates\users\search.html:131
+msgid "poll"
+msgstr ""
-#: users/templates/users/view.html:43
+#: .\templates\users\view.html:23
 msgid "Mail:"
 msgstr "E-mail"
-#: users/templates/users/view.html:46
+#: .\templates\users\view.html:26
 msgid "Phone:"
 msgstr "Telefone"
-#: users/templates/users/view.html:49
+#: .\templates\users\view.html:29
 msgid "Cpf:"
 msgstr "CPF"
-#: users/templates/users/view.html:52
+#: .\templates\users\view.html:32
 msgid "Birth date:"
 msgstr "Data de nascimento:"
-#: users/views.py:55
+#: .\views.py:70
 msgid "User created successfully!"
 msgstr "Usuário criado com sucesso!"
-#: users/views.py:84
+#: .\views.py:99
 msgid "User edited successfully!"
 msgstr "Usuário editado com sucesso!"
-#: users/views.py:101
+#: .\views.py:116 .\views.py:122
 #, fuzzy
 #| msgid "User edited successfully!"
 msgid "User deleted Successfully!"
 msgstr "Usuário editado com sucesso!"
-#: users/views.py:126
+#: .\views.py:152
 msgid "Profile edited successfully!"
 msgstr "Perfil editado com sucesso!"
+#~ msgid "Administrador"
+#~ msgstr "Administrador"
+
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
+#~ msgid "Cpf"
+#~ msgstr "CPF"
+
+#~ msgid "Institution where he had titration"
+#~ msgstr "Instituição o qual obteve o título"
+
+#~ msgid "Menu"
+#~ msgstr "Menu"
+
+#~ msgid "Send email"
+#~ msgstr "Enviar e-mail"
+
+#~ msgid "Search"
+#~ msgstr "Pesquisar"
+
+#~ msgid "System Users"
+#~ msgstr "Usuários do sistema"
+
+#~ msgid "New Account"
+#~ msgstr "Nova conta"
+
+#~ msgid "Send Mail"
+#~ msgstr "Enviar email"
+
+#, fuzzy
+#~| msgid "Home"
+#~ msgid "Home page"
+#~ msgstr "Início"
+
+#, fuzzy
+#~| msgid "Edit Profile"
+#~ msgid "View Profile"
+#~ msgstr "Editar perfil"
+
+#~ msgid "Edit Profile"
+#~ msgstr "Editar perfil"
+
+#, fuzzy
+#~| msgid "Password"
+#~ msgid "Change Password"
+#~ msgstr "Senha"
+
+#, fuzzy
+#~| msgid "New Account"
+#~ msgid "Remove account"
+#~ msgstr "Remover conta"
+
+#~ msgid "View User Account"
+#~ msgstr "Visualizar perfil"
+
+#~ msgid "Edit User Account"
+#~ msgstr "Editar perfil"
+
 #~ msgid "New User"
 #~ msgstr "Novo usuário"
@@ -30,7 +30,7 @@ class User(AbstractBaseUser, PermissionsMixin):
 	institution = models.CharField(_('Institution'), max_length = 50, blank=True, null=True)
 	curriculum = models.FileField(verbose_name = _('Curriculum'), upload_to='users/curriculum/', null=True, blank=True)
 	date_created = models.DateTimeField(_('Create Date'), auto_now_add = True)
-	is_staff = models.BooleanField(_('Administrador'), default = False)
+	is_staff = models.BooleanField(_('Administrator'), default = False)
 	is_active = models.BooleanField(_('Active'), default = True)
 	USERNAME_FIELD = 'username'
@@ -10,9 +10,6 @@
 {% endblock %}
 {% block menu %}
-  {% if user|has_role:'system_admin' %}
-	 <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
-  {% endif %}
 {% endblock %}
 {% block content %}
@@ -38,8 +38,8 @@
 								{% else %}
 									<label for="{{ field.auto_id }}">{{ field.label }}</label>
 								{% endif %}
-								<input type="text" class="form-control input-sm date-picker" name="{{field.name}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+                {% render_field field class='form-control date-picker' %}
 							{% elif field.auto_id == 'id_image' %}
 		                		{% if field.field.required %}
 									<label for="{{ field.auto_id }}">{{ field.label }}<span>*</span></label>
@@ -71,10 +71,10 @@
 				                   		</button>
 				                  	</span>
 				                </div>
-				      		{% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
+				      		{% elif field.auto_id == 'id_is_staff' or  field.auto_id == 'id_is_active' %}
                 				<div class="checkbox">
                   					<label for="{{ field.auto_id }}">
-                      					{% render_field field %}<span class="checkbox-material"><span class="check"></span></span> {{field.label}}
+                      					{% render_field field %} {{field.label}}
                   					</label>
                 				</div>
                 			{% elif field.auto_id == 'id_cpf' %}
@@ -123,10 +123,10 @@
 							{% endif %}
 						</div>
 					{% endfor %}
-					<div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
+					<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
 						<input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" onclick="validarCpfSemAlert(id_cpf, CPF, idElementoMensagemErro)'" />
 					</div>
-					<div class="col-md-offset-4 col-md-2 col-sm-2 col-xs-2">
+					<div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
 						<a href="{% url 'users:manage' %}" class="btn btn-raised btn-danger" >{% trans 'Cancel' %}</a>
 					</div>
 				</form>
@@ -136,4 +136,11 @@
 </br>
 </br>
 </br>
+<script type="text/javascript">
+var locale = navigator.language || navigator.userLanguage;
+
+$('.date-picker').datepicker({
+	language: locale,
+});
+</script>
 {% endblock %}
@@ -10,7 +10,7 @@
 {% endblock %}
 {% block menu %}
-	<li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>
+	
 {% endblock %}
 {% block content %}
@@ -39,7 +39,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 		search = self.request.GET.get('search', None)
 		if search is None:
-			users = User.objects.exclude(username = self.request.user.username)
+			users = User.objects.all().order_by('name').exclude( username = self.request.user.username)
 		else:
 			users = User.objects.filter(Q(username = search) | Q(name = search) | Q(name__icontains = search) | Q(username__icontains = search)).exclude( username = self.request.user.username)
@@ -67,9 +67,13 @@ class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):
 		self.object.save()
-		messages.success(self.request, _('User created successfully!'))
+		messages.success(self.request, _('User ')+self.object.name+(' created successfully!'))
 		return super(Create, self).form_valid(form)
+	def get_context_data (self, **kwargs):
+		context = super(Create, self).get_context_data(**kwargs)
+		context['title'] = _("Add User")
+		return context
 class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
@@ -96,7 +100,7 @@ class Update(HasRoleMixin, LoginRequiredMixin, generic.UpdateView):
 		self.object.save()
-		messages.success(self.request, _('User edited successfully!'))
+		messages.success(self.request, _('User ')+self.object.name+(' updated successfully!'))
 		return super(Update, self).form_valid(form)
@@ -243,4 +247,3 @@ class UserViewSet(viewsets.ModelViewSet):
 	queryset = User.objects.all()
 	serializer_class = UserSerializer
 	permissions_classes = (IsAuthenticatedOrReadOnly,)
-
	@@ -96,8 +96,26 @@		@@ -96,8 +96,26 @@
96		96
97	{% endblock %}	97	{% endblock %}
98	{% if user\|has_role:'system_admin' %}	98	{% if user\|has_role:'system_admin' %}
99	- <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
100	- <li> <a href="{% url 'app:settings' %}">{% trans 'Settings' %}</a></li>	99	+
		100	+ <li>
		101	+ <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
		102	+ <div id="menu_users" class="collapse">
		103	+ <ul class="nav nav-pill nav-stacked accordion_list">
		104	+ <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
		105	+ <li> <a href="{% url 'users:create' %}">{% trans 'Create User' %}</a></li>
		106	+ </ul>
		107	+ </div>
		108	+ </li>
		109	+ <li>
		110	+ <a href="#menu_settings" class="accordion" data-toggle="collapse">{% trans 'Settings' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
		111	+ <div id="menu_settings" class="collapse">
		112	+ <ul class="nav nav-pill nav-stacked accordion_list">
		113	+ <li> <a href="{% url 'app:settings' %}">{% trans "System" %}</a></li>
		114	+ <li> <a href="{% url 'app:settings' %}">{% trans "Mail Sender" %}</a></li>
		115	+ <li> <a href="{% url 'app:settings' %}">{% trans "Security" %}</a></li>
		116	+ </ul>
		117	+ </div>
		118	+ </li>
101	{% endif %}	119	{% endif %}
102	</ul>	120	</ul>
103	</div>	121	</div>
	@@ -58,7 +58,7 @@		@@ -58,7 +58,7 @@
58	{% elif field.auto_id == 'id_image' %}	58	{% elif field.auto_id == 'id_image' %}
59	{% render_field field class='form-control' %}	59	{% render_field field class='form-control' %}
60	<div class="input-group">	60	<div class="input-group">
61	- <input type="text" readonly="" class="form-control" placeholder="Choose your photo...">	61	+ <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
62	<span class="input-group-btn input-group-sm">	62	<span class="input-group-btn input-group-sm">
63	<button type="button" class="btn btn-fab btn-fab-mini">	63	<button type="button" class="btn btn-fab btn-fab-mini">
64	<i class="material-icons">image</i>	64	<i class="material-icons">image</i>
	@@ -30,7 +30,7 @@ class User(AbstractBaseUser, PermissionsMixin):		@@ -30,7 +30,7 @@ class User(AbstractBaseUser, PermissionsMixin):
30	institution = models.CharField(_('Institution'), max_length = 50, blank=True, null=True)	30	institution = models.CharField(_('Institution'), max_length = 50, blank=True, null=True)
31	curriculum = models.FileField(verbose_name = _('Curriculum'), upload_to='users/curriculum/', null=True, blank=True)	31	curriculum = models.FileField(verbose_name = _('Curriculum'), upload_to='users/curriculum/', null=True, blank=True)
32	date_created = models.DateTimeField(_('Create Date'), auto_now_add = True)	32	date_created = models.DateTimeField(_('Create Date'), auto_now_add = True)
33	- is_staff = models.BooleanField(_('Administrador'), default = False)	33	+ is_staff = models.BooleanField(_('Administrator'), default = False)
34	is_active = models.BooleanField(_('Active'), default = True)	34	is_active = models.BooleanField(_('Active'), default = True)
35		35
36	USERNAME_FIELD = 'username'	36	USERNAME_FIELD = 'username'
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	{% endblock %}	10	{% endblock %}
11		11
12	{% block menu %}	12	{% block menu %}
13	- <li> <a href="{% url 'users:create' %}">{% trans 'Add User' %}</a></li>	13	+
14	{% endblock %}	14	{% endblock %}
15		15
16	{% block content %}	16	{% block content %}