diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html new file mode 100644 index 0000000000..755f822eac --- /dev/null +++ b/dashboard-ui/boxset.html @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/dashboard-ui/boxsets.html b/dashboard-ui/boxsets.html index e19a65ce2d..1f9ccefcce 100644 --- a/dashboard-ui/boxsets.html +++ b/dashboard-ui/boxsets.html @@ -20,7 +20,9 @@ -
+
+
+
diff --git a/dashboard-ui/css/images/items/list/audiowide.png b/dashboard-ui/css/images/items/list/audiowide.png deleted file mode 100644 index fc3e44746c..0000000000 Binary files a/dashboard-ui/css/images/items/list/audiowide.png and /dev/null differ diff --git a/dashboard-ui/css/images/items/list/game.png b/dashboard-ui/css/images/items/list/game.png new file mode 100644 index 0000000000..4f98ea07f5 Binary files /dev/null and b/dashboard-ui/css/images/items/list/game.png differ diff --git a/dashboard-ui/css/images/items/list/gamecollection.png b/dashboard-ui/css/images/items/list/gamecollection.png new file mode 100644 index 0000000000..5f499a3339 Binary files /dev/null and b/dashboard-ui/css/images/items/list/gamecollection.png differ diff --git a/dashboard-ui/css/images/items/list/video.png b/dashboard-ui/css/images/items/list/video.png new file mode 100644 index 0000000000..a035e38351 Binary files /dev/null and b/dashboard-ui/css/images/items/list/video.png differ diff --git a/dashboard-ui/css/images/userdata/played.png b/dashboard-ui/css/images/userdata/played.png index 3f85dcee88..08991617af 100644 Binary files a/dashboard-ui/css/images/userdata/played.png and b/dashboard-ui/css/images/userdata/played.png differ diff --git a/dashboard-ui/css/images/userdata/unplayed.png b/dashboard-ui/css/images/userdata/unplayed.png index dc8faa5562..299c489fd6 100644 Binary files a/dashboard-ui/css/images/userdata/unplayed.png and b/dashboard-ui/css/images/userdata/unplayed.png differ diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index eee9e10446..18d730fe93 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -11,21 +11,6 @@

Views

-
- -
Movies
- -
-
- -
TV Shows
- -
-
- -
Music
- -

Collections

diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index af377ff826..7478c761a8 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -74,7 +74,7 @@
-

Filters:

+

Filters:

 diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 02cf348499..6641ca9f7a 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -721,6 +721,13 @@ var userData = item.UserData || {}; + //played/unplayed + if (userData.Played) { + html += '
Played
'; + } else { + html += '
Played
'; + } + if (typeof userData.Likes == "undefined") { html += '
Dislike
'; html += '
Like
'; @@ -738,13 +745,6 @@ html += '
Favorite
'; } - //played/unplayed - if (userData.Played) { - html += '
Played
'; - } else { - html += '
Unplayed
'; - } - $('#itemRatings', page).html(html); }, diff --git a/dashboard-ui/scripts/boxset.js b/dashboard-ui/scripts/boxset.js new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/dashboard-ui/scripts/boxset.js @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index e2ae9d52b8..f00682877d 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -1,5 +1,18 @@ (function ($, document, apiClient) { + function getViewHtml(view) { + + var html = ''; + + html += '
'; + html += ''; + html += '
' + view.name + '
'; + html += ''; + html += '
'; + + return html; + } + $(document).on('pageshow', "#indexPage", function () { var page = this; @@ -10,8 +23,6 @@ return; } - page = $(page); - var options = { sortBy: "SortName" @@ -26,26 +37,34 @@ }); + // Kick this off now. Just see if there are any games in the library + var gamesPromise = ApiClient.getItems(userId, { Recursive: true, limit: 0, MediaTypes: "Game" }); + var views = [ - { name: "Movies", url: "moviesrecommended.html", img: "css/images/items/list/chapter.png", background: "#E12026" }, + { name: "Movies", url: "moviesrecommended.html", img: "css/images/items/list/chapter.png", background: "#0094FF" }, { name: "TV Shows", url: "tvrecommended.html", img: "css/images/items/list/collection.png", background: "#FF870F" }, - { name: "Music", url: "musicrecommended.html", img: "css/images/items/list/audiowide.png", background: "#4BB3DD" } + { name: "Music", url: "musicrecommended.html", img: "css/images/items/list/audiocollection.png", background: "#6FBD45" } ]; var html = ''; for (var i = 0, length = views.length; i < length; i++) { - var view = views[i]; - - html += '
'; - html += ''; - html += '
' + view.name + '
'; - html += ''; - html += '
'; + html += getViewHtml(views[i]); } $('#views', page).html(html); + + gamesPromise.done(function (result) { + + if (result.TotalRecordCount) { + + var view = { name: "Games", url: "#", img: "css/images/items/list/gamecollection.png", background: "#E12026" }; + + $('#views', page).append(getViewHtml(view)); + } + + }); }); })(jQuery, document, ApiClient); \ No newline at end of file diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 0c51ed1447..29f4cdec46 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -47,10 +47,16 @@ width: 352, tag: item.BackdropImageTags[0] }) + "' />"; - } else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") { + } + else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") { html += ""; - } else { + } + else if (item.MediaType == "Video") { + + html += ""; + } + else { html += ""; } @@ -190,7 +196,7 @@ tag: item.BackdropImageTags[0] }) + "' />"; } else { - html += ""; + html += ""; } if (showText) { diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index bd1e247789..c31406a10d 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -63,7 +63,7 @@ } else { - html += ''; + html += ''; } html += '';