diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index a670e61c3b..da19708df8 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabChannels} diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index 08c375519e..43a7c23a48 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabChannels} diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index adcc49ea6a..f7b53096da 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabCollections} diff --git a/dashboard-ui/css/images/items/folders/home.png b/dashboard-ui/css/images/items/folders/home.png new file mode 100644 index 0000000000..c1295ea443 Binary files /dev/null and b/dashboard-ui/css/images/items/folders/home.png differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 3a053f1af0..bbf6823f63 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -17,7 +17,7 @@ } .backdropPage { - background-color: rgba(0, 0, 0, .85)!important; + background-color: rgba(0, 0, 0, .87)!important; } .backdropContainer { @@ -68,6 +68,10 @@ max-width: 750px; } +.homePageSection + .homePageSection { + margin-top: 3em; +} + @media all and (min-width: 1000px) { .ehsContent { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index b3fd9d8300..c9ca5bb246 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -28,10 +28,10 @@ bottom: 0; vertical-align: middle; text-align: center; - border: 1px solid #1b1b1b!important; - cursor: pointer; + border: 0!important; outline: none; padding: 0 20px; + cursor: pointer; } .headerButton img { @@ -44,7 +44,6 @@ } .headerButtonLeft { - border-width: 0 1px 0 0 !important; float: left; padding: 0 15px; } @@ -52,30 +51,33 @@ .headerButtonRight { border-width: 0 !important; float: left; - border-width: 0 0 0 1px !important; + padding: 0 18px; } .headerButtonRight:first-child { border-width: 0 !important; } -.desktopHomeLink { - color: #ddd !important; - text-decoration: none; - font-weight: 400!important; - font-size: 15px; - border-right: 0 !important; -} - - .desktopHomeLink span { - vertical-align: middle; - } - .libraryMenuButton { left: 0; opacity: .8; } +.libraryMenuButtonText { + color: #fff !important; + text-decoration: none; + font-weight: 400!important; + font-size: 15px; +} + + + +.libraryMenuButtonText { + display: inline-block; + vertical-align: middle; + margin-left: .5em; +} + .viewMenuBar { font-weight: bold; position: fixed; @@ -141,12 +143,16 @@ vertical-align: middle; } -.viewMenuTextLink:hover, .libraryMenuButton:hover { +.viewMenuTextLink:hover { background-color: #38c; color: #fff!important; opacity: 1; } +.libraryMenuButton:hover { + opacity: .6; +} + .headerButtonRight:hover { opacity: .5; } @@ -180,6 +186,11 @@ background-position: 16px 8px; } +.homeViewMenu { + background-image: url(images/items/folders/home.png); + background-position: 16px 9px; +} + .tvshowsViewMenu { background-image: url(images/items/folders/tv.png); background-position: 16px 8px; @@ -292,7 +303,7 @@ @media all and (max-width: 600px) { - .desktopHomeLink { + .libraryMenuButtonText { display: none; } diff --git a/dashboard-ui/editcollectionitems.html b/dashboard-ui/editcollectionitems.html index 1f74c7da8f..0f35c04f56 100644 --- a/dashboard-ui/editcollectionitems.html +++ b/dashboard-ui/editcollectionitems.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index 87eb27f2c0..9ea2ac04ec 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 688be41ee4..53a652623b 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
diff --git a/dashboard-ui/edititemsubtitles.html b/dashboard-ui/edititemsubtitles.html index efb70d4b53..fe4627056a 100644 --- a/dashboard-ui/edititemsubtitles.html +++ b/dashboard-ui/edititemsubtitles.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index eab6a54e7f..d629fb8c39 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index 04da91ed23..39f641c9a5 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGames} diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index b9a211c8c7..0b3c68faed 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGames} diff --git a/dashboard-ui/gamesrecommended.html b/dashboard-ui/gamesrecommended.html index 78fb4778ba..dc10e48c53 100644 --- a/dashboard-ui/gamesrecommended.html +++ b/dashboard-ui/gamesrecommended.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGames} diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index f84159a161..37f5b0cc0b 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGames} diff --git a/dashboard-ui/gamesystems.html b/dashboard-ui/gamesystems.html index 01fe0d72b3..59cfea39ec 100644 --- a/dashboard-ui/gamesystems.html +++ b/dashboard-ui/gamesystems.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGames} diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index fcfeb4e9c0..c3838b869e 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html index eb5b58b07a..f47d512d3c 100644 --- a/dashboard-ui/livetvchannels.html +++ b/dashboard-ui/livetvchannels.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html index 93ce45ae8e..df49be0434 100644 --- a/dashboard-ui/livetvguide.html +++ b/dashboard-ui/livetvguide.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index 5c801da19a..28b467b3a2 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html index 46d6cba309..c990c4f4e5 100644 --- a/dashboard-ui/livetvprogram.html +++ b/dashboard-ui/livetvprogram.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html index f2320006b1..811973e6e2 100644 --- a/dashboard-ui/livetvrecording.html +++ b/dashboard-ui/livetvrecording.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html index 198c806183..7f8b426ce0 100644 --- a/dashboard-ui/livetvrecordinglist.html +++ b/dashboard-ui/livetvrecordinglist.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index 4051dd571f..441a30537e 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index f94c3b86b0..3d7bde1fe8 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html index c190b21c8c..c4405ab742 100644 --- a/dashboard-ui/livetvseriestimers.html +++ b/dashboard-ui/livetvseriestimers.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index 46c5359381..1478d94891 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -4,7 +4,7 @@ ${TitleLiveTV} -
+
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html index cd29debbc5..afffece57e 100644 --- a/dashboard-ui/livetvsuggested.html +++ b/dashboard-ui/livetvsuggested.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index 781d0e80a1..c4e2f4c832 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html index d5b7c71ccb..5ceb4a478f 100644 --- a/dashboard-ui/livetvtimers.html +++ b/dashboard-ui/livetvtimers.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabGuide} diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html index 8756c8044d..452da495b3 100644 --- a/dashboard-ui/moviegenres.html +++ b/dashboard-ui/moviegenres.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html index 2004e32c81..46991305a0 100644 --- a/dashboard-ui/moviepeople.html +++ b/dashboard-ui/moviepeople.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index d0c6f75f3d..ffaf9c7259 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/movieslatest.html b/dashboard-ui/movieslatest.html index 0cb55db9e5..8ddb27eff3 100644 --- a/dashboard-ui/movieslatest.html +++ b/dashboard-ui/movieslatest.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html index edc67e83ba..218b2ae956 100644 --- a/dashboard-ui/moviesrecommended.html +++ b/dashboard-ui/moviesrecommended.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index 7d7b465090..94c2242188 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabLatest} diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html index 468de44db0..58f211fe70 100644 --- a/dashboard-ui/movietrailers.html +++ b/dashboard-ui/movietrailers.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html index 7871096650..b9ff13d8da 100644 --- a/dashboard-ui/musicalbumartists.html +++ b/dashboard-ui/musicalbumartists.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index b283974a09..4a1ec3aa88 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index 95fd42277d..6099d30f72 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index f6ce81f17c..53ff839723 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html index 36c170beb7..da87c8a5b3 100644 --- a/dashboard-ui/musicrecommended.html +++ b/dashboard-ui/musicrecommended.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index 9a71245ce3..ef3896714e 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
+
${TabSuggested} diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html index 81db46f311..b6ff36e3ad 100644 --- a/dashboard-ui/mypreferencesdisplay.html +++ b/dashboard-ui/mypreferencesdisplay.html @@ -5,7 +5,7 @@ ${TitleMediaBrowser} -
+
${TabDisplay} ${TabLanguages} diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html index 3b53888c1d..6f0b6db7a5 100644 --- a/dashboard-ui/mypreferenceslanguages.html +++ b/dashboard-ui/mypreferenceslanguages.html @@ -5,7 +5,7 @@ ${TitleMediaBrowser} -
+
${TabDisplay} ${TabLanguages} diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html index 037d7b143d..427d8d43bb 100644 --- a/dashboard-ui/mypreferenceswebclient.html +++ b/dashboard-ui/mypreferenceswebclient.html @@ -5,7 +5,7 @@ ${TitleMediaBrowser} -
+
${TabDisplay} ${TabLanguages} @@ -26,30 +26,32 @@
    • diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html index 1c511e89a6..d524023a55 100644 --- a/dashboard-ui/reports.html +++ b/dashboard-ui/reports.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    diff --git a/dashboard-ui/scripts/gamesrecommendedpage.js b/dashboard-ui/scripts/gamesrecommendedpage.js index 8605e71cfa..0623729783 100644 --- a/dashboard-ui/scripts/gamesrecommendedpage.js +++ b/dashboard-ui/scripts/gamesrecommendedpage.js @@ -11,7 +11,7 @@ SortBy: "DateCreated", SortOrder: "Descending", MediaTypes: "Game", - Limit: 10, + Limit: 8, Recursive: true, Fields: "ItemCounts,AudioInfo,PrimaryImageAspectRatio", ParentId: parentId @@ -32,7 +32,7 @@ SortBy: "DatePlayed", SortOrder: "Descending", MediaTypes: "Game", - Limit: 10, + Limit: 8, Recursive: true, Filters: "IsPlayed", Fields: "ItemCounts,AudioInfo,PrimaryImageAspectRatio", diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index d6b0c34ab5..50b4317427 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -184,16 +184,19 @@ var html = ''; - html += '

    Latest Media

    '; - html += '
    '; - html += LibraryBrowser.getPosterViewHtml({ - items: result.Items, - preferThumb: true, - shape: 'backdrop', - showTitle: true, - centerText: true - }); - html += '
    '; + if (result.Items.length) { + html += '

    Latest Media

    '; + html += '
    '; + html += LibraryBrowser.getPosterViewHtml({ + items: result.Items, + preferThumb: true, + shape: 'backdrop', + showTitle: true, + centerText: true + }); + html += '
    '; + } + $(elem).html(html).createPosterItemMenus(); }); @@ -211,16 +214,18 @@ var html = ''; - html += '

    My Library

    '; - html += '
    '; - html += LibraryBrowser.getPosterViewHtml({ - items: result.Items, - preferThumb: true, - shape: 'backdrop', - showTitle: true, - centerText: true - }); - html += '
    '; + if (result.Items.length) { + html += '

    My Library

    '; + html += '
    '; + html += LibraryBrowser.getPosterViewHtml({ + items: result.Items, + shape: 'backdrop', + showTitle: true, + centerText: true + }); + html += '
    '; + } + $(elem).html(html).createPosterItemMenus(); }); @@ -247,17 +252,19 @@ var html = ''; - html += '

    Resume

    '; - html += '
    '; - html += LibraryBrowser.getPosterViewHtml({ - items: result.Items, - preferBackdrop: true, - shape: 'backdrop', - overlayText: screenWidth >= 600, - showTitle: true, - showParentTitle: true - }); - html += '
    '; + if (result.Items.length) { + html += '

    Resume

    '; + html += '
    '; + html += LibraryBrowser.getPosterViewHtml({ + items: result.Items, + preferBackdrop: true, + shape: 'backdrop', + overlayText: screenWidth >= 600, + showTitle: true, + showParentTitle: true + }); + html += '
    '; + } $(elem).html(html).createPosterItemMenus(); }); @@ -280,6 +287,9 @@ } else if (section == 'librarybuttons') { loadlibraryButtons(elem, userId, index); + } else { + + elem.empty(); } } @@ -287,15 +297,19 @@ var i, length; var sectionCount = 3; - var html = ''; - for (i = 0, length = sectionCount; i < length; i++) { + var elem = $('.sections', page); + + if (!elem.html().length) { + var html = ''; + for (i = 0, length = sectionCount; i < length; i++) { - html += '
    '; + html += '
    '; + } + + elem.html(html); } - $('.sections', page).html(html); - for (i = 0, length = sectionCount; i < length; i++) { loadSection(page, userId, displayPreferences, i); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 7d10593b0b..4ec99b32a4 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,12 +1,12 @@ (function (window, document, $) { - function renderHeader(page, user) { + function renderHeader(user) { var html = '
    '; - html += ''; - - html += 'MEDIABROWSER'; + html += ''; html += '
    '; @@ -41,11 +41,9 @@ html += '
    '; - var $page = $(page); + $(document.body).prepend(html); - $page.prepend(html); - - $page.trigger('headercreated'); + $(document).trigger('headercreated'); } function getItemHref(item) { @@ -84,7 +82,7 @@ $(panel).panel('toggle'); } - + function updateLibraryMenu(panel) { var userId = Dashboard.getCurrentUserId(); @@ -104,7 +102,13 @@ }).join(''); - $('.libraryMenuOptions').html(html); + var elem = $('.libraryMenuOptions').html(html); + + $('.viewMenuTextLink', elem).on('click', function () { + + $('.libraryMenuButtonText').html(this.innerHTML); + + }); }); ApiClient.getLiveTvInfo().done(function (liveTvInfo) { @@ -152,9 +156,11 @@ html += '
    '; - html += '

    MEDIABROWSER

    '; - html += '
    '; + + html += 'Home'; + html += '
    '; + html += getViewsHtml(user, channelCount, items, liveTvInfo); html += '
    '; @@ -249,6 +255,20 @@ }); } + function updateContextText(page) { + + var name = page.getAttribute('data-contextname'); + + if (name) { + + $('.libraryMenuButtonText').html('' + name + ''); + + } + else if ($(page).hasClass('allLibraryPage')) { + $('.libraryMenuButtonText').html('MEDIABROWSER'); + } + } + $(document).on('pageinit', ".libraryPage", function () { var page = this; @@ -265,18 +285,20 @@ var page = this; - updateLibraryNavLinks(page); - - if (!$('.viewMenuBar', page).length) { + if (!$('.viewMenuBar').length) { Dashboard.getCurrentUser().done(function (user) { - renderHeader(page, user); + renderHeader(user); updateCastIcon(); updateLibraryNavLinks(page); + updateContextText(page); }); + } else { + updateContextText(page); + updateLibraryNavLinks(page); } }).on('pageshow', ".libraryPage", function () { diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 6070285a00..5145f165a8 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -570,7 +570,7 @@ }; } - $(document).on('headercreated', '.libraryPage', function () { + $(document).on('headercreated', function () { $('.btnCast').on('click', function () { diff --git a/dashboard-ui/scripts/thememediaplayer.js b/dashboard-ui/scripts/thememediaplayer.js index 6767664c75..6995ac0fe1 100644 --- a/dashboard-ui/scripts/thememediaplayer.js +++ b/dashboard-ui/scripts/thememediaplayer.js @@ -42,6 +42,8 @@ function enabled() { + var userId = Dashboard.getCurrentUserId(); + var val = LocalSettings.val('enableThemeSongs', userId); return val == '1'; diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html index ca04674081..04bfe8e291 100644 --- a/dashboard-ui/songs.html +++ b/dashboard-ui/songs.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabSongs} diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index ac8fb48bea..e495556f67 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html index 483d19eeb3..baacbfbbbe 100644 --- a/dashboard-ui/tvlatest.html +++ b/dashboard-ui/tvlatest.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html index a9873977e3..7865f694a4 100644 --- a/dashboard-ui/tvpeople.html +++ b/dashboard-ui/tvpeople.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index e0975f8c4e..363eda7c26 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index fd515b52db..f77b871afa 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index ffb08542a4..7584e4bf42 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest} diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html index e2b9aba9a3..566547475a 100644 --- a/dashboard-ui/tvupcoming.html +++ b/dashboard-ui/tvupcoming.html @@ -4,7 +4,7 @@ ${TitleMediaBrowser} -
    +
    ${TabSuggested} ${TabLatest}