YYYY-MM-DD",
diff --git a/public/scss/admin/general/dashboard.scss b/public/scss/admin/general/dashboard.scss
index 2cfc461a0e..db73c92e75 100644
--- a/public/scss/admin/general/dashboard.scss
+++ b/public/scss/admin/general/dashboard.scss
@@ -1,3 +1,6 @@
+.template-admin-dashboard .graph-container {
+ min-height: 300px;
+}
.dashboard {
.card {
max-width: 100% !important;
@@ -12,7 +15,8 @@
}
&.fullscreen {
- width: 100%;
+ width: 100%!important;
+ height: 100%!important;
padding: 40px;
}
}
diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js
index 8be06177b0..a290a791c7 100644
--- a/public/src/admin/dashboard.js
+++ b/public/src/admin/dashboard.js
@@ -18,6 +18,8 @@ import * as alerts from '../modules/alerts';
import * as translator from '../modules/translator';
import { formattedNumber } from '../modules/helpers';
+import { setupFullscreen } from './modules/fullscreen';
+
Chart.register(
LineController,
DoughnutController,
@@ -75,7 +77,7 @@ export function init() {
socket.emit('admin.rooms.getAll', updateRoomUsage);
initiateDashboard();
});
- setupFullscreen();
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
}
function updateRoomUsage(err, data) {
@@ -579,36 +581,3 @@ function initiateDashboard(realtime) {
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
}
-function setupFullscreen() {
- const container = document.getElementById('analytics-panel');
- const $container = $(container);
- const btn = $container.find('#expand-analytics');
- let fsMethod;
- let exitMethod;
-
- if (container.requestFullscreen) {
- fsMethod = 'requestFullscreen';
- exitMethod = 'exitFullscreen';
- } else if (container.mozRequestFullScreen) {
- fsMethod = 'mozRequestFullScreen';
- exitMethod = 'mozCancelFullScreen';
- } else if (container.webkitRequestFullscreen) {
- fsMethod = 'webkitRequestFullscreen';
- exitMethod = 'webkitCancelFullScreen';
- } else if (container.msRequestFullscreen) {
- fsMethod = 'msRequestFullscreen';
- exitMethod = 'msCancelFullScreen';
- }
-
- if (fsMethod) {
- btn.on('click', function () {
- if ($container.hasClass('fullscreen')) {
- document[exitMethod]();
- $container.removeClass('fullscreen');
- } else {
- container[fsMethod]();
- $container.addClass('fullscreen');
- }
- });
- }
-}
diff --git a/public/src/admin/dashboard/logins.js b/public/src/admin/dashboard/logins.js
index eea048293c..c82b54f17b 100644
--- a/public/src/admin/dashboard/logins.js
+++ b/public/src/admin/dashboard/logins.js
@@ -1,6 +1,6 @@
'use strict';
-define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph) => {
+define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph', 'admin/modules/fullscreen'], (graph, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -8,6 +8,7 @@ define('admin/dashboard/logins', ['admin/modules/dashboard-line-graph'], (graph)
set: 'logins',
dataset: ajaxify.data.dataset,
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
return ACP;
diff --git a/public/src/admin/dashboard/topics.js b/public/src/admin/dashboard/topics.js
index 91e0754779..5a9bcb262b 100644
--- a/public/src/admin/dashboard/topics.js
+++ b/public/src/admin/dashboard/topics.js
@@ -1,6 +1,8 @@
'use strict';
-define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/topics', [
+ 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen'
+], (graph, hooks, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/topics', ['admin/modules/dashboard-line-graph', 'hooks']
}).then(() => {
hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
ACP.updateTable = () => {
diff --git a/public/src/admin/dashboard/users.js b/public/src/admin/dashboard/users.js
index c9798e9572..7ef00ea477 100644
--- a/public/src/admin/dashboard/users.js
+++ b/public/src/admin/dashboard/users.js
@@ -1,6 +1,8 @@
'use strict';
-define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'], (graph, hooks) => {
+define('admin/dashboard/users', [
+ 'admin/modules/dashboard-line-graph', 'hooks', 'admin/modules/fullscreen',
+], (graph, hooks, { setupFullscreen }) => {
const ACP = {};
ACP.init = () => {
@@ -10,6 +12,7 @@ define('admin/dashboard/users', ['admin/modules/dashboard-line-graph', 'hooks'],
}).then(() => {
hooks.onPage('action:admin.dashboard.updateGraph', ACP.updateTable);
});
+ setupFullscreen($('#expand-analytics'), $('#analytics-panel'));
};
ACP.updateTable = () => {
diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.js
index 3087518c9d..33404236be 100644
--- a/public/src/admin/modules/dashboard-line-graph.js
+++ b/public/src/admin/modules/dashboard-line-graph.js
@@ -78,7 +78,7 @@ export function init({ set, dataset }) {
position: 'left',
beginAtZero: true,
title: {
- display: true,
+ display: false,
text: key,
},
},
diff --git a/public/src/admin/modules/fullscreen.js b/public/src/admin/modules/fullscreen.js
new file mode 100644
index 0000000000..eac4ffd0c5
--- /dev/null
+++ b/public/src/admin/modules/fullscreen.js
@@ -0,0 +1,30 @@
+export function setupFullscreen($btn, $container) {
+ let fsMethod;
+ let exitMethod;
+ const container = $container.get(0);
+ if (container.requestFullscreen) {
+ fsMethod = 'requestFullscreen';
+ exitMethod = 'exitFullscreen';
+ } else if (container.mozRequestFullScreen) {
+ fsMethod = 'mozRequestFullScreen';
+ exitMethod = 'mozCancelFullScreen';
+ } else if (container.webkitRequestFullscreen) {
+ fsMethod = 'webkitRequestFullscreen';
+ exitMethod = 'webkitCancelFullScreen';
+ } else if (container.msRequestFullscreen) {
+ fsMethod = 'msRequestFullscreen';
+ exitMethod = 'msCancelFullScreen';
+ }
+
+ if (fsMethod) {
+ $btn.on('click', function () {
+ if ($container.hasClass('fullscreen')) {
+ document[exitMethod]().catch(err => console.error(err));
+ $container.removeClass('fullscreen');
+ } else {
+ container[fsMethod]().catch(err => console.error(err));
+ $container.addClass('fullscreen');
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/views/admin/dashboard/searches.tpl b/src/views/admin/dashboard/searches.tpl
index ef20b9223b..52d1b8ea20 100644
--- a/src/views/admin/dashboard/searches.tpl
+++ b/src/views/admin/dashboard/searches.tpl
@@ -1,6 +1,6 @@