1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge pull request #326 from grafixeyehero/icon

Fix icon
This commit is contained in:
Anthony Lavado 2019-05-23 20:06:23 -04:00 committed by GitHub
commit edbe4c4345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 22 deletions

View file

@ -1551,12 +1551,24 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (collectionType === 'livetv') { if (collectionType === 'livetv') {
return '<i class="cardImageIcon md-icon">&#xE1B2;</i>'; return '<i class="cardImageIcon md-icon">&#xE1B2;</i>';
} }
if (collectionType === 'movies') {
return '<i class="cardImageIcon md-icon">&#xe04a;</i>';
}
if (collectionType === 'tvshows') {
return '<i class="cardImageIcon md-icon">&#xe333;</i>';
}
if (collectionType === 'homevideos' || collectionType === 'photos') { if (collectionType === 'homevideos' || collectionType === 'photos') {
return '<i class="cardImageIcon md-icon">&#xE412;</i>'; return '<i class="cardImageIcon md-icon">&#xe413;</i>';
} }
if (collectionType === 'music') { if (collectionType === 'music') {
return '<i class="cardImageIcon md-icon">&#xE310;</i>'; return '<i class="cardImageIcon md-icon">&#xE310;</i>';
} }
if (collectionType === 'musicvideos') {
return '<i class="cardImageIcon md-icon">&#xe063;</i>';
}
if (collectionType === 'books') {
return '<i class="cardImageIcon md-icon">&#xe02f;</i>';
}
if (item.Type === 'MusicAlbum') { if (item.Type === 'MusicAlbum') {
return '<i class="cardImageIcon md-icon">&#xE019;</i>'; return '<i class="cardImageIcon md-icon">&#xE019;</i>';
} }

View file

@ -198,37 +198,37 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
var icon; var icon;
switch (item.CollectionType) { switch (item.CollectionType) {
case "movies": case "movies":
icon = "local_movies"; icon = "video_library";
break; break;
case "music": case "music":
icon = "library_music"; icon = "library_music";
break; break;
case "photos": case "photos":
icon = "photo"; icon = "photo_library";
break; break;
case "livetv": case "livetv":
icon = "live_tv"; icon = "live_tv";
break; break;
case "tvshows": case "tvshows":
icon = "live_tv"; icon = "tv";
break; break;
case "trailers": case "trailers":
icon = "local_movies"; icon = "local_movies";
break; break;
case "homevideos": case "homevideos":
icon = "video_library"; icon = "photo_library";
break; break;
case "musicvideos": case "musicvideos":
icon = "video_library"; icon = "music_video";
break; break;
case "books": case "books":
icon = "folder"; icon = "library_books";
break; break;
case "channels": case "channels":
icon = "folder"; icon = "videocam";
break; break;
case "playlists": case "playlists":
icon = "folder"; icon = "view_list";
break; break;
default: default:
icon = "folder"; icon = "folder";

View file

@ -220,22 +220,27 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
function getIcon(type) { function getIcon(type) {
switch (type) { switch (type) {
case "movies": case "movies":
return "local_movies"; return "video_library";
case "music": case "music":
return "library_music"; return "library_music";
case "photos": case "photos":
return "photo"; return "photo_library";
case "livetv": case "livetv":
case "tvshows":
return "live_tv"; return "live_tv";
case "tvshows":
return "tv";
case "trailers": case "trailers":
return "local_movies"; return "local_movies";
case "homevideos": case "homevideos":
return "photo_library";
case "musicvideos": case "musicvideos":
return "video_library"; return "video_library";
case "books": case "books":
return "library_books";
case "channels": case "channels":
return "videocam";
case "playlists": case "playlists":
return "view_list";
default: default:
return "folder"; return "folder";
} }
@ -302,9 +307,9 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
html += "&nbsp;"; html += "&nbsp;";
html += "</div>"; html += "</div>";
} else if (virtualFolder.Locations.length && virtualFolder.Locations.length === 1) { } else if (virtualFolder.Locations.length && virtualFolder.Locations.length === 1) {
html += "<div class='cardText cardText-secondary'>"; html += "<div class='cardText cardText-secondary'>";
html += virtualFolder.Locations[0]; html += virtualFolder.Locations[0];
html += "</div>"; html += "</div>";
} else { } else {
html += "<div class='cardText cardText-secondary'>"; html += "<div class='cardText cardText-secondary'>";
html += globalize.translate("NumLocationsValue", virtualFolder.Locations.length); html += globalize.translate("NumLocationsValue", virtualFolder.Locations.length);

View file

@ -12,6 +12,7 @@
letter-spacing: normal; letter-spacing: normal;
text-transform: none; text-transform: none;
display: inline-block; display: inline-block;
margin-right: 4px;
white-space: nowrap; white-space: nowrap;
word-wrap: normal; word-wrap: normal;
direction: ltr; direction: ltr;

View file

@ -323,13 +323,13 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
name: globalize.translate("TabLiveTV"), name: globalize.translate("TabLiveTV"),
href: "livetvstatus.html", href: "livetvstatus.html",
pageIds: ["liveTvStatusPage", "liveTvTunerPage"], pageIds: ["liveTvStatusPage", "liveTvTunerPage"],
icon: "tv" icon: "live_tv"
}); });
links.push({ links.push({
name: globalize.translate("DVR"), name: globalize.translate("DVR"),
href: "livetvsettings.html", href: "livetvsettings.html",
pageIds: ["liveTvSettingsPage"], pageIds: ["liveTvSettingsPage"],
icon: "list" icon: "dvr"
}); });
links.push({ links.push({
divider: true, divider: true,
@ -534,13 +534,12 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
else if ("livetv" === i.CollectionType) { else if ("livetv" === i.CollectionType) {
itemId = "livetv"; itemId = "livetv";
} }
else if ("music" === i.CollectionType) {
else if ("photos" === i.CollectionType) {
icon = "photo_library";
}
else if ("music" === i.CollectionType || "musicvideos" === i.CollectionType) {
icon = "library_music"; icon = "library_music";
} }
else if ("musicvideos" === i.CollectionType) {
icon = "music_video";
}
else if ("books" === i.CollectionType) { else if ("books" === i.CollectionType) {
icon = "library_books"; icon = "library_books";
} }
@ -550,6 +549,9 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
else if ("movies" === i.CollectionType) { else if ("movies" === i.CollectionType) {
icon = "video_library"; icon = "video_library";
} }
else if ("homevideos" === i.CollectionType || "photos" === i.CollectionType) {
icon = "photo_library";
}
else if ("channels" === i.CollectionType || "Channel" === i.Type) { else if ("channels" === i.CollectionType || "Channel" === i.Type) {
icon = "videocam"; icon = "videocam";
} }