diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index b41428e2a..1faacff76 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1551,12 +1551,24 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana if (collectionType === 'livetv') { return ''; } + if (collectionType === 'movies') { + return ''; + } + if (collectionType === 'tvshows') { + return ''; + } if (collectionType === 'homevideos' || collectionType === 'photos') { - return ''; + return ''; } if (collectionType === 'music') { return ''; } + if (collectionType === 'musicvideos') { + return ''; + } + if (collectionType === 'books') { + return ''; + } if (item.Type === 'MusicAlbum') { return ''; } diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 2f4f51e39..c4f5d064b 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -198,37 +198,37 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la var icon; switch (item.CollectionType) { case "movies": - icon = "local_movies"; + icon = "video_library"; break; case "music": icon = "library_music"; break; case "photos": - icon = "photo"; + icon = "photo_library"; break; case "livetv": icon = "live_tv"; break; case "tvshows": - icon = "live_tv"; + icon = "tv"; break; case "trailers": icon = "local_movies"; break; case "homevideos": - icon = "video_library"; + icon = "photo_library"; break; case "musicvideos": - icon = "video_library"; + icon = "music_video"; break; case "books": - icon = "folder"; + icon = "library_books"; break; case "channels": - icon = "folder"; + icon = "videocam"; break; case "playlists": - icon = "folder"; + icon = "view_list"; break; default: icon = "folder"; diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index a6e86f0ef..458d41573 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -220,22 +220,27 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl function getIcon(type) { switch (type) { case "movies": - return "local_movies"; + return "video_library"; case "music": return "library_music"; case "photos": - return "photo"; + return "photo_library"; case "livetv": - case "tvshows": return "live_tv"; + case "tvshows": + return "tv"; case "trailers": return "local_movies"; case "homevideos": + return "photo_library"; case "musicvideos": return "video_library"; case "books": + return "library_books"; case "channels": + return "videocam"; case "playlists": + return "view_list"; default: return "folder"; } @@ -302,9 +307,9 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl html += " "; html += ""; } else if (virtualFolder.Locations.length && virtualFolder.Locations.length === 1) { - html += "
"; - html += virtualFolder.Locations[0]; - html += "
"; + html += "
"; + html += virtualFolder.Locations[0]; + html += "
"; } else { html += "
"; html += globalize.translate("NumLocationsValue", virtualFolder.Locations.length); diff --git a/src/css/material-icons/style.css b/src/css/material-icons/style.css index 2d410b998..eaedd1725 100644 --- a/src/css/material-icons/style.css +++ b/src/css/material-icons/style.css @@ -12,6 +12,7 @@ letter-spacing: normal; text-transform: none; display: inline-block; + margin-right: 4px; white-space: nowrap; word-wrap: normal; direction: ltr; diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 484ee1135..cc9ef030f 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -323,13 +323,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("TabLiveTV"), href: "livetvstatus.html", pageIds: ["liveTvStatusPage", "liveTvTunerPage"], - icon: "tv" + icon: "live_tv" }); links.push({ name: globalize.translate("DVR"), href: "livetvsettings.html", pageIds: ["liveTvSettingsPage"], - icon: "list" + icon: "dvr" }); links.push({ divider: true, @@ -534,13 +534,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " else if ("livetv" === i.CollectionType) { itemId = "livetv"; } - - else if ("photos" === i.CollectionType) { - icon = "photo_library"; - } - else if ("music" === i.CollectionType || "musicvideos" === i.CollectionType) { + else if ("music" === i.CollectionType) { icon = "library_music"; } + else if ("musicvideos" === i.CollectionType) { + icon = "music_video"; + } else if ("books" === i.CollectionType) { icon = "library_books"; } @@ -550,6 +549,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " else if ("movies" === i.CollectionType) { icon = "video_library"; } + else if ("homevideos" === i.CollectionType || "photos" === i.CollectionType) { + icon = "photo_library"; + } else if ("channels" === i.CollectionType || "Channel" === i.Type) { icon = "videocam"; }