Download as
Browse Code »

Commit d5654a0bc9afd699e899b0fcdd2d27f6d7e1ba64

Authored by Zambom
1 parent 5e2775d7
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Subject Breadcrumbs adjusts

Showing 12 changed files with 57 additions and 24 deletions   Show diff stats
amadeus/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"
categories/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"
log/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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 @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"
security/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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 @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"
@@ -91,6 +91,10 @@ msgstr &quot;Atribuir professores ao assunto&quot; @@ -91,6 +91,10 @@ msgstr &quot;Atribuir professores ao assunto&quot;
91 msgid "Save" 91 msgid "Save"
92 msgstr "Salvar" 92 msgstr "Salvar"
93 93
  94 +#: subjects/templates/subjects/create.html:23
  95 +msgid "Replicate: "
  96 +msgstr "Replicar: "
  97 +
94 #: subjects/templates/subjects/delete.html:10 98 #: subjects/templates/subjects/delete.html:10
95 #: subjects/templates/subjects/subscribe.html:10 99 #: subjects/templates/subjects/subscribe.html:10
96 msgid "Delete Subject" 100 msgid "Delete Subject"
@@ -158,7 +162,7 @@ msgstr &quot;Remover&quot; @@ -158,7 +162,7 @@ msgstr &quot;Remover&quot;
158 #: subjects/templates/subjects/list.html:94 162 #: subjects/templates/subjects/list.html:94
159 #: subjects/templates/subjects/list.html:159 163 #: subjects/templates/subjects/list.html:159
160 msgid "Coordinator(s) " 164 msgid "Coordinator(s) "
161 -msgstr "Coordenador(es)" 165 +msgstr "Coordenador(es) "
162 166
163 #: subjects/templates/subjects/list.html:98 167 #: subjects/templates/subjects/list.html:98
164 #: subjects/templates/subjects/list.html:163 168 #: subjects/templates/subjects/list.html:163
@@ -174,7 +178,7 @@ msgstr &quot;Criar novo assunto&quot; @@ -174,7 +178,7 @@ msgstr &quot;Criar novo assunto&quot;
174 #: subjects/templates/subjects/subject_card.html:99 178 #: subjects/templates/subjects/subject_card.html:99
175 #: subjects/templates/subjects/view.html:66 179 #: subjects/templates/subjects/view.html:66
176 msgid "Professor(s) " 180 msgid "Professor(s) "
177 -msgstr "Professor(es)" 181 +msgstr "Professor(es) "
178 182
179 #: subjects/templates/subjects/subject_card.html:40 183 #: subjects/templates/subjects/subject_card.html:40
180 #: subjects/templates/subjects/subject_card.html:103 184 #: subjects/templates/subjects/subject_card.html:103
@@ -216,6 +220,10 @@ msgstr &quot;Cancelar&quot; @@ -216,6 +220,10 @@ msgstr &quot;Cancelar&quot;
216 msgid "Ok" 220 msgid "Ok"
217 msgstr "Ok" 221 msgstr "Ok"
218 222
  223 +#: subjects/templates/subjects/update.html:20
  224 +msgid "Update: "
  225 +msgstr "Editar: "
  226 +
219 #: subjects/templates/subjects/view.html:84 227 #: subjects/templates/subjects/view.html:84
220 msgid "Create new topic" 228 msgid "Create new topic"
221 msgstr "Criar novo tópico" 229 msgstr "Criar novo tópico"
@@ -236,21 +244,25 @@ msgstr &quot;Todos os assuntos&quot; @@ -236,21 +244,25 @@ msgstr &quot;Todos os assuntos&quot;
236 msgid "Create Subject" 244 msgid "Create Subject"
237 msgstr "Criar Assunto" 245 msgstr "Criar Assunto"
238 246
239 -#: subjects/views.py:188 247 +#: subjects/views.py:167
  248 +msgid "Replicate Subject"
  249 +msgstr "Replicar Assunto"
  250 +
  251 +#: subjects/views.py:195
240 #, python-format 252 #, python-format
241 msgid "Subject \"%s\" was registered on \"%s\" successfully!" 253 msgid "Subject \"%s\" was registered on \"%s\" successfully!"
242 msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!" 254 msgstr "Assunto \"%s\" foi registrado em \"%s\" com sucesso!"
243 255
244 -#: subjects/views.py:201 256 +#: subjects/views.py:208
245 msgid "Update Subject" 257 msgid "Update Subject"
246 msgstr "Atualizar Assunto" 258 msgstr "Atualizar Assunto"
247 259
248 -#: subjects/views.py:212 260 +#: subjects/views.py:219
249 #, python-format 261 #, python-format
250 msgid "Subject \"%s\" was updated on \"%s\" successfully!" 262 msgid "Subject \"%s\" was updated on \"%s\" successfully!"
251 msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!" 263 msgstr "Assunto \"%s\" foi atualizado em \"%s\" com sucesso!"
252 264
253 -#: subjects/views.py:229 265 +#: subjects/views.py:236
254 msgid "" 266 msgid ""
255 "Subject can't be removed. The subject still possess students and learning " 267 "Subject can't be removed. The subject still possess students and learning "
256 "objects associated" 268 "objects associated"
@@ -258,14 +270,14 @@ msgstr &quot;&quot; @@ -258,14 +270,14 @@ msgstr &quot;&quot;
258 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de " 270 "Assunto não pode ser removido. Ele ainda possui alunos e objetos de "
259 "aprendizado associados" 271 "aprendizado associados"
260 272
261 -#: subjects/views.py:249 273 +#: subjects/views.py:256
262 msgid "Subject removed successfully!" 274 msgid "Subject removed successfully!"
263 msgstr "Assunto removido com sucesso!" 275 msgstr "Assunto removido com sucesso!"
264 276
265 -#: subjects/views.py:282 277 +#: subjects/views.py:289
266 msgid "Subscription date is due!" 278 msgid "Subscription date is due!"
267 msgstr "O período de inscrição está encerrado!" 279 msgstr "O período de inscrição está encerrado!"
268 280
269 -#: subjects/views.py:286 281 +#: subjects/views.py:293
270 msgid "Subscription was successfull!" 282 msgid "Subscription was successfull!"
271 msgstr "Inscrição feita com sucesso!" 283 msgstr "Inscrição feita com sucesso!"
subjects/templates/subjects/create.html
  Diff comments   View file @d5654a0
