Revert last 3 commits

templates/stats/base.html

@@ -6,13 +6,10 @@
     {% endcompress %}
 {% endblock %}
 
-{% block content_title %}{{ _('Statistics') }}{% endblock %}
+{% block content_title %}{% endblock %}
+{% block title_ruler %}{% endblock %}
 
 {% block body %}
-    <div class="tabs">
-        <li{% if tab == 'language' %} class="active"{% endif %}>
-            <a href="{{ url('language_stats') }}">{{ _('Language') }}</a>
-        </li>
-    </div>
+    {% include "stats/tab.html" %}
     {% block chart_body %}{% endblock %}
 {% endblock %}

templates/stats/language.html

@@ -36,20 +36,10 @@
                 Chart.defaults.global.tooltipFontFamily =
                     Chart.defaults.global.tooltipTitleFontFamily =
                         $('body').css('font-family');
-
-            function pie_chart(url, $chart) {
-                $.getJSON(url, function (data) {
-                    draw_pie_chart(data, $chart);
-                });
-            }
-
-            pie_chart('{{ url('language_stats_data_all') }}', $('#lang-all'));
-            pie_chart('{{ url('language_stats_data_ac') }}', $('#lang-ac'));
-            pie_chart('{{ url('stats_data_status') }}', $('#status-counts'));
-
-            $.getJSON('{{ url('language_stats_data_ac_rate') }}', function (data) {
-                draw_bar_chart(data, $('#ac-rate'));
-            });
+            draw_pie_chart({{ data_all }}, $('#lang-all'));
+            draw_pie_chart({{ lang_ac }}, $('#lang-ac'));
+            draw_pie_chart({{ status_counts }}, $('#status-counts'));
+            draw_bar_chart({{ ac_rate }}, $('#ac-rate'));
         });
     </script>
 {% endblock %}

templates/stats/media-js.html

@@ -87,4 +87,24 @@
         });
         return chart;
     }
+
+    function draw_timeline(data, $chart) {
+        var ctx = $chart.find('canvas')[0].getContext('2d');
+        var chart = new Chart(ctx, {
+            type: 'line',
+            data: data,
+            options: {
+                maintainAspectRatio: false,
+                legend: {
+                    display: false,
+                },
+                scales: {
+                    xAxes: [{
+                        type: 'time',
+                    }]
+                },
+            },
+        });
+        return chart;   
+    }
 </script>

templates/stats/site.html

@@ -0,0 +1,65 @@
+{% extends "stats/base.html" %}
+{% block media %}
+    <style>
+        .graph {
+            padding-bottom: 3em;
+        }
+    </style>
+{% endblock %}
+
+{% block chart_body %}
+    <div class="graph">
+        <div id="submissions" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('Submissions') }}</h3></center>
+    </div>
+    <div class="graph">
+        <div id="contests" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('Contests') }}</h3></center>
+    </div>
+    <div class="graph">
+        <div id="new_users" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('New users') }}</h3></center>
+    </div>
+    <div class="graph">
+        <div id="groups" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('Groups') }}</h3></center>
+    </div>
+    <div class="graph">
+        <div id="comments" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('Comments') }}</h3></center>
+    </div>
+    <div class="graph">
+        <div id="chat_messages" class="chart">
+            <canvas width="90%" height="300"></canvas>
+        </div>
+        <center><h3>{{ _('Chat messages') }}</h3></center>
+    </div>
+{% endblock %}
+
+{% block bodyend %}
+    <script type="text/javascript">
+        $(function () {
+            Chart.defaults.global.scaleFontFamily =
+                Chart.defaults.global.tooltipFontFamily =
+                    Chart.defaults.global.tooltipTitleFontFamily =
+                        $('body').css('font-family');
+
+            draw_timeline({{submissions}}, $('#submissions'));
+            draw_timeline({{new_users}}, $('#new_users'));
+            draw_timeline({{comments}}, $('#comments'));
+            draw_timeline({{chat_messages}}, $('#chat_messages'));
+            draw_timeline({{contests}}, $('#contests'));
+            draw_timeline({{groups}}, $('#groups'));
+        });
+    </script>
+{% endblock %}

templates/stats/tab.html

@@ -0,0 +1,6 @@
+{% extends "tabs-base.html" %}
+
+{% block tabs %}
+    {{ make_tab('language', 'fa-list', url('language_stats'), _('Language')) }}
+    {{ make_tab('site', 'fa-list', url('site_stats'), _('Site')) }}
+{% endblock %}