fixed translations and some texts as well as general dashboards most active user…

…s and most used tags chart

fixed translations and some texts as well as general dashboards most active user…
…s and most used tags chart
Felipe Bormann
1 parent a3e249ea
Showing 4 changed files with 47 additions and 33 deletions Show diff stats
dashboards/locale/pt_BR/LC_MESSAGES/django.po
dashboards/static/dashboards/js/behavior.js
dashboards/templates/dashboards/category.html
dashboards/templates/dashboards/general.html
@@ -8,7 +8,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-15 21:13-0300\n"
+"POT-Creation-Date: 2017-05-17 15:26-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,36 +18,41 @@ msgstr &quot;&quot;
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: .\templates\dashboards\category.html:17
+#: .\templates\dashboards\category.html:18
 msgid "Analytics Category"
 msgstr "Análise de Categoria"
-#: .\templates\dashboards\category.html:29
+#: .\templates\dashboards\category.html:31
 #: .\templates\dashboards\general.html:30
 msgid "Platform Report"
 msgstr "Report da Plataforma"
-#: .\templates\dashboards\category.html:32
-#: .\templates\dashboards\category.html:44
+#: .\templates\dashboards\category.html:36
+#: .\templates\dashboards\category.html:48
 #: .\templates\dashboards\general.html:33
 msgid "Category Report"
 msgstr "Report da Categoria"
-#: .\templates\dashboards\category.html:35
+#: .\templates\dashboards\category.html:39
 #: .\templates\dashboards\general.html:36
 msgid "Subject Report"
 msgstr "Report do Assunto"
-#: .\templates\dashboards\category.html:48
+#: .\templates\dashboards\category.html:56
 #: .\templates\dashboards\general.html:49
 msgid "Focus"
 msgstr "Destaques"
-#: .\templates\dashboards\category.html:51
+#: .\templates\dashboards\category.html:59
 #: .\templates\dashboards\general.html:52
 msgid "Log"
 msgstr "Log"
+#: .\templates\dashboards\category.html:69
+#: .\templates\dashboards\general.html:62
+msgid "most used tags"
+msgstr "tags mais usadas"
+
 #: .\templates\dashboards\general.html:18
 msgid "Dashboards General"
 msgstr "Dashboards Geral"
@@ -56,25 +61,21 @@ msgstr &quot;Dashboards Geral&quot;
 msgid "Amadeus Report"
 msgstr "Report do Amadeus"
-#: .\templates\dashboards\general.html:62
-msgid "most used tags"
-msgstr "tags mais usadas"
-
 #: .\templates\dashboards\general.html:72
 msgid "Most accessed "
 msgstr "Mais acessadas"
 #: .\templates\dashboards\general.html:77
-msgid "Most accessed categories"
-msgstr "Categorias mais acessadas"
+msgid "Categories"
+msgstr "Categorias"
 #: .\templates\dashboards\general.html:81
-msgid "Most accessed subjects"
-msgstr "Assuntos mais acessados"
+msgid "Subjects"
+msgstr "Assuntos"
 #: .\templates\dashboards\general.html:85
-msgid "Most accessed resource"
-msgstr "Recursos mais acessados"
+msgid "Resource"
+msgstr "Recursos"
 #: .\templates\dashboards\general.html:93
 msgid "Most active users"
@@ -88,50 +89,59 @@ msgstr &quot;Quantidade de acessos em: &quot;
 msgid "Select the begin of the week: "
 msgstr "Selecione o dia da semana: "
-#: .\views.py:34
+#: .\views.py:36
 msgid "January"
 msgstr "Janeiro"
-#: .\views.py:34
+#: .\views.py:36
 msgid "February"
 msgstr "Fevereiro"
-#: .\views.py:34
+#: .\views.py:36
 msgid "March"
 msgstr "Março"
-#: .\views.py:34
+#: .\views.py:36
 msgid "April"
 msgstr "Abril"
-#: .\views.py:34
+#: .\views.py:36
 msgid "May"
 msgstr "Maio"
-#: .\views.py:34
+#: .\views.py:36
 msgid "June"
 msgstr "Junho"
-#: .\views.py:34
+#: .\views.py:36
 msgid "July"
 msgstr "Julho"
-#: .\views.py:34
+#: .\views.py:36
 msgid "August"
 msgstr "Agosto"
-#: .\views.py:35
+#: .\views.py:37
 msgid "September"
 msgstr "Setembro"
-#: .\views.py:35
+#: .\views.py:37
 msgid "October"
 msgstr "Outubro"
-#: .\views.py:35
+#: .\views.py:37
 msgid "November"
 msgstr "Novembro"
-#: .\views.py:35
+#: .\views.py:37
 msgid "December"
 msgstr "Dezembro"
+
+#~ msgid "Most accessed categories"
+#~ msgstr "Categorias mais acessadas"
+
+#~ msgid "Most accessed subjects"
+#~ msgstr "Assuntos mais acessados"
+
+#~ msgid "Most accessed resource"
+#~ msgstr "Recursos mais acessados"
@@ -4,6 +4,9 @@
 $(document).ready(function(){
 	selectors_options.init();
+	charts.most_used_tags('/analytics/most_used_tags');
+	charts.build_bubble_user('/analytics/most_active_users/');
+	
 	$('#month_selector').change(function(){
 		$.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){
@@ -18,6 +18,7 @@
     {% trans 'Analytics Category' as category %}
     {% breadcrumb category 'dashboard:view_general' %}
+
 {% endblock %}
@@ -74,15 +74,15 @@
                                 <div class="selector" data-url="categories">
-                                    <p>  {% trans "Most accessed categories" %} </p>
+                                    <p>  {% trans "Categories" %} </p>
                                 </div>
                                 <div class="selector" data-url="subjects">
-                                   <p> {% trans "Most accessed subjects" %} </p>
+                                   <p> {% trans "Subjects" %} </p>
                                 </div>
                                 <div class="selector" data-url="resources">
-                                   <p> {% trans "Most accessed resource" %} </p>
+                                   <p> {% trans "Resource" %} </p>
                                 </div>
                     </div>
	@@ -18,6 +18,7 @@		@@ -18,6 +18,7 @@
18	{% trans 'Analytics Category' as category %}	18	{% trans 'Analytics Category' as category %}
19		19
20	{% breadcrumb category 'dashboard:view_general' %}	20	{% breadcrumb category 'dashboard:view_general' %}
		21	+
21	{% endblock %}	22	{% endblock %}
22		23
23		24
	@@ -74,15 +74,15 @@		@@ -74,15 +74,15 @@
74		74
75		75
76	<div class="selector" data-url="categories">	76	<div class="selector" data-url="categories">
77	- <p> {% trans "Most accessed categories" %} </p>	77	+ <p> {% trans "Categories" %} </p>
78	</div>	78	</div>
79		79
80	<div class="selector" data-url="subjects">	80	<div class="selector" data-url="subjects">
81	- <p> {% trans "Most accessed subjects" %} </p>	81	+ <p> {% trans "Subjects" %} </p>
82	</div>	82	</div>
83		83
84	<div class="selector" data-url="resources">	84	<div class="selector" data-url="resources">
85	- <p> {% trans "Most accessed resource" %} </p>	85	+ <p> {% trans "Resource" %} </p>
86	</div>	86	</div>
87		87
88	</div>	88	</div>