diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index 7f5bc3ae35..e56858173f 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -7,10 +7,9 @@
-
Suggested
Latest
+
Suggested
Movies
-
Collections
Trailers
Genres
People
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index ff27474b1e..3ffe6bd6b4 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -174,7 +174,7 @@
var views = [];
if (counts.MovieCount || counts.TrailerCount) {
- views.push({ id: "moviesView", name: "Movies", url: "moviesrecommended.html", img: "css/images/items/list/chapter.png", background: "#0094FF" });
+ views.push({ id: "moviesView", name: "Movies", url: "movieslatest.html", img: "css/images/items/list/chapter.png", background: "#0094FF" });
}
if (counts.EpisodeCount || counts.SeriesCount) {
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 6ac1623634..9834b8ed8d 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -73,7 +73,7 @@
if (counts.MovieCount) {
- html += '';
+ html += '';
}
if (counts.SeriesCount) {
@@ -92,6 +92,10 @@
html += '';
}
+ if (counts.BoxSetCount) {
+ html += '';
+ }
+
$('.viewMenuRemoteControlButton', page).before(html);
}
@@ -122,75 +126,33 @@
html += '';
- html += '
';
+ html += '
';
if (counts.MovieCount) {
-
- html += getCollapsibleHtml('Movies', [
-
- { text: 'Suggested', href: 'moviesrecommended.html' },
- { text: 'Latest', href: 'movieslatest.html' },
- { text: 'Movies', href: 'movies.html' },
- { text: 'Collections', href: 'collections.html' },
- { text: 'Trailers', href: 'movietrailers.html' },
- { text: 'Genres', href: 'moviegenres.html' },
- { text: 'People', href: 'moviepeople.html' },
- { text: 'Studios', href: 'moviestudios.html' }
- ]);
+ html += '- Movies
';
}
if (counts.SeriesCount) {
- html += getCollapsibleHtml('TV', [
-
- { text: 'Suggested', href: 'tvrecommended.html' },
- { text: 'Latest', href: 'tvlatest.html' },
- { text: 'Upcoming', href: 'tvupcoming.html' },
- { text: 'Shows', href: 'tvshows.html' },
- { text: 'Episodes', href: 'episodes.html' },
- { text: 'Genres', href: 'tvgenres.html' },
- { text: 'People', href: 'tvpeople.html' },
- { text: 'Networks', href: 'tvstudios.html' }
- ]);
+ html += '- TV
';
}
if (liveTvInfo.EnabledUsers.indexOf(Dashboard.getCurrentUserId()) != -1) {
- html += getCollapsibleHtml('Live TV', [
-
- { text: 'Suggested', href: 'livetvsuggested.html' },
- { text: 'Guide', href: 'livetvguide.html' },
- { text: 'Channels', href: 'livetvchannels.html' },
- { text: 'Recordings', href: 'livetvrecordings.html' },
- { text: 'Scheduled', href: 'livetvtimers.html' },
- { text: 'Series', href: 'livetvseriestimers.html' }
- ]);
+ html += '- Live TV
';
}
if (counts.SongCount || counts.MusicVideoCount) {
- html += getCollapsibleHtml('Music', [
-
- { text: 'Suggested', href: 'musicrecommended.html' },
- { text: 'Songs', href: 'songs.html' },
- { text: 'Albums', href: 'musicalbums.html' },
- { text: 'Album Artists', href: 'musicalbumartists.html' },
- { text: 'Artists', href: 'musicartists.html' },
- { text: 'Music Videos', href: 'musicvideos.html' },
- { text: 'Genres', href: 'musicgenres.html' }
- ]);
+ html += '- Music
';
}
if (counts.GameCount) {
- html += getCollapsibleHtml('Games', [
-
- { text: 'Suggested', href: 'gamesrecommended.html' },
- { text: 'Games', href: 'games.html' },
- { text: 'Game Systems', href: 'gamesystems.html' },
- { text: 'Genres', href: 'gamegenres.html' },
- { text: 'Studios', href: 'gamestudios.html' }
- ]);
+ html += '- Games
';
}
- html += '
';
+ if (counts.BoxSetCount) {
+ html += '
Collections';
+ }
+ html += '';
html += '
';
$(page).append(html);
@@ -201,50 +163,23 @@
return panel;
}
- function getCollapsibleHtml(title, links) {
-
- var i, length;
- var selectedIndex = -1;
- var collapsed = 'true';
-
- var currentUrl = window.location.toString().toLowerCase();
-
- for (i = 0, length = links.length; i < length; i++) {
-
- if (currentUrl.indexOf(links[i].href.toLowerCase()) != -1) {
- collapsed = 'false';
- selectedIndex = i;
- break;
- }
- }
-
- var html = '';
-
- html += '
';
- html += '';
-
- html += '
';
-
- for (i = 0, length = links.length; i < length; i++) {
-
- var link = links[i];
-
- var href = selectedIndex == i ? '#' : link.href;
-
- html += '- ' + link.text + '
';
- }
-
- html += '
';
- html += '
';
-
- return html;
- }
-
window.LibraryMenu = {
showLibraryMenu: showLibraryMenu
};
- $(document).on('pagebeforeshow', ".libraryPage", function () {
+ $(document).on('pageinit', ".libraryPage", function () {
+
+ var page = this;
+
+ $('.libraryViewNav', page).wrapInner('
');
+
+ $('.libraryViewNav a', page).each(function () {
+
+ this.innerHTML = '
' + this.innerHTML + '';
+
+ });
+
+ }).on('pagebeforeshow', ".libraryPage", function () {
var page = this;