@@ -13,17 +13,28 @@ @@ -13,17 +13,28 @@
13 {% endblock %} 13 {% endblock %}
14 14
15 {% block breadcrumbs %} 15 {% block breadcrumbs %}
16 - {% clear_breadcrumbs %}  
17 - {% breadcrumb 'Home' 'subjects:home' %} 16 + {% clear_breadcrumbs %}
  17 + {% breadcrumb 'Home' 'subjects:home' %}
18 18
19 - {% breadcrumb slug 'subjects:index' %}  
20 - {% breadcrumb 'Create Subject' 'subjects:create' %} 19 + {% if subject %}
  20 + {% breadcrumb subject.category 'subjects:index' %}
  21 + {% breadcrumb subject 'subjects:view' subject.slug %}
  22 +
  23 + {% trans 'Replicate: ' as bread %}
  24 +
  25 + {% with bread|add:subject.name as bread_slug %}
  26 + {% breadcrumb bread_slug 'subjects:create' %}
  27 + {% endwith %}
  28 + {% else %}
  29 + {% breadcrumb slug 'subjects:index' %}
  30 + {% breadcrumb 'Create Subject' 'subjects:create' %}
  31 + {% endif %}
21 {% endblock %} 32 {% endblock %}
22 33
23 {% block content %} 34 {% block content %}
24 <div class="card card-content"> 35 <div class="card card-content">
25 <div class="card-body"> 36 <div class="card-body">
26 - {% include 'subjects/_form.html' %} 37 + {% include 'subjects/_form.html' %}
27 </div> 38 </div>
28 </div> 39 </div>
29 <br clear="all" /> 40 <br clear="all" />
subjects/templates/subjects/update.html
  Diff comments   View file @d5654a0
@@ -15,7 +15,10 @@ @@ -15,7 +15,10 @@
15 15
16 {% block breadcrumbs %} 16 {% block breadcrumbs %}
17 {{ block.super }} 17 {{ block.super }}
18 - {% with 'Update '|add:object.slug as bread_slug %} 18 + {% breadcrumb object.category 'subjects:index' %}
  19 + {% breadcrumb object 'subjects:view' object.slug %}
  20 + {% trans 'Update: ' as bread %}
  21 + {% with bread|add:object.name as bread_slug %}
19 {% breadcrumb bread_slug 'subjects:update' %} 22 {% breadcrumb bread_slug 'subjects:update' %}
20 {% endwith %} 23 {% endwith %}
21 {% endblock %} 24 {% endblock %}
subjects/views.py
  Diff comments   View file @d5654a0
@@ -159,11 +159,18 @@ class SubjectCreateView(LoginRequiredMixin, CreateView): @@ -159,11 +159,18 @@ class SubjectCreateView(LoginRequiredMixin, CreateView):
159 def get_context_data(self, **kwargs): 159 def get_context_data(self, **kwargs):
160 context = super(SubjectCreateView, self).get_context_data(**kwargs) 160 context = super(SubjectCreateView, self).get_context_data(**kwargs)
161 context['title'] = _('Create Subject') 161 context['title'] = _('Create Subject')
  162 +
162 if self.kwargs.get('slug'): 163 if self.kwargs.get('slug'):
163 context['slug'] = self.kwargs['slug'] 164 context['slug'] = self.kwargs['slug']
  165 +
164 if self.kwargs.get('subject_slug'): 166 if self.kwargs.get('subject_slug'):
  167 + context['title'] = _('Replicate Subject')
  168 +
165 subject = get_object_or_404(Subject, slug = self.kwargs['subject_slug']) 169 subject = get_object_or_404(Subject, slug = self.kwargs['subject_slug'])
  170 +
166 context['slug'] = subject.category.slug 171 context['slug'] = subject.category.slug
  172 + context['subject'] = subject
  173 +
167 context['subjects_menu_active'] = 'subjects_menu_active' 174 context['subjects_menu_active'] = 'subjects_menu_active'
168 175
169 return context 176 return context
themes/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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 @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"
users/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @d5654a0
@@ -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-18 15:17-0300\n" 11 +"POT-Creation-Date: 2017-01-18 15:35-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"