Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into item-detail-page-

# Conflicts:
#	src/assets/css/librarybrowser.css
#	src/itemdetails.html

src/controllers/itemdetailpage.js

@@ -1,4 +1,4 @@
-define(["loading", "appRouter", "layoutManager", "userSettings", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, userSettings, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) {
+define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuilder", "datetime", "mediaInfo", "backdrop", "listView", "itemContextMenu", "itemHelper", "dom", "indicators", "apphost", "imageLoader", "libraryMenu", "globalize", "browser", "events", "scrollHelper", "playbackManager", "libraryBrowser", "scrollStyles", "emby-itemscontainer", "emby-checkbox", "emby-button", "emby-playstatebutton", "emby-ratingbutton", "emby-scroller", "emby-select"], function (loading, appRouter, layoutManager, connectionManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager, libraryBrowser) {
     "use strict";
 
     function getPromise(apiClient, params) {
@@ -445,17 +445,11 @@ define(["loading", "appRouter", "layoutManager", "userSettings", "connectionMana
         }
     }
 
-    function enabled() {
-        return userSettings.enableBackdrops();
-    }
-
     function renderBackdrop(page, item, apiClient) {
-        if (enabled()) {
-            if (dom.getWindowSize().innerWidth >= 1000) {
-                backdrop.setBackdrops([item]);
-            } else {
-                backdrop.clear();
-            }
+        if (dom.getWindowSize().innerWidth >= 1000) {
+            backdrop.setBackdrops([item]);
+        } else {
+            backdrop.clear();
         }
     }
 

src/controllers/livetvstatus.js

@@ -187,16 +187,12 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo
         switch (providerId = providerId.toLowerCase()) {
             case "m3u":
                 return "M3U";
-
             case "hdhomerun":
-                return "HDHomerun";
-
+                return "HDHomeRun";
             case "hauppauge":
                 return "Hauppauge";
-
             case "satip":
                 return "DVB";
-
             default:
                 return "Unknown";
         }
@@ -206,13 +202,8 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo
         switch (providerId = providerId.toLowerCase()) {
             case "schedulesdirect":
                 return "Schedules Direct";
-
             case "xmltv":
-                return "Xml TV";
-
-            case "emby":
-                return "Emby Guide";
-
+                return "XMLTV";
             default:
                 return "Unknown";
         }
@@ -222,12 +213,8 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo
         switch (providerId = providerId.toLowerCase()) {
             case "xmltv":
                 return "livetvguideprovider.html?type=xmltv";
-
             case "schedulesdirect":
                 return "livetvguideprovider.html?type=schedulesdirect";
-
-            case "emby":
-                return "livetvguideprovider.html?type=emby";
         }
     }
 
@@ -238,7 +225,7 @@ define(["jQuery", "globalize", "scripts/taskbutton", "dom", "libraryMenu", "layo
             id: "SchedulesDirect"
         });
         menuItems.push({
-            name: "Xml TV",
+            name: "XMLTV",
             id: "xmltv"
         });
 

src/controllers/movies/moviegenres.js

@@ -114,7 +114,10 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
                         shape: getPortraitShape(),
                         scalable: true,
                         overlayMoreButton: true,
-                        allowBottomPadding: false
+                        allowBottomPadding: true,
+                        showTitle: true,
+                        centerText: true,
+                        showYear: true
                     });
                 }
                 if (result.Items.length >= query.Limit) {