Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 14:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2986

Browse Source
This commit is contained in:
psychobunny
2015-04-10 14:23:40 -04:00
parent 799cc9397a
commit 5c59aa7737
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/less/admin/general/dashboard.less
View File

@@ -130,7 +130,7 @@
} }
.monthly-pageviews { .monthly-pageviews {
width:50%; width:33%;
} }
.motd textarea { .motd textarea {

2
public/src/admin/general/dashboard.js
View File

@@ -338,8 +338,10 @@ define('admin/general/dashboard', ['semver'], function(semver) {
$('#pageViewsThisMonth').html(data.monthlyPageViews.thisMonth); $('#pageViewsThisMonth').html(data.monthlyPageViews.thisMonth);
$('#pageViewsLastMonth').html(data.monthlyPageViews.lastMonth); $('#pageViewsLastMonth').html(data.monthlyPageViews.lastMonth);
$('#pageViewsPastDay').html(data.pastDay);
utils.addCommasToNumbers($('#pageViewsThisMonth')); utils.addCommasToNumbers($('#pageViewsThisMonth'));
utils.addCommasToNumbers($('#pageViewsLastMonth')); utils.addCommasToNumbers($('#pageViewsLastMonth'));
utils.addCommasToNumbers($('#pageViewsPastDay'));
}); });
} }

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

@@ -234,7 +234,10 @@ SocketAdmin.analytics.get = function(socket, data, callback) {
monthlyPageViews: function(next) { monthlyPageViews: function(next) {
getMonthlyPageViews(next); getMonthlyPageViews(next);
} }
}, callback); }, function(err, data) {
data.pastDay = data.pageviews.reduce(function(a, b) {return parseInt(a, 10) + parseInt(b, 10);});
callback(err, data);
});
} }
} else { } else {
callback(new Error('Invalid analytics call')); callback(new Error('Invalid analytics call'));

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

@@ -19,6 +19,10 @@
<div><strong id="pageViewsThisMonth"></strong></div> <div><strong id="pageViewsThisMonth"></strong></div>
<div>Page views This Month</div> <div>Page views This Month</div>
</div> </div>
<div class="text-center pull-left monthly-pageviews">
<div><strong id="pageViewsPastDay"></strong></div>
<div>Page views in last 24 hours</div>
</div>
</div> </div>
</div> </div>