Download as
Browse Code »

Commit 243569a6c9ef33ce0c7e73d51a0dad84df69fad5

Authored by Zambom
1 parent 77a54af5
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Criando template a partir do arquivo que estava disponível no repositório da uxdesign

Showing 7 changed files with 67 additions and 26 deletions   Show diff stats
app/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @243569a
... ... @@ -8,7 +8,7 @@ msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-01 16:02-0300\n"
  11 +"POT-Creation-Date: 2016-09-01 22:44-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -58,7 +58,7 @@ msgstr &quot;&quot;
58 58 msgid "You can:"
59 59 msgstr ""
60 60  
61   -#: app/templates/app/index.html:24 app/templates/home_app.html:43
  61 +#: app/templates/app/index.html:24 app/templates/home_app.html:26
62 62 msgid "Create Course"
63 63 msgstr "Criar Curso"
64 64  
... ... @@ -94,38 +94,37 @@ msgstr &quot;&quot;
94 94 msgid "Most popular keywords:"
95 95 msgstr ""
96 96  
97   -#: app/templates/home_app.html:15
98   -msgid "Amadeus"
99   -msgstr "Amadeus"
100   -
101   -#: app/templates/home_app.html:31
  97 +#: app/templates/home_app.html:14
102 98 msgid "Home"
103 99 msgstr "Início"
104 100  
105   -#: app/templates/home_app.html:39
  101 +#: app/templates/home_app.html:22
106 102 msgid "Pending tasks"
107 103 msgstr "Tarefas Pendentes"
108 104  
109   -#: app/templates/home_app.html:40
  105 +#: app/templates/home_app.html:23
110 106 msgid "Users Online (1)"
111 107 msgstr "Pessoas Online (1)"
112 108  
113   -#: app/templates/home_app.html:41
  109 +#: app/templates/home_app.html:24
114 110 msgid "Course"
115 111 msgstr "Curso"
116 112  
117   -#: app/templates/home_app.html:44
  113 +#: app/templates/home_app.html:27
118 114 msgid "Manage Course"
119 115 msgstr "Gerenciar Curso"
120 116  
121   -#: app/templates/home_app.html:52
  117 +#: app/templates/home_app.html:35
122 118 msgid "Courses"
123 119 msgstr "Cursos"
124 120  
125   -#: app/templates/home_app.html:68
  121 +#: app/templates/home_app.html:51
126 122 msgid "You didn't create any course yet."
127 123 msgstr "Você não criou nenhum curso ainda."
128 124  
129   -#: app/templates/home_app.html:76
  125 +#: app/templates/home_app.html:59
130 126 msgid "Goals"
131 127 msgstr "Metas"
  128 +
  129 +#~ msgid "Amadeus"
  130 +#~ msgstr "Amadeus"
... ...
core/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @243569a
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-01 16:02-0300\n"
  11 +"POT-Creation-Date: 2016-09-01 22:44-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -18,6 +18,10 @@ msgstr &quot;&quot;
18 18 "Content-Transfer-Encoding: 8bit\n"
19 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20  
  21 +#: core/templates/base.html:43
  22 +msgid "Amadeus"
  23 +msgstr ""
  24 +
21 25 #: core/templates/index.html:29
22 26 msgid "Entrar"
23 27 msgstr ""
... ...
courses/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @243569a
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-01 16:02-0300\n"
  11 +"POT-Creation-Date: 2016-09-01 22:44-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @243569a
... ... @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 8 msgstr ""
9 9 "Project-Id-Version: PACKAGE VERSION\n"
10 10 "Report-Msgid-Bugs-To: \n"
11   -"POT-Creation-Date: 2016-09-01 16:02-0300\n"
  11 +"POT-Creation-Date: 2016-09-01 22:44-0300\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -114,12 +114,24 @@ msgstr &quot;&quot;
