From 83975b7b12647712c5d837705180b0c01953bce3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 24 Jun 2016 20:29:39 -0400 Subject: [PATCH] update sidebar --- dashboard-ui/log.html | 2 +- dashboard-ui/scripts/aboutpage.js | 4 ---- dashboard-ui/scripts/logpage.js | 17 ----------------- dashboard-ui/scripts/site.js | 18 ++++++++++++++---- dashboard-ui/scripts/supporterkeypage.js | 8 ++------ 5 files changed, 17 insertions(+), 32 deletions(-) diff --git a/dashboard-ui/log.html b/dashboard-ui/log.html index c3b9a8d1f..2e1c9497f 100644 --- a/dashboard-ui/log.html +++ b/dashboard-ui/log.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/scripts/aboutpage.js b/dashboard-ui/scripts/aboutpage.js index 313faa202..28a22fb7a 100644 --- a/dashboard-ui/scripts/aboutpage.js +++ b/dashboard-ui/scripts/aboutpage.js @@ -6,10 +6,6 @@ href: 'about.html', name: Globalize.translate('TabAbout') }, - { - href: 'log.html', - name: Globalize.translate('TabLogs') - }, { href: 'supporterkey.html', name: Globalize.translate('TabEmbyPremiere') diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js index 014b2eb6a..72097c6be 100644 --- a/dashboard-ui/scripts/logpage.js +++ b/dashboard-ui/scripts/logpage.js @@ -1,21 +1,5 @@ define(['datetime', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (datetime, $) { - function getTabs() { - return [ - { - href: 'about.html', - name: Globalize.translate('TabAbout') - }, - { - href: 'log.html', - name: Globalize.translate('TabLogs') - }, - { - href: 'supporterkey.html', - name: Globalize.translate('TabEmbyPremiere') - }]; - } - return function (view, params) { view.querySelector('#chkDebugLog').addEventListener('change', function () { @@ -30,7 +14,6 @@ view.addEventListener('viewbeforeshow', function () { - LibraryMenu.setTabs('helpadmin', 1, getTabs); Dashboard.showLoadingMsg(); var apiClient = ApiClient; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 2dcb7322f..e5d618565 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -715,13 +715,18 @@ var Dashboard = { href: "userprofiles.html", pageIds: ['userProfilesPage', 'newUserPage', 'editUserPage', 'userLibraryAccessPage', 'userParentalControlPage', 'userPasswordPage'], icon: 'people' + }, { + name: 'Emby Premiere', + href: "supporterkey.html", + pageIds: ['supporterKeyPage'], + icon: 'star' }, { divider: true, name: Globalize.translate('TabLibrary'), href: "library.html", pageIds: ['mediaLibraryPage', 'libraryPathMappingPage', 'librarySettingsPage', 'libraryDisplayPage'], icon: 'folder', - color: '#009688' + color: '#38c' }, { name: Globalize.translate('TabMetadata'), href: "metadata.html", @@ -743,7 +748,8 @@ var Dashboard = { name: Globalize.translate('TabSync'), icon: 'sync', href: "syncactivity.html", - pageIds: ['syncActivityPage', 'syncJobPage', 'devicesUploadPage', 'syncSettingsPage'] + pageIds: ['syncActivityPage', 'syncJobPage', 'devicesUploadPage', 'syncSettingsPage'], + color: '#009688' }, { divider: true, name: Globalize.translate('TabExtras') @@ -784,9 +790,13 @@ var Dashboard = { href: "dashboardhosting.html", color: '#F16834', pageIds: ['dashboardHostingPage', 'serverSecurityPage'] + }, { + name: Globalize.translate('TabLogs'), + href: "log.html", + pageIds: ['logPage'], + icon: 'folder-open' }, { name: Globalize.translate('TabScheduledTasks'), - color: '#38c', href: "scheduledtasks.html", pageIds: ['scheduledTasksPage', 'scheduledTaskPage'], icon: 'schedule' @@ -796,7 +806,7 @@ var Dashboard = { icon: 'help', color: '#679C34', divider: true, - pageIds: ['supporterKeyPage', 'logPage', 'aboutPage'] + pageIds: ['aboutPage'] }]; }, diff --git a/dashboard-ui/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js index 37b37a497..1b093bbc4 100644 --- a/dashboard-ui/scripts/supporterkeypage.js +++ b/dashboard-ui/scripts/supporterkeypage.js @@ -40,7 +40,7 @@ var url = "https://mb3admin.com/admin/service/supporter/retrievekey?email=" + email; console.log(url); fetchHelper.ajax({ - + url: url, type: 'POST', dataType: 'json' @@ -152,10 +152,6 @@ href: 'about.html', name: Globalize.translate('TabAbout') }, - { - href: 'log.html', - name: Globalize.translate('TabLogs') - }, { href: 'supporterkey.html', name: Globalize.translate('TabEmbyPremiere') @@ -173,7 +169,7 @@ }).on('pageshow', "#supporterKeyPage", function () { - LibraryMenu.setTabs('helpadmin', 2, getTabs); + LibraryMenu.setTabs('helpadmin', 1, getTabs); var page = this; loadUserInfo(page);