From 71d59feb767acfd4cdc81a33020d2b2b88453609 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 16 May 2019 01:54:01 +0300 Subject: [PATCH 1/4] Fix dashboard Library icon --- src/controllers/medialibrarypage.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index a6e86f0ef8..e97d0af4d5 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 "video_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); From 93be06bdd4ee64f89cdac3748e5db159e5a7d921 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Thu, 16 May 2019 04:33:57 +0300 Subject: [PATCH 2/4] update icon --- src/components/cardbuilder/cardBuilder.js | 14 +++++++++++++- src/components/homesections/homesections.js | 16 ++++++++-------- src/css/material-icons/style.css | 1 + src/scripts/librarymenu.js | 10 ++++++++-- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index d8c71d4616..7b3de71e92 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1565,12 +1565,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 2f4f51e398..00c938b216 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 = "video_label"; 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/css/material-icons/style.css b/src/css/material-icons/style.css index 2d410b9985..eaedd1725d 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 484ee1135d..0fe3add05b 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -323,7 +323,7 @@ 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"), @@ -538,9 +538,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " 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 +553,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " else if ("movies" === i.CollectionType) { icon = "video_library"; } + else if ("homevideos" === i.CollectionType) { + icon = "video_label"; + } else if ("channels" === i.CollectionType || "Channel" === i.Type) { icon = "videocam"; } From f2ef23c9a8b0fa92946da5b9116ac12132b05415 Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Fri, 17 May 2019 01:18:13 +0300 Subject: [PATCH 3/4] update icon --- src/scripts/librarymenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 0fe3add05b..1f9d1deed6 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -329,7 +329,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " name: globalize.translate("DVR"), href: "livetvsettings.html", pageIds: ["liveTvSettingsPage"], - icon: "list" + icon: "dvr" }); links.push({ divider: true, From 7e0100ef3f69e9d55476d8ad52843b363d13c1cd Mon Sep 17 00:00:00 2001 From: grafixeyehero Date: Fri, 17 May 2019 21:29:31 +0300 Subject: [PATCH 4/4] update icon --- src/components/cardbuilder/cardBuilder.js | 2 +- src/components/homesections/homesections.js | 2 +- src/controllers/medialibrarypage.js | 2 +- src/scripts/librarymenu.js | 8 ++------ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 7b3de71e92..f21f177140 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -1572,7 +1572,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana return ''; } if (collectionType === 'homevideos' || collectionType === 'photos') { - return ''; + return ''; } if (collectionType === 'music') { return ''; diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js index 00c938b216..c4f5d064b3 100644 --- a/src/components/homesections/homesections.js +++ b/src/components/homesections/homesections.js @@ -216,7 +216,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la icon = "local_movies"; break; case "homevideos": - icon = "video_label"; + icon = "photo_library"; break; case "musicvideos": icon = "music_video"; diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js index e97d0af4d5..458d415734 100644 --- a/src/controllers/medialibrarypage.js +++ b/src/controllers/medialibrarypage.js @@ -232,7 +232,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl case "trailers": return "local_movies"; case "homevideos": - return "video_library"; + return "photo_library"; case "musicvideos": return "video_library"; case "books": diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js index 1f9d1deed6..cc9ef030f1 100644 --- a/src/scripts/librarymenu.js +++ b/src/scripts/librarymenu.js @@ -534,10 +534,6 @@ 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) { icon = "library_music"; } @@ -553,8 +549,8 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", " else if ("movies" === i.CollectionType) { icon = "video_library"; } - else if ("homevideos" === i.CollectionType) { - icon = "video_label"; + else if ("homevideos" === i.CollectionType || "photos" === i.CollectionType) { + icon = "photo_library"; } else if ("channels" === i.CollectionType || "Channel" === i.Type) { icon = "videocam";