Download as
Browse Code »

Commit 001e1104d78a085d4a6c1fd406fa174d6a713c4d

Authored by Felipe Henrique de Almeida Bormann
2 parents a4d9a2ac 86cd32bf
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 19 changed files with 428 additions and 126 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
@@ -18,79 +18,79 @@ msgstr &quot;&quot; @@ -18,79 +18,79 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
21 -#: amadeus/templates/base.html:90 21 +#: amadeus/templates/base.html:82
22 msgid "Search for subjects and resources" 22 msgid "Search for subjects and resources"
23 msgstr "Buscar por assuntos ou recursos" 23 msgstr "Buscar por assuntos ou recursos"
24 24
25 -#: amadeus/templates/base.html:102 25 +#: amadeus/templates/base.html:94
26 msgid "settings" 26 msgid "settings"
27 msgstr "configurações" 27 msgstr "configurações"
28 28
29 -#: amadeus/templates/base.html:105 29 +#: amadeus/templates/base.html:97
30 msgid "Settings" 30 msgid "Settings"
31 msgstr "Configurações" 31 msgstr "Configurações"
32 32
33 -#: amadeus/templates/base.html:108 33 +#: amadeus/templates/base.html:100
34 msgid "Manage Users" 34 msgid "Manage Users"
35 msgstr "Gerenciar Usuários" 35 msgstr "Gerenciar Usuários"
36 36
37 -#: amadeus/templates/base.html:109 37 +#: amadeus/templates/base.html:101
38 msgid "Manage Categories" 38 msgid "Manage Categories"
39 msgstr "Gerenciar Categorias" 39 msgstr "Gerenciar Categorias"
40 40
41 -#: amadeus/templates/base.html:116 41 +#: amadeus/templates/base.html:108
42 msgid "System" 42 msgid "System"
43 msgstr "Sistema" 43 msgstr "Sistema"
44 44
45 -#: amadeus/templates/base.html:123 45 +#: amadeus/templates/base.html:115
46 msgid "Mail Sender" 46 msgid "Mail Sender"
47 msgstr "Remetente de Email" 47 msgstr "Remetente de Email"
48 48
49 -#: amadeus/templates/base.html:124 49 +#: amadeus/templates/base.html:116
50 msgid "Security" 50 msgid "Security"
51 msgstr "Segurança" 51 msgstr "Segurança"
52 52
53 -#: amadeus/templates/base.html:125 53 +#: amadeus/templates/base.html:117
54 msgid "Theme" 54 msgid "Theme"
55 msgstr "Temas" 55 msgstr "Temas"
56 56
57 -#: amadeus/templates/base.html:142 57 +#: amadeus/templates/base.html:134
58 msgid "Profile" 58 msgid "Profile"
59 msgstr "Perfil" 59 msgstr "Perfil"
60 60
61 -#: amadeus/templates/base.html:143 61 +#: amadeus/templates/base.html:135
62 msgid "Edit Profile" 62 msgid "Edit Profile"
63 msgstr "Editar Perfil" 63 msgstr "Editar Perfil"
64 64
65 -#: amadeus/templates/base.html:144 65 +#: amadeus/templates/base.html:136
66 msgid "Change Password" 66 msgid "Change Password"
67 msgstr "Alterar Senha" 67 msgstr "Alterar Senha"
68 68
69 -#: amadeus/templates/base.html:145 69 +#: amadeus/templates/base.html:137
70 msgid "Delete Account" 70 msgid "Delete Account"
71 msgstr "Remover Conta" 71 msgstr "Remover Conta"
72 72
73 -#: amadeus/templates/base.html:146 73 +#: amadeus/templates/base.html:138
74 msgid "Logout" 74 msgid "Logout"
75 msgstr "Sair" 75 msgstr "Sair"
76 76
77 -#: amadeus/templates/base.html:159 amadeus/templates/base.html:203 77 +#: amadeus/templates/base.html:151 amadeus/templates/base.html:195
78 msgid "Subjects" 78 msgid "Subjects"
79 msgstr "Assuntos" 79 msgstr "Assuntos"
80 80
81 -#: amadeus/templates/base.html:164 amadeus/templates/base.html:208 81 +#: amadeus/templates/base.html:156 amadeus/templates/base.html:200
82 msgid "Timeline" 82 msgid "Timeline"
83 msgstr "Timeline" 83 msgstr "Timeline"
84 84
85 -#: amadeus/templates/base.html:167 amadeus/templates/base.html:211 85 +#: amadeus/templates/base.html:159 amadeus/templates/base.html:203
86 msgid "Messages" 86 msgid "Messages"
87 msgstr "Mensagens" 87 msgstr "Mensagens"
88 88
89 -#: amadeus/templates/base.html:170 amadeus/templates/base.html:214 89 +#: amadeus/templates/base.html:162 amadeus/templates/base.html:206
90 msgid "Pendencias" 90 msgid "Pendencias"
91 msgstr "Pendências" 91 msgstr "Pendências"
92 92
93 -#: amadeus/templates/base.html:173 amadeus/templates/base.html:217 93 +#: amadeus/templates/base.html:165 amadeus/templates/base.html:209
94 msgid "Analytics" 94 msgid "Analytics"
95 msgstr "Analytics" 95 msgstr "Analytics"
96 96
amadeus/permissions.py
  Diff comments   View file @001e110