114 114 msgid "Users"
115 115 msgstr ""
116 116  
117   -#: users/templates/users/create.html:8
  117 +#: users/templates/list_users.html:14 users/templates/users/create.html:8
118 118 #: users/templates/users/edit_profile.html:8 users/templates/users/index.html:7
119 119 #: users/templates/users/profile.html:8 users/templates/users/update.html:8
120 120 #: users/templates/users/view.html:7
121 121 msgid "Home"
122   -msgstr ""
  122 +msgstr "Início"
  123 +
  124 +#: users/templates/list_users.html:15 users/templates/users/index.html:8
  125 +msgid "Manage Users"
  126 +msgstr "Gerenciar Usuários"
  127 +
  128 +#: users/templates/list_users.html:23
  129 +msgid "Add user"
  130 +msgstr "Adicionar usuário"
  131 +
  132 +#: users/templates/list_users.html:24
  133 +msgid "Send email"
  134 +msgstr "Enviar e-mail"
123 135  
124 136 #: users/templates/users/create.html:9
125 137 msgid "New User"
... ... @@ -163,10 +175,6 @@ msgstr &quot;&quot;
163 175 msgid "Profile"
164 176 msgstr ""
165 177  
166   -#: users/templates/users/index.html:8
167   -msgid "Manage Users"
168   -msgstr ""
169   -
170 178 #: users/templates/users/index.html:56 users/templates/users/profile.html:32
171 179 #: users/templates/users/view.html:39
172 180 msgid "Administrator"
... ...
users/templates/list_users.html 0 → 100644
  Diff comments   View file @243569a
... ... @@ -0,0 +1,30 @@
  1 +{% extends 'base.html' %}
  2 +
  3 +{% load i18n %}
  4 +
  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">
  12 + <div class="col-md-12">
  13 + <ul class="breadcrumb" style="margin-bottom: 5px;">
  14 + <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
  15 + <li class="active">{% trans 'Manage Users' %}</li>
  16 + </ul>
  17 + </div>
  18 + </div>
  19 +{% endblock %}
  20 +
  21 +{% block sidebar %}
  22 + <div class="btn-group-vertical">
  23 + <a href="{% url 'app:users:create' %}" class="btn btn-raised">{% trans 'Add user' %}</a>
  24 + <a href="javascript:void(0)" class="btn btn-raised">{% trans 'Send email' %}</a>
  25 + </div>
  26 +{% endblock %}
  27 +
  28 +{% block content %}
  29 + <input type="text" class="form-control" name="search" placeholder="search..">
  30 +{% endblock %}
0 31 \ No newline at end of file
... ...
users/urls.py
  Diff comments   View file @243569a
... ... @@ -3,7 +3,7 @@ from django.conf.urls import url
3 3 from . import views
4 4  
5 5 urlpatterns = [
6   - url(r'^usuarios/$', views.Index.as_view(), name='manage'),
  6 + url(r'^usuarios/$', views.UsersListView.as_view(), name='manage'),
7 7 url(r'^usuarios/criar/$', views.Create.as_view(), name='create'),
8 8 url(r'^usuario/editar/(?P<username>[\w_-]+)/$', views.Update.as_view(), name='update'),
9 9 url(r'^usuario/dados/(?P<username>[\w_-]+)/$', views.View.as_view(), name='view'),
... ...
users/views.py
  Diff comments   View file @243569a
... ... @@ -9,12 +9,12 @@ from rolepermissions.shortcuts import assign_role
9 9 from .models import User
10 10 from .forms import UserForm, ProfileForm
11 11  
12   -class Index(HasRoleMixin, LoginRequiredMixin, generic.ListView):
  12 +class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
13 13  
14 14 allowed_roles = ['system_admin']
15 15 login_url = '/'
16 16 redirect_field_name = 'next'
17   - template_name = 'users/index.html'
  17 + template_name = 'list_users.html'
18 18 context_object_name = 'users'
19 19 paginate_by = 10
20 20  
... ...