Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-17 18:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allowing custom date range to be supplied in pageviews graph, closes #5541

Browse Source
This commit is contained in:
Julian Lam
2017-05-11 11:41:28 -04:00
parent 544faa7861
commit 064a8aa6d7
7 changed files with 115 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/socket.io/admin.js
View File

@@ -211,10 +211,12 @@ SocketAdmin.analytics.get = function (socket, data, callback) {
}
// Default returns views from past 24 hours, by hour
if (data.units === 'days') {
data.amount = 30;
} else {
data.amount = 24;
if (!data.amount) {
if (data.units === 'days') {
data.amount = 30;
} else {
data.amount = 24;
}
}
if (data.graph === 'traffic') {

28
src/views/admin/general/dashboard.tpl
View File

@@ -11,17 +11,23 @@
<canvas id="analytics-traffic" width="100%" height="400"></canvas>
</div>
<hr/>
<div class="text-center pull-left pageview-stats">
<div><strong id="pageViewsLastMonth"></strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days" data-until="last-month">[[admin/general/dashboard:page-views-last-month]]</a></div>
</div>
<div class="text-center pull-left pageview-stats">
<div><strong id="pageViewsThisMonth"></strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days">[[admin/general/dashboard:page-views-this-month]]</a></div>
</div>
<div class="text-center pull-left pageview-stats">
<div><strong id="pageViewsPastDay"></strong></div>
<div><a href="#" class="updatePageviewsGraph active" data-action="updateGraph" data-units="hours">[[admin/general/dashboard:page-views-last-day]]</a></div>
<div class="row">
<div class="col-sm-3 hidden-xs text-center pageview-stats">
<div><strong id="pageViewsLastMonth">0</strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days" data-until="last-month">[[admin/general/dashboard:page-views-last-month]]</a></div>
</div>
<div class="col-sm-3 text-center pageview-stats">
<div><strong id="pageViewsThisMonth">0</strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="days">[[admin/general/dashboard:page-views-this-month]]</a></div>
</div>
<div class="col-sm-3 hidden-xs text-center pageview-stats">
<div><strong id="pageViewsPastDay">0</strong></div>
<div><a href="#" class="updatePageviewsGraph active" data-action="updateGraph" data-units="hours">[[admin/general/dashboard:page-views-last-day]]</a></div>
</div>
<div class="col-sm-3 text-center pageview-stats">
<div><strong><i class="fa fa-clock-o"></i></strong></div>
<div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="custom">[[admin/general/dashboard:page-views-custom]]</a></div>
</div>
</div>
</div>
</div>

20
src/views/admin/partials/pageviews-range-select.tpl Normal file
View File

@@ -0,0 +1,20 @@
<form role="form">
<fieldset>
<div class="alert alert-danger hidden">[[admin/general/dashboard:page-views-custom-error]]</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label for="startRange">[[admin/general/dashboard:page-views-custom-start]]</label>
<input class="form-control" type="date" id="startRange" name="startRange" />
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label for="endRange">[[admin/general/dashboard:page-views-custom-end]]</label>
<input class="form-control" type="date" id="endRange" name="endRange" />
</div>
</div>
</div>
<p class="help-block">[[admin/general/dashboard:page-views-custom-help]]</p>
</fieldset>
</form>