@@ -39,7 +39,7 @@ def has_resource_permissions(user, resource): @@ -39,7 +39,7 @@ def has_resource_permissions(user, resource):
39 39
40 if resource.visible or resource.topic.repository: 40 if resource.visible or resource.topic.repository:
41 if resource.all_students: 41 if resource.all_students:
42 - if subject.students.filter(id = user.id).exists(): 42 + if resource.topic.subject.students.filter(id = user.id).exists():
43 return True 43 return True
44 44
45 if resource.students.filter(id = user.id).exists(): 45 if resource.students.filter(id = user.id).exists():
amadeus/static/css/base/amadeus.css
  Diff comments   View file @001e110
@@ -779,6 +779,7 @@ a.add-row { @@ -779,6 +779,7 @@ a.add-row {
779 779
780 .resource_list .list-group-item .list-group-item-heading { 780 .resource_list .list-group-item .list-group-item-heading {
781 font-weight: 500; 781 font-weight: 500;
  782 + font-size: 16px;
782 } 783 }
783 784
784 .resource_list .btn-group { 785 .resource_list .btn-group {
amadeus/static/js/topics.js
  Diff comments   View file @001e110
@@ -76,9 +76,9 @@ function delete_topic(url) { @@ -76,9 +76,9 @@ function delete_topic(url) {
76 } 76 }
77 77
78 $(".add_resource").on('show.bs.dropdown', function () { 78 $(".add_resource").on('show.bs.dropdown', function () {
79 - $(this).find('i').switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad"); 79 + $(this).find('i.fa-angle-right').switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad");
80 }); 80 });
81 81
82 $(".add_resource").on('hide.bs.dropdown', function () { 82 $(".add_resource").on('hide.bs.dropdown', function () {
83 - $(this).find('i').switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad"); 83 + $(this).find('i.fa-angle-down').switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad");
84 }); 84 });
85 \ No newline at end of file 85 \ No newline at end of file
amadeus/templatetags/permissions_tags.py
  Diff comments   View file @001e110
@@ -10,4 +10,8 @@ def subject_permissions(user, subject): @@ -10,4 +10,8 @@ def subject_permissions(user, subject):
10 10
11 @register.assignment_tag 11 @register.assignment_tag
12 def subject_view_permissions(user, subject): 12 def subject_view_permissions(user, subject):
13 - return permissions.has_subject_view_permissions(user, subject)  
14 \ No newline at end of file 13 \ No newline at end of file
  14 + return permissions.has_subject_view_permissions(user, subject)
  15 +
  16 +@register.assignment_tag
  17 +def resource_permissions(user, resource):
  18 + return permissions.has_resource_permissions(user, resource)
15 \ No newline at end of file 19 \ No newline at end of file
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
@@ -18,6 +18,10 @@ msgstr &quot;&quot; @@ -18,6 +18,10 @@ msgstr &quot;&quot;
18 "Content-Transfer-Encoding: 8bit\n" 18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n" 19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20 20
  21 +#: categories/forms.py:23
  22 +msgid "There is another category with this name, try another one."
  23 +msgstr ""
  24 +
21 #: categories/models.py:9 25 #: categories/models.py:9
22 msgid "Name" 26 msgid "Name"
23 msgstr "Nome" 27 msgstr "Nome"
@@ -157,7 +161,7 @@ msgstr &quot;Replicar Categoria&quot; @@ -157,7 +161,7 @@ msgstr &quot;Replicar Categoria&quot;
157 msgid "Category \"%s\" register successfully!" 161 msgid "Category \"%s\" register successfully!"
158 msgstr "Categoria \"%s\" foi registrada com sucesso!" 162 msgstr "Categoria \"%s\" foi registrada com sucesso!"
159 163
160 -#: categories/views.py:150 164 +#: categories/views.py:166
161 msgid "" 165 msgid ""
162 "The category cannot be removed, it contains one or more virtual enviroments " 166 "The category cannot be removed, it contains one or more virtual enviroments "
163 "attach." 167 "attach."
@@ -165,16 +169,16 @@ msgstr &quot;&quot; @@ -165,16 +169,16 @@ msgstr &quot;&quot;
165 "A categoria não pode ser removida, ela contém um ou mais ambientes virtuais " 169 "A categoria não pode ser removida, ela contém um ou mais ambientes virtuais "
166 "vinculados." 170 "vinculados."
167 171
168 -#: categories/views.py:163 172 +#: categories/views.py:179
169 #, python-format 173 #, python-format
170 msgid "Category \"%s\" removed successfully!" 174 msgid "Category \"%s\" removed successfully!"
171 msgstr "Categoria \"%s\" removida com sucesso!" 175 msgstr "Categoria \"%s\" removida com sucesso!"
172 176
173 -#: categories/views.py:191 177 +#: categories/views.py:207
174 #, python-format 178 #, python-format
175 msgid "Category \"%s\" updated successfully!" 179 msgid "Category \"%s\" updated successfully!"
176 msgstr "Categoria \"%s\" atualizada com sucesso!" 180 msgstr "Categoria \"%s\" atualizada com sucesso!"
177 181
178 -#: categories/views.py:208 182 +#: categories/views.py:224
179 msgid "Update Category" 183 msgid "Update Category"
180 msgstr "Atualizar Categoria" 184 msgstr "Atualizar Categoria"
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
mailsender/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
pendencies/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @001e110
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-24 15:26-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +
  21 +#: pendencies/forms.py:38 pendencies/forms.py:41 pendencies/forms.py:44
  22 +msgid "This field is required."
  23 +msgstr ""
  24 +
  25 +#: pendencies/forms.py:49
  26 +msgid "This input should be filled with a date equal or before the End Date."
  27 +msgstr ""
  28 +
  29 +#: pendencies/forms.py:50
  30 +msgid "This input should be filled with a date equal or after the Begin Date."
  31 +msgstr ""
  32 +
  33 +#: pendencies/forms.py:57 pendencies/forms.py:67
  34 +msgid "This input should be filled with a date equal or after today's date."
  35 +msgstr ""
  36 +
  37 +#: pendencies/forms.py:60 pendencies/forms.py:70
  38 +msgid ""
  39 +"This input should be filled with a date equal or after the subject begin "
  40 +"date."
  41 +msgstr ""
  42 +
  43 +#: pendencies/forms.py:63
  44 +msgid ""
  45 +"This input should be filled with a date equal or after the subject end date."
  46 +msgstr ""
  47 +
  48 +#: pendencies/forms.py:73
  49 +msgid ""
  50 +"This input should be filled with a date equal or before the subject end date."
  51 +msgstr ""
  52 +
  53 +#: pendencies/models.py:8
  54 +msgid "Action"
  55 +msgstr ""
  56 +
  57 +#: pendencies/models.py:8
  58 +msgid "Visualize"
  59 +msgstr ""
  60 +
  61 +#: pendencies/models.py:8
  62 +msgid "Create"
  63 +msgstr ""
  64 +
  65 +#: pendencies/models.py:8
  66 +msgid "Answer"
  67 +msgstr ""
  68 +
  69 +#: pendencies/models.py:8
  70 +msgid "Access"
  71 +msgstr ""
  72 +
  73 +#: pendencies/models.py:9
  74 +msgid "Begin Date"
  75 +msgstr ""
  76 +
  77 +#: pendencies/models.py:10
  78 +msgid "End Date"
  79 +msgstr ""
  80 +
  81 +#: pendencies/models.py:11
  82 +msgid "Limit Date"
  83 +msgstr ""
  84 +
  85 +#: pendencies/models.py:12
  86 +msgid "Resource"
  87 +msgstr ""
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
students_group/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
subjects/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
@@ -22,8 +22,12 @@ msgstr &quot;&quot; @@ -22,8 +22,12 @@ msgstr &quot;&quot;
22 msgid "Tags" 22 msgid "Tags"
23 msgstr "Tags" 23 msgstr "Tags"
24 24
25 -#: subjects/forms.py:78 subjects/forms.py:87 subjects/forms.py:95  
26 -#: subjects/forms.py:103 25 +#: subjects/forms.py:82
  26 +msgid "There is another subject with this name, try another one."
  27 +msgstr ""
  28 +
  29 +#: subjects/forms.py:91 subjects/forms.py:100 subjects/forms.py:108
  30 +#: subjects/forms.py:116
27 msgid "this date must be today or after" 31 msgid "this date must be today or after"
28 msgstr "Essa data deve ser hoje ou depois disso" 32 msgstr "Essa data deve ser hoje ou depois disso"
29 33
@@ -111,12 +115,13 @@ msgstr &quot;Deletar&quot; @@ -111,12 +115,13 @@ msgstr &quot;Deletar&quot;
111 msgid "Palavras-chave mais populares" 115 msgid "Palavras-chave mais populares"
112 msgstr "Palavras-chave mais populares" 116 msgstr "Palavras-chave mais populares"
113 117
114 -#: subjects/templates/subjects/initial.html:29 118 +#: subjects/templates/subjects/initial.html:44
115 msgid "Meus Assuntos" 119 msgid "Meus Assuntos"
116 msgstr "Meus Assuntos" 120 msgstr "Meus Assuntos"
117 121
118 -#: subjects/templates/subjects/initial.html:42  
119 -#: subjects/templates/subjects/list.html:187 122 +#: subjects/templates/subjects/initial.html:57
  123 +#: subjects/templates/subjects/list.html:186
  124 +#: subjects/templates/subjects/list_search.html:59
120 msgid "You still do not posses any subject in our platform" 125 msgid "You still do not posses any subject in our platform"
121 msgstr "Você ainda não possui assuntos em nossa plataforma" 126 msgstr "Você ainda não possui assuntos em nossa plataforma"
122 127
@@ -131,92 +136,92 @@ msgid &quot;All subjects&quot; @@ -131,92 +136,92 @@ msgid &quot;All subjects&quot;
131 msgstr "Todos os assuntos" 136 msgstr "Todos os assuntos"
132 137
133 #: subjects/templates/subjects/list.html:75 138 #: subjects/templates/subjects/list.html:75
134 -#: subjects/templates/subjects/list.html:142  
135 -#: subjects/templates/subjects/subject_card.html:19  
136 -#: subjects/templates/subjects/subject_card.html:83  
137 -#: subjects/templates/subjects/view.html:49 139 +#: subjects/templates/subjects/list.html:140
  140 +#: subjects/templates/subjects/subject_card.html:29
  141 +#: subjects/templates/subjects/view.html:51
138 msgid "Replicate" 142 msgid "Replicate"
139 msgstr "Replicar" 143 msgstr "Replicar"
140 144
141 #: subjects/templates/subjects/list.html:77 145 #: subjects/templates/subjects/list.html:77
142 -#: subjects/templates/subjects/list.html:144  
143 -#: subjects/templates/subjects/subject_card.html:20  
144 -#: subjects/templates/subjects/subject_card.html:84  
145 -#: subjects/templates/subjects/view.html:50 146 +#: subjects/templates/subjects/list.html:142
  147 +#: subjects/templates/subjects/subject_card.html:31
  148 +#: subjects/templates/subjects/view.html:53
146 msgid "Edit" 149 msgid "Edit"
147 msgstr "Editar" 150 msgstr "Editar"
148 151
149 #: subjects/templates/subjects/list.html:79 152 #: subjects/templates/subjects/list.html:79
150 -#: subjects/templates/subjects/list.html:145  
151 -#: subjects/templates/subjects/subject_card.html:22  
152 -#: subjects/templates/subjects/subject_card.html:85  
153 -#: subjects/templates/subjects/view.html:52 153 +#: subjects/templates/subjects/list.html:143
  154 +#: subjects/templates/subjects/subject_card.html:33
  155 +#: subjects/templates/subjects/view.html:55
154 msgid "Remove" 156 msgid "Remove"
155 msgstr "Remover" 157 msgstr "Remover"
156 158
157 -#: subjects/templates/subjects/list.html:95  
158 -#: subjects/templates/subjects/list.html:160 159 +#: subjects/templates/subjects/list.html:97
  160 +#: subjects/templates/subjects/list.html:161
159 msgid "Coordinator(s) " 161 msgid "Coordinator(s) "
160 msgstr "Coordenador(es) " 162 msgstr "Coordenador(es) "
161 163
162 -#: subjects/templates/subjects/list.html:99  
163 -#: subjects/templates/subjects/list.html:164 164 +#: subjects/templates/subjects/list.html:101
  165 +#: subjects/templates/subjects/list.html:165
164 msgid "It doesn't possess coordinators" 166 msgid "It doesn't possess coordinators"
165 msgstr "Não possui coordenadores" 167 msgstr "Não possui coordenadores"
166 168
167 -#: subjects/templates/subjects/list.html:105  
168 -#: subjects/templates/subjects/list.html:170 169 +#: subjects/templates/subjects/list.html:107
  170 +#: subjects/templates/subjects/list.html:171
169 msgid "Create new subject" 171 msgid "Create new subject"
170 msgstr "Criar novo assunto" 172 msgstr "Criar novo assunto"
171 173
172 -#: subjects/templates/subjects/subject_card.html:21  
173 -#: subjects/templates/subjects/view.html:51 174 +#: subjects/templates/subjects/list_search.html:33
  175 +#: subjects/templates/subjects/list_search.html:36 subjects/views.py:527
  176 +#: subjects/views.py:534
  177 +#, fuzzy
  178 +#| msgid "My Subjects"
  179 +msgid "Subjects"
  180 +msgstr "Meus assuntos"
  181 +
  182 +#: subjects/templates/subjects/list_search.html:34
  183 +#: subjects/templates/subjects/list_search.html:37
  184 +msgid "Resources"
  185 +msgstr ""
  186 +
  187 +#: subjects/templates/subjects/list_search.html:43
  188 +msgid "Search results"
  189 +msgstr ""
  190 +
  191 +#: subjects/templates/subjects/subject_card.html:32
  192 +#: subjects/templates/subjects/view.html:54
174 msgid "Groups" 193 msgid "Groups"
175 msgstr "Grupos" 194 msgstr "Grupos"
176 195
177 -#: subjects/templates/subjects/subject_card.html:37  
178 -#: subjects/templates/subjects/subject_card.html:100  
179 -#: subjects/templates/subjects/view.html:67 196 +#: subjects/templates/subjects/subject_card.html:48
180 msgid "Professor(s) " 197 msgid "Professor(s) "
181 msgstr "Professor(es) " 198 msgstr "Professor(es) "
182 199
183 -#: subjects/templates/subjects/subject_card.html:41  
184 -#: subjects/templates/subjects/subject_card.html:104  
185 -#: subjects/templates/subjects/view.html:71 200 +#: subjects/templates/subjects/subject_card.html:52
186 msgid "It doesn't possess professors" 201 msgid "It doesn't possess professors"
187 msgstr "Não possui professores" 202 msgstr "Não possui professores"
188 203
189 -#: subjects/templates/subjects/subject_card.html:45  
190 -#: subjects/templates/subjects/subject_card.html:108  
191 -#: subjects/templates/subjects/view.html:75 204 +#: subjects/templates/subjects/subject_card.html:56
192 msgid "Beginning" 205 msgid "Beginning"
193 msgstr "Início" 206 msgstr "Início"
194 207
195 -#: subjects/templates/subjects/subject_card.html:48  
196 -#: subjects/templates/subjects/subject_card.html:111  
197 -#: subjects/templates/subjects/view.html:78 208 +#: subjects/templates/subjects/subject_card.html:59
198 msgid "End" 209 msgid "End"
199 msgstr "Fim" 210 msgstr "Fim"
200 211
201 -#: subjects/templates/subjects/subject_card.html:58 212 +#: subjects/templates/subjects/subject_card.html:69
202 msgid "Access Subject" 213 msgid "Access Subject"
203 msgstr "Acessar Assunto" 214 msgstr "Acessar Assunto"
204 215
205 -#: subjects/templates/subjects/subject_card.html:60 216 +#: subjects/templates/subjects/subject_card.html:71
206 msgid "Subscribe to Subject" 217 msgid "Subscribe to Subject"
207 msgstr "Inscrever-se no Assunto" 218 msgstr "Inscrever-se no Assunto"
208 219
209 -#: subjects/templates/subjects/subject_card.html:119  
210 -msgid "ACESS SUBJECT"  
211 -msgstr "Acessar assunto"  
212 -  
213 -#: subjects/templates/subjects/subject_card.html:121  
214 -msgid "SUBSCRIBE TO SUBJECT"  
215 -msgstr "Inscrever-se no assunto"  
216 -  
217 #: subjects/templates/subjects/subscribe.html:10 220 #: subjects/templates/subjects/subscribe.html:10
218 -msgid "Delete Subject"  
219 -msgstr "Deletar Assunto" 221 +#, fuzzy
  222 +#| msgid "Subscribe to Subject"
  223 +msgid "Subscribe To Subject"
  224 +msgstr "Inscrever-se no Assunto"
220 225
221 #: subjects/templates/subjects/subscribe.html:17 226 #: subjects/templates/subjects/subscribe.html:17
222 msgid "Are you sure you want to subscribe to the subject" 227 msgid "Are you sure you want to subscribe to the subject"
@@ -234,55 +239,55 @@ msgstr &quot;Ok&quot; @@ -234,55 +239,55 @@ msgstr &quot;Ok&quot;
234 msgid "Update: " 239 msgid "Update: "
235 msgstr "Editar: " 240 msgstr "Editar: "
236 241
237 -#: subjects/templates/subjects/view.html:85 242 +#: subjects/templates/subjects/view.html:70
238 msgid "Create new topic" 243 msgid "Create new topic"
239 msgstr "Criar novo tópico" 244 msgstr "Criar novo tópico"
240 245
241 -#: subjects/views.py:52 246 +#: subjects/views.py:55
242 msgid "Home" 247 msgid "Home"
243 msgstr "Início" 248 msgstr "Início"
244 249
245 -#: subjects/views.py:119 250 +#: subjects/views.py:151
246 msgid "Page is not 'last', nor can it be converted to an int." 251 msgid "Page is not 'last', nor can it be converted to an int."
247 msgstr "" 252 msgstr ""
248 "Página não é a 'última', e também não pode ser convertido para um inteiro" 253 "Página não é a 'última', e também não pode ser convertido para um inteiro"
249 254
250 -#: subjects/views.py:125 255 +#: subjects/views.py:157
251 #, python-format 256 #, python-format
252 msgid "Invalid page (%(page_number)s): %(message)s" 257 msgid "Invalid page (%(page_number)s): %(message)s"
253 msgstr "Página inválida (%(page_number)s): %(message)s" 258 msgstr "Página inválida (%(page_number)s): %(message)s"
254 259
255 -#: subjects/views.py:148 260 +#: subjects/views.py:180
256 msgid "My Subjects" 261 msgid "My Subjects"
257 msgstr "Meus assuntos" 262 msgstr "Meus assuntos"
258 263
259 -#: subjects/views.py:155 264 +#: subjects/views.py:187
260 msgid "All Subjects" 265 msgid "All Subjects"
261 msgstr "Todos os assuntos" 266 msgstr "Todos os assuntos"
262 267
263 -#: subjects/views.py:197 268 +#: subjects/views.py:282
264 msgid "Create Subject" 269 msgid "Create Subject"
265 msgstr "Criar Assunto" 270 msgstr "Criar Assunto"
266 271
267 -#: subjects/views.py:203 272 +#: subjects/views.py:288
268 msgid "Replicate Subject" 273 msgid "Replicate Subject"
269 msgstr "Replicar Assunto" 274 msgstr "Replicar Assunto"
270 275
271 -#: subjects/views.py:234 276 +#: subjects/views.py:319
272 #, python-format 277 #, python-format
273 msgid "Subject \"%s\" was registered on \"%s\" successfully!" 278 msgid "Subject \"%s\" was registered on \"%s\" successfully!"
274 msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!" 279 msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!"
275 280
276 -#: subjects/views.py:247 281 +#: subjects/views.py:351
277 msgid "Update Subject" 282 msgid "Update Subject"
278 msgstr "Atualizar Assunto" 283 msgstr "Atualizar Assunto"
279 284
280 -#: subjects/views.py:258 285 +#: subjects/views.py:362
281 #, python-format 286 #, python-format
282 msgid "Subject \"%s\" was updated on \"%s\" successfully!" 287 msgid "Subject \"%s\" was updated on \"%s\" successfully!"
283 msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!" 288 msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!"
284 289
285 -#: subjects/views.py:275 290 +#: subjects/views.py:389
286 msgid "" 291 msgid ""
287 "Subject can't be removed. The subject still possess students and learning " 292 "Subject can't be removed. The subject still possess students and learning "
288 "objects associated" 293 "objects associated"
@@ -290,16 +295,25 @@ msgstr &quot;&quot; @@ -290,16 +295,25 @@ msgstr &quot;&quot;
290 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de " 295 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
291 "aprendizado associados" 296 "aprendizado associados"
292 297
293 -#: subjects/views.py:297 298 +#: subjects/views.py:411
294 #, fuzzy, python-format 299 #, fuzzy, python-format
295 #| msgid "Subject removed successfully!" 300 #| msgid "Subject removed successfully!"
296 msgid "Subject \"%s\" removed successfully!" 301 msgid "Subject \"%s\" removed successfully!"
297 msgstr "Assunto removido com sucesso!" 302 msgstr "Assunto removido com sucesso!"
298 303
299 -#: subjects/views.py:330 304 +#: subjects/views.py:475
300 msgid "Subscription date is due!" 305 msgid "Subscription date is due!"
301 msgstr "O período de inscrição está encerrado!" 306 msgstr "O período de inscrição está encerrado!"
302 307
303 -#: subjects/views.py:334 308 +#: subjects/views.py:479
304 msgid "Subscription was successfull!" 309 msgid "Subscription was successfull!"
305 msgstr "Inscrição feita com sucesso!" 310 msgstr "Inscrição feita com sucesso!"
  311 +
  312 +#~ msgid "ACESS SUBJECT"
  313 +#~ msgstr "Acessar assunto"
  314 +
  315 +#~ msgid "SUBSCRIBE TO SUBJECT"
  316 +#~ msgstr "Inscrever-se no assunto"
  317 +
  318 +#~ msgid "Delete Subject"
  319 +#~ msgstr "Deletar Assunto"
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
topics/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
@@ -26,50 +26,92 @@ msgstr &quot;Esse assunto já possui um repositório&quot; @@ -26,50 +26,92 @@ msgstr &quot;Esse assunto já possui um repositório&quot;
26 msgid "This subject already has a topic with this name" 26 msgid "This subject already has a topic with this name"
27 msgstr "Esse assunto já possui um tópico com esse nome" 27 msgstr "Esse assunto já possui um tópico com esse nome"
28 28
29 -#: topics/models.py:8 29 +#: topics/models.py:12 topics/models.py:51
30 msgid "Name" 30 msgid "Name"
31 msgstr "Nome" 31 msgstr "Nome"
32 32
33 -#: topics/models.py:9 33 +#: topics/models.py:13 topics/models.py:52
34 msgid "Slug" 34 msgid "Slug"
35 msgstr "Slug" 35 msgstr "Slug"
36 36
37 -#: topics/models.py:10 37 +#: topics/models.py:14
38 msgid "Description" 38 msgid "Description"
39 msgstr "Descrição" 39 msgstr "Descrição"
40 40
41 -#: topics/models.py:11 41 +#: topics/models.py:15
42 msgid "Repository" 42 msgid "Repository"
43 msgstr "Repositório" 43 msgstr "Repositório"
44 44
45 -#: topics/models.py:12 45 +#: topics/models.py:16 topics/models.py:56
46 msgid "Visible" 46 msgid "Visible"
47 msgstr "Visível" 47 msgstr "Visível"
48 48
49 -#: topics/models.py:13 49 +#: topics/models.py:17
50 msgid "Subject" 50 msgid "Subject"
51 msgstr "Assunto" 51 msgstr "Assunto"
52 52
53 -#: topics/models.py:14 53 +#: topics/models.py:18 topics/models.py:57
54 msgid "Order" 54 msgid "Order"
55 msgstr "Ordem" 55 msgstr "Ordem"
56 56
57 -#: topics/models.py:15 57 +#: topics/models.py:19 topics/models.py:62
58 msgid "Create Date" 58 msgid "Create Date"
59 msgstr "Data de criação" 59 msgstr "Data de criação"
60 60
61 -#: topics/models.py:16 61 +#: topics/models.py:20 topics/models.py:63
62 msgid "Last Update" 62 msgid "Last Update"
63 msgstr "Última Atualização" 63 msgstr "Última Atualização"
64 64
65 -#: topics/models.py:19 65 +#: topics/models.py:23 topics/models.py:58
66 msgid "Topic" 66 msgid "Topic"
67 msgstr "Tópico" 67 msgstr "Tópico"
68 68
69 -#: topics/models.py:20 69 +#: topics/models.py:24
70 msgid "Topics" 70 msgid "Topics"
71 msgstr "Tópicos" 71 msgstr "Tópicos"
72 72
  73 +#: topics/models.py:53
  74 +#, fuzzy
  75 +#| msgid "Description"
  76 +msgid "Brief Description"
  77 +msgstr "Descrição"
  78 +
  79 +#: topics/models.py:54
  80 +msgid "Show in new window"
  81 +msgstr "Exibir em nova janela"
  82 +
  83 +#: topics/models.py:55
  84 +msgid "All Students"
  85 +msgstr "Todos os estudantes habilitados para acessar o recurso"
  86 +
  87 +#: topics/models.py:59
  88 +msgid "Students"
  89 +msgstr "Estudantes"
  90 +
  91 +#: topics/models.py:60
  92 +msgid "Groups"
  93 +msgstr "Grupos de Estudo"
  94 +
  95 +#: topics/models.py:61
  96 +msgid "Markers"
  97 +msgstr "Marcadores"
  98 +
  99 +#: topics/models.py:66
  100 +msgid "Resource"
  101 +msgstr "Recurso"
  102 +
  103 +#: topics/models.py:67
  104 +msgid "Resources"
  105 +msgstr "Recursos"
  106 +
  107 +#: topics/templates/resources/list.html:30 topics/templates/topics/list.html:28
  108 +msgid "Edit"
  109 +msgstr "Editar"
  110 +
  111 +#: topics/templates/resources/list.html:31 topics/templates/topics/list.html:29
  112 +msgid "Remove"
  113 +msgstr "Remover"
  114 +
73 #: topics/templates/topics/_form.html:21 115 #: topics/templates/topics/_form.html:21
74 msgid "Only one topic per subject can be a repository" 116 msgid "Only one topic per subject can be a repository"
75 msgstr "Apenas um tópico por asssunto pode ser um repositório" 117 msgstr "Apenas um tópico por asssunto pode ser um repositório"
@@ -98,13 +140,29 @@ msgstr &quot;Fechar&quot; @@ -98,13 +140,29 @@ msgstr &quot;Fechar&quot;
98 msgid "Delete" 140 msgid "Delete"
99 msgstr "Deletar" 141 msgstr "Deletar"
100 142
101 -#: topics/templates/topics/list.html:28  
102 -msgid "Edit"  
103 -msgstr "Editar" 143 +#: topics/templates/topics/list.html:49
  144 +msgid "Add Resource"
  145 +msgstr "Adicionar Recurso"
104 146
105 -#: topics/templates/topics/list.html:29  
106 -msgid "Remove"  
107 -msgstr "Remover" 147 +#: topics/templates/topics/list.html:52
  148 +msgid "Video Embed"
  149 +msgstr "Embed de Vídeo"
  150 +
  151 +#: topics/templates/topics/list.html:53
  152 +msgid "Forum"
  153 +msgstr "Fórum"
  154 +
  155 +#: topics/templates/topics/list.html:54
  156 +msgid "File Link"
  157 +msgstr "Link para arquivo"
  158 +
  159 +#: topics/templates/topics/list.html:55
  160 +msgid "Webpage"
  161 +msgstr "Página Web"
  162 +
  163 +#: topics/templates/topics/list.html:56
  164 +msgid "Questionary"
  165 +msgstr "Questionário"
108 166
109 #: topics/templates/topics/update.html:8 topics/views.py:103 167 #: topics/templates/topics/update.html:8 topics/views.py:103
110 msgid "Update Topic" 168 msgid "Update Topic"
@@ -120,7 +178,11 @@ msgstr &quot;Tópico \&quot;%s\&quot; foi criado no ambiente virtual \&quot;%s\&quot; com sucesso!&quot; @@ -120,7 +178,11 @@ msgstr &quot;Tópico \&quot;%s\&quot; foi criado no ambiente virtual \&quot;%s\&quot; com sucesso!&quot;
120 msgid "Topic \"%s\" was updated on virtual enviroment \"%s\" successfully!" 178 msgid "Topic \"%s\" was updated on virtual enviroment \"%s\" successfully!"
121 msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!" 179 msgstr "Tópico \"%s\" foi atualizado no ambiente virtual \"%s\" com sucesso!"
122 180
123 -#: topics/views.py:135 181 +#: topics/views.py:138
  182 +msgid "Could not remove this topic. It has on or more resources attached."
  183 +msgstr "Não é possível remover esse tópico. Ele possui um ou mais recursos vinculados."
  184 +
  185 +#: topics/views.py:147
124 #, python-format 186 #, python-format
125 msgid "Topic \"%s\" was removed from virtual enviroment \"%s\" successfully!" 187 msgid "Topic \"%s\" was removed from virtual enviroment \"%s\" successfully!"
126 msgstr "Tópico \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!" 188 msgstr "Tópico \"%s\" foi removido do ambiente virtual \"%s\" com sucesso!"
topics/templates/resources/list.html
  Diff comments   View file @001e110
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
5 5
6 <div id="resource_{{ topic.slug }}" class="list-group resource_list"> 6 <div id="resource_{{ topic.slug }}" class="list-group resource_list">
7 {% for resource in topic.resource_topic.all %} 7 {% for resource in topic.resource_topic.all %}
8 - {% if resource.visible or has_subject_permissions %} 8 + {% resource_permissions request.user resource as has_resource_permissions %}
  9 +
  10 + {% if has_resource_permissions %}
9 <div class="list-group-item {% if not resource.visible %}disabled{% endif %}"> 11 <div class="list-group-item {% if not resource.visible %}disabled{% endif %}">
10 <input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" /> 12 <input type="hidden" class="id_inp" name="id" value="{{ resource.id }}" />
11 <input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" /> 13 <input type="hidden" class="order_inp" name="order" value="{{ resource.order }}" />
topics/templates/topics/list.html
  Diff comments   View file @001e110
@@ -49,11 +49,11 @@ @@ -49,11 +49,11 @@
49 <i class="fa fa-angle-right"></i> {% trans 'Add Resource' %} 49 <i class="fa fa-angle-right"></i> {% trans 'Add Resource' %}
50 </button> 50 </button>
51 <ul class="dropdown-menu"> 51 <ul class="dropdown-menu">
52 - <li><a href="#">{% trans 'Video Embed' %}</a></li>  
53 - <li><a href="#">{% trans 'Forum' %}</a></li>  
54 - <li><a href="#">{% trans 'File Link' %}</a></li>  
55 - <li><a href="{% url 'webpages:create' topic.slug %}">{% trans 'Webpage' %}</a></li>  
56 - <li><a href="#">{% trans 'Questionary' %}</a></li> 52 + <li><a href="#"><i class="fa fa-video-camera"></i> {% trans 'Video Embed' %}</a></li>
  53 + <li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li>
  54 + <li><a href="#"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li>
  55 + <li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-o"></i> {% trans 'Webpage' %}</a></li>
  56 + <li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li>
57 </ul> 57 </ul>
58 </div> 58 </div>
59 </div> 59 </div>
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @001e110
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
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: 2017-01-19 14:46-0300\n" 11 +"POT-Creation-Date: 2017-01-24 15:26-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"
webpage/locale/pt_BR/LC_MESSAGES/django.po 0 → 100644
  Diff comments   View file @001e110
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
  1 +# SOME DESCRIPTIVE TITLE.
  2 +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
  3 +# This file is distributed under the same license as the PACKAGE package.
  4 +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  5 +#
  6 +#, fuzzy
  7 +msgid ""
  8 +msgstr ""
  9 +"Project-Id-Version: PACKAGE VERSION\n"
  10 +"Report-Msgid-Bugs-To: \n"
  11 +"POT-Creation-Date: 2017-01-24 15:26-0300\n"
  12 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  13 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  14 +"Language-Team: LANGUAGE <LL@li.org>\n"
  15 +"Language: \n"
  16 +"MIME-Version: 1.0\n"
  17 +"Content-Type: text/plain; charset=UTF-8\n"
  18 +"Content-Transfer-Encoding: 8bit\n"
  19 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
  20 +#: webpage/forms.py:32
  21 +msgid "Tags"
  22 +msgstr "Tags"
  23 +
  24 +#: webpage/forms.py:38
  25 +msgid "Webpage name"
  26 +msgstr "Nome da Página Web"
  27 +
  28 +#: webpage/forms.py:39
  29 +msgid "Webpage content"
  30 +msgstr "Conteúdo da Página Web"
  31 +
  32 +#: webpage/forms.py:60
  33 +msgid "This subject already has a webpage with this name"
  34 +msgstr "Esse assunto já possui uma Página Web com esse nome"
  35 +
  36 +#: webpage/forms.py:71
  37 +msgid "This field is required."
  38 +msgstr "Esse campo é obrigatório."
  39 +
  40 +#: webpage/models.py:8
  41 +msgid "Webpage Content"
  42 +msgstr "Conteúdo da Página Web"
  43 +
  44 +#: webpage/models.py:11
  45 +msgid "WebPage"
  46 +msgstr "Página Web"
  47 +
  48 +#: webpage/models.py:12
  49 +msgid "WebPages"
  50 +msgstr "Páginas Web"
  51 +
  52 +#: webpage/templates/webpages/_form.html:49
  53 +msgid "Common resources settings"
  54 +msgstr "Configurações comuns a todos os recursos"
  55 +
  56 +#: webpage/templates/webpages/_form.html:98
  57 +msgid "Pendencies Notifications"
  58 +msgstr "Notificação de Pendências"
  59 +
  60 +#: webpage/templates/webpages/_form.html:118
  61 +msgid "Action not performed by the user"
  62 +msgstr "Ação não realizada pelo usuário"
  63 +
  64 +#: webpage/templates/webpages/_form.html:144
  65 +msgid "Wished period"
  66 +msgstr "Período desejado"
  67 +
  68 +#: webpage/templates/webpages/_form.html:241
  69 +msgid "Attribute students to webpage"
  70 +msgstr "Atribuir estudantes à Página Web"
  71 +
  72 +#: webpage/templates/webpages/_form.html:261
  73 +msgid "Attribute groups to webpage"
  74 +msgstr "Atribuir grupos de estudo à Página Web"
  75 +
  76 +#: webpage/templates/webpages/_form.html:330
  77 +msgid "Save"
  78 +msgstr "Salvar"
  79 +
  80 +#: webpage/templates/webpages/_form.html:337
  81 +msgid "Add new notification"
  82 +msgstr "Adiciona nova notificação"
  83 +
  84 +#: webpage/templates/webpages/_form.html:338
  85 +msgid "Remove this notification"
  86 +msgstr "Remover essa notificação"
  87 +
  88 +#: webpage/templates/webpages/create.html:21 webpage/views.py:144
  89 +msgid "Create Webpage"
  90 +msgstr "Criar Página Web"
  91 +
  92 +#: webpage/templates/webpages/delete.html:9
  93 +msgid "Are you sure you want delete the webpage"
  94 +msgstr "Você tem certeza que deseja remover a Página Web"
  95 +
  96 +#: webpage/templates/webpages/delete.html:14
  97 +msgid "Close"
  98 +msgstr "Fechar"
  99 +
  100 +#: webpage/templates/webpages/delete.html:17
  101 +msgid "Delete"
  102 +msgstr "Remover"
  103 +
  104 +#: webpage/templates/webpages/update.html:21
  105 +msgid "Edit: "
  106 +msgstr "Editar: "
  107 +
  108 +#: webpage/views.py:155
  109 +#, python-format
  110 +msgid ""
  111 +"The Webpage \"%s\" was added to the Topic \"%s\" of the virtual environment "
  112 +"\"%s\" successfully!"
  113 +msgstr "A Página Web \"%s\" foi adicionado ao tópico \"%s\" do ambiente virtual \"%s\" com sucesso!"
  114 +
  115 +#: webpage/views.py:225
  116 +msgid "Update Webpage"
  117 +msgstr "Atualizar Página Web"
  118 +
  119 +#: webpage/views.py:240
  120 +#, python-format
  121 +msgid "The Webpage \"%s\" was updated successfully!"
  122 +msgstr "A Página Web \"%s\" foi atualizada com sucesso!"
  123 +
  124 +#: webpage/views.py:271
  125 +#, python-format
  126 +msgid ""
  127 +"The webpage \"%s\" was removed successfully from virtual environment \"%s\"!"
  128 +msgstr "A Página Web \"%s\" foi removida do ambiente virtual \"%s\" com sucesso!"
webpage/views.py
  Diff comments   View file @001e110
@@ -237,7 +237,7 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView): @@ -237,7 +237,7 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
237 return context 237 return context
238 238
239 def get_success_url(self): 239 def get_success_url(self):
240 - messages.success(self.request, _('The Webpage "%s" was added to the Topic "%s" of the virtual environment "%s" successfully!')%(self.object.name, self.object.topic.name, self.object.topic.subject.name)) 240 + messages.success(self.request, _('The Webpage "%s" was updated successfully!')%(self.object.name))
241 241
242 success_url = reverse_lazy('webpages:view', kwargs = {'slug': self.object.slug}) 242 success_url = reverse_lazy('webpages:view', kwargs = {'slug': self.object.slug})
243 243