updated translation and GUI

fbormann
1 parent 59c770e2
Showing 4 changed files with 48 additions and 38 deletions Show diff stats
amadeus/static/css/base/amadeus.css
reports/forms.py
reports/locale/pt_BR/LC_MESSAGES/django.po
reports/templates/reports/create.html
@@ -448,6 +448,7 @@ a:focus {
     padding-bottom: 200px;
 }
 .panel-info{
+    margin-top: 10px;
 }
 .panel-default{
 }
@@ -33,12 +33,12 @@ class ResourceAndTagForm(forms.Form):
 class CreateInteractionReportForm(forms.Form):
-	topic = forms.ChoiceField( label= _("Topics to select data from"))
-	init_date = forms.DateField()
-	end_date = forms.DateField()
+	topic = forms.ChoiceField( label= _("Topics to select data from"), required=True)
+	init_date = forms.DateField(required=True)
+	end_date = forms.DateField(required=True)
-	from_mural = forms.BooleanField(required=False)
-	from_messages = forms.BooleanField(required=False)
+	from_mural = forms.BooleanField(required=False, label=_("From Mural"))
+	from_messages = forms.BooleanField(required=False, label=_("Messages"))
 	class Meta:
 		fields = ('topic', 'init_date', 'end_date', 'from_mural' , 'from_messages')
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-16 15:36-0300\n"
+"POT-Creation-Date: 2017-03-16 16:47-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,6 +30,14 @@ msgstr &quot;Tag&quot;
 msgid "Topics to select data from"
 msgstr "Tópico do qual os dados serão retirados"
+#: forms.py:40
+msgid "From Mural"
+msgstr "Mural da disciplina"
+
+#: forms.py:41
+msgid "Messages"
+msgstr "Mensagens"
+
 #: forms.py:52
 msgid "All"
 msgstr "Todos"
@@ -68,11 +76,19 @@ msgstr &quot;Dados de Interação&quot;
 #: templates/reports/create.html:40 templates/reports/view.html:46
 msgid "Report Card"
-msgstr "Boletim"
+msgstr "Boletim da Etapa"
 #: templates/reports/create.html:43 templates/reports/view.html:49
 msgid "Participation"
-msgstr "Participação"
+msgstr "Participações"
+
+#: templates/reports/create.html:55
+msgid "add data source"
+msgstr "Adicionar nova fonte de dados"
+
+#: templates/reports/create.html:56
+msgid "remove data source"
+msgstr "Remover esta fonte"
 #: templates/reports/view.html:56
 msgid "Subject"
@@ -164,34 +180,6 @@ msgid &quot;Number of access to mural between 0 a.m to 6a.m. .&quot;
 msgstr ""
 "Número de acessos ao ambiente virtual da disciplina no horário de 24h às 06h."
-#: views.py:233
-msgid "sunday"
-msgstr "domingo"
-
-#: views.py:233
-msgid "monday"
-msgstr "segunda-feira"
-
-#: views.py:233
-msgid "tuesday"
-msgstr "terça-feira"
-
-#: views.py:233
-msgid "wednesday"
-msgstr "quarta-feira"
-
-#: views.py:233
-msgid "thursday"
-msgstr "quinta-feira"
-
-#: views.py:233
-msgid "friday"
-msgstr "sexta-feira"
-
-#: views.py:233
-msgid "saturday"
-msgstr "sábado"
-
 #: views.py:236 views.py:239
 msgid "Number of access to the subject on "
 msgstr "Número de acesso ao subject no "
@@ -207,3 +195,24 @@ msgstr &quot;Classe&quot;
 #: views.py:244
 msgid "Performance"
 msgstr "Desempenho"
+
+#~ msgid "sunday"
+#~ msgstr "domingo"
+
+#~ msgid "monday"
+#~ msgstr "segunda-feira"
+
+#~ msgid "tuesday"
+#~ msgstr "terça-feira"
+
+#~ msgid "wednesday"
+#~ msgstr "quarta-feira"
+
+#~ msgid "thursday"
+#~ msgstr "quinta-feira"
+
+#~ msgid "friday"
+#~ msgstr "sexta-feira"
+
+#~ msgid "saturday"
+#~ msgstr "sábado"
@@ -52,8 +52,8 @@
     $('.resource-tag-formset').formset({
-        addText: 'add data source',
-        deleteText: 'remove data source',
+        addText: "{% trans "add data source" %}",
+        deleteText: "{% trans "remove data source" %}",
         added: function(object){
             var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option
	@@ -52,8 +52,8 @@		@@ -52,8 +52,8 @@
52		52
53		53
54	$('.resource-tag-formset').formset({	54	$('.resource-tag-formset').formset({
55	- addText: 'add data source',
56	- deleteText: 'remove data source',	55	+ addText: "{% trans "add data source" %}",
		56	+ deleteText: "{% trans "remove data source" %}",
57	added: function(object){	57	added: function(object){
58	var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option	58	var form_topic = $("select#id_topic :selected").filter(":selected").val(); //get user selected topic option
59		59