1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00

Merge pull request #1759 from haiwen/statistic

[system admin] statistic: modification
This commit is contained in:
Daniel Pan
2017-08-14 12:28:24 +08:00
committed by GitHub
5 changed files with 15 additions and 8 deletions

View File

@@ -13,7 +13,7 @@
<dt>{% trans "Libraries" %}</dt>
<dd>{{repos_count}}</dd>
<dt>{% trans "Active Users" %} / {% trans "Total Users" %}</dt>
<dt>{% trans "Activated Users" %} / {% trans "Total Users" %}</dt>
<dd>
{% if active_users_count %}{{ active_users_count }}{% else %}--{% endif %}
/

View File

@@ -132,7 +132,7 @@
<dd><%- total_devices_count %> / <%- current_connected_devices_count %></dd>
<% if (is_pro) { %>
<dt>{% trans "Active Users" %} / {% trans "Total Users" %} / {% trans "Limits" %}</dt>
<dt>{% trans "Activated Users" %} / {% trans "Total Users" %} / {% trans "Limits" %}</dt>
<dd>
<%- active_users_count %>
/
@@ -145,7 +145,7 @@
<% } %>
</dd>
<% } else { %>
<dt>{% trans "Active Users" %} / {% trans "Total Users" %}</dt>
<dt>{% trans "Activated Users" %} / {% trans "Total Users" %}</dt>
<dd>
<%- active_users_count %>
/

View File

@@ -176,19 +176,19 @@ function renderChart(data, group_by) {
labels: labels,
datasets: [
{
label: "{% trans "Visited" %}",
label: "{% trans "Visited" context "files visited" %}",
data: visited,
borderColor: '#fd913a',
backgroundColor: '#fd913a'
},
{
label: "{% trans "Added" %}",
label: "{% trans "Added" context "files added" %}",
data: added,
borderColor: '#57cd6b',
backgroundColor: '#57cd6b'
},
{
label: "{% trans "Deleted" %}",
label: "{% trans "Deleted" context "files deleted" %}",
data: deleted,
borderColor: '#f75356',
backgroundColor: '#f75356'

View File

@@ -172,7 +172,7 @@ function renderChart(data, group_by) {
labels: labels,
datasets: [
{
label: "{% trans "Count" %}",
label: "{% trans "Active Users" %}",
data: count,
borderColor: '#fd913a',
backgroundColor: '#fd913a'

View File

@@ -5,7 +5,14 @@
{% block cur_statistic %}tab-cur{% endblock %}
{% block right_panel %}
<h3 class="hd">{% trans "User Traffic" %}</h3>
<div class="tabnav ovhd">
<ul class="tabnav-tabs fleft">
<li class="tabnav-tab"><a href="{% url 'sys_statistic_file' %}">{% trans "File" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_statistic_storage' %}">{% trans "Storage" %}</a></li>
<li class="tabnav-tab"><a href="{% url 'sys_statistic_user' %}">{% trans "Users" %}</a></li>
<li class="tabnav-tab tabnav-tab-cur"><a href="{{ SITE_ROOT }}sys/trafficadmin/">{% trans "Traffic" %}</a></li>
</ul>
</div>
<p class="tip">{% trans "Tip: the traffic only includes the traffic used by sharing links." %}</p>