diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 14b963749..0321c03bc 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -79,6 +79,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos @@ -89,6 +90,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 580fba389..447eff25e 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -55,6 +55,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos @@ -65,6 +66,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos @@ -75,6 +77,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html new file mode 100644 index 000000000..677691867 --- /dev/null +++ b/dashboard-ui/musicalbumartists.html @@ -0,0 +1,85 @@ + + + + Media Browser + + +
+
+ Suggested + Songs + Albums + Album Artists + Artists + Genres + Music Videos +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+ + Sort By: + + + + + + + + + + + + + +
+ +
+ + Sort Order: + + + + + + + +
+
+
+
+
+
+ + Filters: + + + + + + + + + +
+
+
+
+ + diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index 495b7ffbc..190f7f8b5 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -9,6 +9,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index 1c10a6cda..38d33de70 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -9,6 +9,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index 43cd54179..49c3709b4 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -9,6 +9,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html index 92b6badbc..d2c74a0c6 100644 --- a/dashboard-ui/musicrecommended.html +++ b/dashboard-ui/musicrecommended.html @@ -9,6 +9,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index 4b23a506d..3433d8370 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -10,6 +10,7 @@ Suggested Songs Albums + Album Artists Artists Genres Music Videos diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 820dab914..5d64b3266 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -114,7 +114,7 @@ if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "BoxSet") { return "movies"; } - if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "Artist" || item.Type == "MusicVideo") { + if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicVideo") { return "music"; } if (item.MediaType == "Game") { @@ -311,7 +311,7 @@ var artist = artists[i]; - html.push('' + artist + ''); + html.push('' + artist + ''); } diff --git a/dashboard-ui/scripts/edititemimages.js b/dashboard-ui/scripts/edititemimages.js index de4f904e5..6d3222753 100644 --- a/dashboard-ui/scripts/edititemimages.js +++ b/dashboard-ui/scripts/edititemimages.js @@ -18,10 +18,10 @@ function getBaseRemoteOptions() { var options = {}; - if (currentItem.Type == "Artist") { - options.artist = currentItem.Name; + if (currentItem.Type == "Year") { + options.year = currentItem.Name; } - else if (currentItem.Type == "Artist") { + else if (currentItem.Type == "MusicArtist") { options.artist = currentItem.Name; } else if (currentItem.Type == "Person") { @@ -157,7 +157,7 @@ if (currentItem.Type == "Episode") { cssClass += " remoteBackdropImage"; } - else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist" || currentItem.Type == "Artist") { + else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist") { cssClass += " remoteDiscImage"; } else { @@ -300,7 +300,7 @@ updateTabs(page, item); - if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "Artist" || item.Type == "GameGenre") { + if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "MusicArtist" || item.Type == "GameGenre") { $('#btnEditPeople', page).hide(); } else { $('#btnEditPeople', page).show(); diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 1658ac3fc..ab79b0441 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -39,7 +39,7 @@ } if (!item.ImageTags || !item.ImageTags.Logo) { - if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "Series" || item.Type == "Artist" || item.Type == "MusicArtist" || item.Type == "BoxSet") { + if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "Series" || item.Type == "MusicArtist" || item.Type == "BoxSet") { htmlName += ''; } } @@ -252,10 +252,10 @@ return; } - name = getParameterByName('artist', url); + name = getParameterByName('musicartist', url); if (name) { - self.currentItemType = "Artist"; + self.currentItemType = "MusicArtist"; self.currentItemName = name; return; } @@ -294,7 +294,7 @@ return ApiClient.getGameGenre(currentItemName, Dashboard.getCurrentUserId()); } - if (currentItemType == "Artist") { + if (currentItemType == "MusicArtist" && currentItemName) { return ApiClient.getArtist(currentItemName, Dashboard.getCurrentUserId()); } @@ -314,7 +314,7 @@ item.Type == "Genre" || item.Type == "MusicGenre" || item.Type == "GameGenre" || - item.Type == "Artist") { + item.Type == "MusicArtist") { query = item.Type + "=" + ApiClient.encodeName(item.Name); } else { @@ -387,7 +387,7 @@ setFieldVisibilities(page, item); fillItemInfo(page, item); - if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "Artist") { + if (item.Type == "Person" || item.Type == "Studio" || item.Type == "MusicGenre" || item.Type == "Genre" || item.Type == "MusicArtist") { $('#btnEditPeople', page).hide(); } else { $('#btnEditPeople', page).show(); @@ -523,7 +523,7 @@ $('#fldImdb', page).hide(); } - if (item.Type == "Audio" || item.Type == "Artist" || item.Type == "MusicArtist" || item.Type == "MusicAlbum") { + if (item.Type == "Audio" || item.Type == "MusicArtist" || item.Type == "MusicAlbum") { $('#fldMusicBrainz', page).show(); } else { $('#fldMusicBrainz', page).hide(); @@ -995,7 +995,7 @@ var updatePromise; - if (currentItem.Type == "Artist") { + if (currentItem.Type == "MusicArtist") { updatePromise = ApiClient.updateArtist(item); } else if (currentItem.Type == "Genre") { @@ -1129,7 +1129,7 @@ if (val) { - if (currentItem.Type == "MusicArtist" || currentItem.Type == "Artist") { + if (currentItem.Type == "MusicArtist") { $('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/artist/' + val); } else { $('#btnOpenMusicbrainz', page).attr('href', 'http://musicbrainz.org/release/' + val); @@ -1213,7 +1213,7 @@ var force = true; - if (currentItem.Type == "Artist") { + if (currentItem.Type == "MusicArtist") { refreshPromise = ApiClient.refreshArtist(currentItem.Name, force); } else if (currentItem.Type == "Genre") { diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index 29f2748c8..d4a634719 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -37,7 +37,7 @@ return ApiClient.getGameGenre(name, Dashboard.getCurrentUserId()); } - name = getParameterByName('artist'); + name = getParameterByName('musicartist'); if (name) { return ApiClient.getArtist(name, Dashboard.getCurrentUserId()); @@ -134,7 +134,7 @@ if (context == "music" && item.Type == "MusicGenre") { $('#musicGenreTabs', page).show(); } - if (context == "music" && item.Type == "Artist") { + if (context == "music" && item.Type == "MusicArtist") { $('#artistTabs', page).show(); } if (context == "games" && item.Type == "GameGenre") { @@ -389,7 +389,7 @@ else if (currentItem.Type == "Studio") { query.Studios = currentItem.Name; } - else if (currentItem.Type == "Artist") { + else if (currentItem.Type == "MusicArtist") { query.Artists = currentItem.Name; } } diff --git a/dashboard-ui/scripts/itemgallery.js b/dashboard-ui/scripts/itemgallery.js index a0da675ae..03b8d494d 100644 --- a/dashboard-ui/scripts/itemgallery.js +++ b/dashboard-ui/scripts/itemgallery.js @@ -24,7 +24,7 @@ return ApiClient.getGenre(name, Dashboard.getCurrentUserId()); } - name = getParameterByName('artist'); + name = getParameterByName('musicartist'); if (name) { return ApiClient.getArtist(name, Dashboard.getCurrentUserId()); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index e6c40abde..e28a2a67b 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -153,7 +153,7 @@ imgUrl = "css/images/items/list/person.png"; isDefault = true; } - else if (item.Type == "Artist") { + else if (item.Type == "MusicArtist") { imgUrl = "css/images/items/list/audiocollection.png"; isDefault = true; @@ -229,7 +229,7 @@ //html += '

' + childText + '

'; } - else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "Artist" || item.Type == "MusicGenre" || item.Type == "GameGenre") { + else if (item.Type == "Genre" || item.Type == "Studio" || item.Type == "Person" || item.Type == "MusicArtist" || item.Type == "MusicGenre" || item.Type == "GameGenre") { html += LibraryBrowser.getItemCountsHtml(options, item); } @@ -426,7 +426,7 @@ if (item.AlbumArtist) { - html += '' + item.AlbumArtist + ''; + html += '' + item.AlbumArtist + ''; } else { html += ''; @@ -470,7 +470,7 @@ var artist = artists[i]; - html.push('' + artist + ''); + html.push('' + artist + ''); } @@ -495,7 +495,7 @@ html += '