diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index aa443c78e8..213de1d3e6 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -24,6 +24,11 @@ ${TabSettings} + +

diff --git a/dashboard-ui/appservices.html b/dashboard-ui/appservices.html index 386f863549..b42fee4965 100644 --- a/dashboard-ui/appservices.html +++ b/dashboard-ui/appservices.html @@ -24,6 +24,13 @@
+ +
${HeaderInstalledServices}

diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html index 918ac624cf..58f191698a 100644 --- a/dashboard-ui/notificationsetting.html +++ b/dashboard-ui/notificationsetting.html @@ -9,6 +9,11 @@
+ +

@@ -31,7 +36,7 @@
- @@ -67,10 +72,10 @@

  • - -
  • diff --git a/dashboard-ui/notificationsettings.html b/dashboard-ui/notificationsettings.html index e5c60ab930..404d138724 100644 --- a/dashboard-ui/notificationsettings.html +++ b/dashboard-ui/notificationsettings.html @@ -9,6 +9,11 @@
    + +

    ${HeaderNotificationList}

    ${HeaderSendNotificationHelp}

    diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js index 0ef2e7be71..359c0b70c4 100644 --- a/dashboard-ui/scripts/addpluginpage.js +++ b/dashboard-ui/scripts/addpluginpage.js @@ -274,27 +274,33 @@ var context = getParameterByName('context'); + $('.syncTabs', page).hide(); + $('.pluginTabs', page).hide(); + $('.livetvTabs', page).hide(); + $('.notificationsTabs', page).hide(); + if (context == 'sync') { $('.syncTabs', page).show(); - $('.pluginTabs', page).hide(); - $('.livetvTabs', page).hide(); page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Sync'); Dashboard.setPageTitle(Globalize.translate('TitleSync')); } else if (context == 'livetv') { - $('.syncTabs', page).hide(); - $('.pluginTabs', page).hide(); $('.livetvTabs', page).show(); Dashboard.setPageTitle(Globalize.translate('TitleLiveTV')); page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV'); } + else if (context == 'notifications') { + + $('.notificationsTabs', page).show(); + + Dashboard.setPageTitle(Globalize.translate('TitleNotifications')); + page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications'); + } else { - $('.syncTabs', page).hide(); $('.pluginTabs', page).show(); - $('.livetvTabs', page).hide(); page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Plugins'); Dashboard.setPageTitle(Globalize.translate('TitlePlugins')); diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js index 636f41845b..ebbd21b974 100644 --- a/dashboard-ui/scripts/appservices.js +++ b/dashboard-ui/scripts/appservices.js @@ -28,6 +28,9 @@ else if (context == 'livetv') { categories.push('Live TV'); } + else if (context == 'notifications') { + categories.push('Notifications'); + } return categories; } @@ -85,6 +88,10 @@ Dashboard.setPageTitle(Globalize.translate('TitleLiveTV')); page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Live%20TV'); } + else if (context == 'notifications') { + Dashboard.setPageTitle(Globalize.translate('TitleNotifications')); + page.setAttribute('data-helpurl', 'https://github.com/MediaBrowser/Wiki/wiki/Notifications'); + } }).on('pageshow', "#appServicesPage", function () { diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index 650f994dee..fce2dd69c7 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -82,7 +82,7 @@ // v4 Id F4EB2E8E // default receiver chrome.cast.media.DEFAULT_MEDIA_RECEIVER_APP_ID - var applicationID = "F4EB2E8E"; + var applicationID = "69C59853"; // request session var sessionRequest = new chrome.cast.SessionRequest(applicationID); diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js index efaf5de841..294070246b 100644 --- a/dashboard-ui/scripts/notificationsetting.js +++ b/dashboard-ui/scripts/notificationsetting.js @@ -14,7 +14,7 @@ var checkedHtml = isChecked ? ' checked="checked"' : ''; - return ''; + return ''; }).join('');