From cfd0b99600c3c84392af622cb60dd6ad80b34822 Mon Sep 17 00:00:00 2001 From: Joe White Date: Mon, 20 Jul 2020 15:37:28 -0400 Subject: [PATCH 1/3] Rename internal dashboard button from "Dashboard" to "Admin Dashboard" Also update the tooltip to be slightly less uninformative. This increases the width of the button. However there is still plenty of space in the top toolbar. The width of the page that causes the Help button to disappear is still mcuh narrower than any usable width for the rest of XDMoD. --- html/gui/js/CCR.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/gui/js/CCR.js b/html/gui/js/CCR.js index f90e5dffe1..d36c0f478d 100644 --- a/html/gui/js/CCR.js +++ b/html/gui/js/CCR.js @@ -128,11 +128,11 @@ XDMoD.GlobalToolbar.Profile = { // ------------------------------------------------- XDMoD.GlobalToolbar.Dashboard = { - text: 'Dashboard', + text: 'Admin Dashboard', scale: 'small', iconCls: 'btn_dashboard', id: 'global-toolbar-dashboard', - tooltip: 'Internal Dashboard', + tooltip: 'Load the admin dashboard in a new window.', handler: function () { XDMoD.TrackEvent("Portal", "Dashboard Button Clicked"); CCR.xdmod.initDashboard(); From 1dc94263078d6b2db2394c85180aa549613be7a7 Mon Sep 17 00:00:00 2001 From: Joe White Date: Tue, 21 Jul 2020 16:42:56 -0400 Subject: [PATCH 2/3] Update as per @jtplamer code review --- html/gui/js/CCR.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/gui/js/CCR.js b/html/gui/js/CCR.js index d36c0f478d..de6fe9eedd 100644 --- a/html/gui/js/CCR.js +++ b/html/gui/js/CCR.js @@ -134,7 +134,7 @@ XDMoD.GlobalToolbar.Dashboard = { id: 'global-toolbar-dashboard', tooltip: 'Load the admin dashboard in a new window.', handler: function () { - XDMoD.TrackEvent("Portal", "Dashboard Button Clicked"); + XDMoD.TrackEvent("Portal", "Admin Dashboard Button Clicked"); CCR.xdmod.initDashboard(); } //handler From 3708316b45a81cabbbd4f90da1fd3379c8d8fb88 Mon Sep 17 00:00:00 2001 From: "Jeffrey T. Palmer" Date: Wed, 22 Jul 2020 07:17:13 -0400 Subject: [PATCH 3/3] Update html/gui/js/CCR.js --- html/gui/js/CCR.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/gui/js/CCR.js b/html/gui/js/CCR.js index de6fe9eedd..622eeda8d5 100644 --- a/html/gui/js/CCR.js +++ b/html/gui/js/CCR.js @@ -134,7 +134,7 @@ XDMoD.GlobalToolbar.Dashboard = { id: 'global-toolbar-dashboard', tooltip: 'Load the admin dashboard in a new window.', handler: function () { - XDMoD.TrackEvent("Portal", "Admin Dashboard Button Clicked"); + XDMoD.TrackEvent('Portal', 'Admin Dashboard Button Clicked'); CCR.xdmod.initDashboard(); } //handler