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

Merge remote-tracking branch 'upstream/master' into fix-icons-webos2

Browse source 
Conflicts:
	src/controllers/dashboard/plugins/available.js
	src/controllers/dashboard/plugins/installed.js
This commit is contained in:
Dmitry Lyzo 2020-04-28 16:55:33 +03:00
commit 7905a868c8
60 changed files with 447 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/dashboard/plugins/available.js
View file

@ -98,21 +98,14 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-button", "emby
html += '<div class="cardScalable visualCardBox-cardScalable">';
html += '<div class="cardPadder cardPadder-backdrop"></div>';
html += '<a class="cardContent cardImageContainer" is="emby-linkbutton" href="' + href + '"' + target + ">";
if (plugin.thumbImage) {
html += '<div class="cardImage coveredImage" style="background-image:url(\'' + plugin.thumbImage + "');\">";
html += "</div>";
} else {
html += '<span class="cardImageIcon material-icons folder"></span>';
}
html += '<span class="cardImageIcon material-icons folder"></span>';
html += "</a>";
html += "</div>";
html += '<div class="cardFooter">';
html += "<div class='cardText'>";
html += plugin.name;
html += "</div>";
var installedPlugin = plugin.isApp ? null : installedPlugins.filter(function (ip) {
var installedPlugin = installedPlugins.filter(function (ip) {
return ip.Id == plugin.guid;
})[0];
html += "<div class='cardText cardText-secondary'>";