From 138611efb519ca8a71a19133209e24e3ce2c933b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 17 Oct 2016 12:41:18 -0400
Subject: [PATCH] update live tv labels

---
 .../bower_components/emby-webcomponents/.bower.json |  8 ++++----
 .../emby-webcomponents/guide/guide.css              | 13 ++++++++++++-
 .../emby-webcomponents/guide/guide.js               |  9 +++++----
 dashboard-ui/scripts/livetvcomponents.js            |  2 +-
 dashboard-ui/scripts/livetvrecordings.js            |  4 +++-
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index b09177f0ca..18a9658d07 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -14,12 +14,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.313",
-  "_release": "1.4.313",
+  "version": "1.4.314",
+  "_release": "1.4.314",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.313",
-    "commit": "79c18a7f2b379d8162bdca36b7cf0713bbe43ad8"
+    "tag": "1.4.314",
+    "commit": "087a1aa017a98fe347ce4388a794b3de13468a4d"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.1",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
index d5f388ee0b..997a9b3cee 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css
@@ -317,8 +317,9 @@
     padding: 0 .5em 0;
     overflow: hidden;
     text-overflow: ellipsis;
-    display: flex;
     align-items: center;
+    /* Need block here or the ellipsis overflow is lost */
+    display: block;
 }
 
 .programIcon {
@@ -335,6 +336,16 @@
         margin-left: .25em;
     }
 
+.programTextIcon {
+    font-weight: bold;
+    color: rgb(30,30,30);
+    font-size: 1.0em;
+    background: #555;
+    padding: .18em .32em;
+    border-radius: .25em;
+    margin-right: .35em;
+}
+
 .guideChannelNumber {
     padding-left: 1em;
     max-width: 30%;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
index 390a695d54..32fc92c955 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js
@@ -378,7 +378,7 @@
             return '<i class="md-icon programIcon timerIcon">&#xE061;</i>';
         }
 
-        function getChannelProgramsHtml(context, date, channel, programs, options) {
+        function getChannelProgramsHtml(context, date, channel, programs, options, index) {
 
             var html = '';
 
@@ -482,7 +482,7 @@
                     timerAttributes += ' data-seriestimerid="' + program.SeriesTimerId + '"';
                 }
 
-                html += '<button data-action="' + clickAction + '"' + timerAttributes + ' data-isfolder="' + program.IsFolder + '" data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">';
+                html += '<button data-action="' + clickAction + '"' + timerAttributes + ' data-id="' + program.Id + '" data-serverid="' + program.ServerId + '" data-type="' + program.Type + '" class="' + cssClass + '" style="left:' + startPercent + '%;width:' + endPercent + '%;">';
 
                 if (displayInnerContent) {
                     var guideProgramNameClass = "guideProgramName";
@@ -506,7 +506,8 @@
                     html += '</div>';
 
                     if (program.IsHD && options.showHdIcon) {
-                        html += '<i class="guideHdIcon md-icon programIcon">hd</i>';
+                        //html += '<i class="guideHdIcon md-icon programIcon">hd</i>';
+                        html += '<div class="programIcon programTextIcon">HD</div>';
                     }
 
                     html += getTimerIndicator(program);
@@ -543,7 +544,7 @@
 
             for (var i = 0, length = channels.length; i < length; i++) {
 
-                html.push(getChannelProgramsHtml(context, date, channels[i], programs, options));
+                html.push(getChannelProgramsHtml(context, date, channels[i], programs, options, i));
             }
 
             var programGrid = context.querySelector('.programGrid');
diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js
index 9f5c0b627a..734bbf3ea1 100644
--- a/dashboard-ui/scripts/livetvcomponents.js
+++ b/dashboard-ui/scripts/livetvcomponents.js
@@ -87,7 +87,7 @@
             html += cardBuilder.getCardsHtml({
                 items: group.items,
                 shape: getBackdropShape(),
-                showTitle: true,
+                showParentTitleOrTitle: true,
                 showAirTime: true,
                 showAirEndTime: true,
                 showChannelName: true,
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 7ee5daf21d..956d6c9e77 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -130,7 +130,9 @@
 
         promise.then(function (result) {
 
-            renderRecordings(context.querySelector('#latestRecordings'), result.Items);
+            renderRecordings(context.querySelector('#latestRecordings'), result.Items, {
+                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop')
+            });
 
             Dashboard.hideLoadingMsg();
         });