From 231ed3c315bb0317f22a5f17d09c40466a308b6a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 6 Jan 2014 13:25:33 -0500
Subject: [PATCH] updated tv guide

---
 dashboard-ui/css/livetv.css                 | 24 +++++++++++++++++++--
 dashboard-ui/edititemimages.html            |  2 +-
 dashboard-ui/livetvguide.html               |  4 ----
 dashboard-ui/livetvrecordings.html          |  2 +-
 dashboard-ui/scripts/livetvguide.js         | 16 +++++++++++++-
 dashboard-ui/scripts/livetvrecordinglist.js |  4 ++--
 6 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css
index 45924cb53a..6a5d581748 100644
--- a/dashboard-ui/css/livetv.css
+++ b/dashboard-ui/css/livetv.css
@@ -168,7 +168,7 @@
     border-bottom: 1px solid #444;
     border-left: 1px solid #444;
     border-right: 1px solid #444;
-    width: 139px;
+    width: 189px;
 }
 
 .channelTimeslotHeader, .timeslotHeader {
@@ -188,6 +188,7 @@
     text-decoration: none;
     font-weight: normal!important;
     color: #fff!important;
+    position: relative;
 }
 
     .channelHeaderCellInner:hover {
@@ -235,7 +236,7 @@
 }
 
 .timeslotHeaders, .programGrid {
-    left: 141px;
+    left: 191px;
 }
 
 .channelTimeslotHeader, .timeslotHeaders {
@@ -261,6 +262,21 @@
     background-color: #252525;
 }
 
+.guideChannelInfo {
+    display: inline-block;
+    max-width: 110px;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.guideChannelImage {
+    max-width: 60px;
+    max-height: 35px;
+    position: absolute;
+    right: 5px;
+    top: 5px;
+}
+
 @media (max-width: 600px) {
 
     .channelHeaderCell, .channelTimeslotHeader {
@@ -270,6 +286,10 @@
     .timeslotHeaders, .programGrid {
         left: 91px;
     }
+
+    .guideChannelImage {
+        display: none;
+    }
 }
 /* Account for hidden navigation */
 @media (max-width: 750px) {
diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html
index a30cc503b0..7f7d14198a 100644
--- a/dashboard-ui/edititemimages.html
+++ b/dashboard-ui/edititemimages.html
@@ -87,7 +87,7 @@
                                 <option value="Thumb">Thumb</option>
                             </select>
                         </p>
-                        <button type="submit" data-icon="picture" data-theme="b">Upload</button>
+                        <button type="submit" data-icon="check" data-theme="b">Upload</button>
                     </div>
                     <a data-role="button" data-rel="back" data-icon="delete" onclick="$('#uploadImage').val('').trigger('change');">Cancel</a>
                 </div>
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html
index bb9a328286..7b3c6bb6f0 100644
--- a/dashboard-ui/livetvguide.html
+++ b/dashboard-ui/livetvguide.html
@@ -29,10 +29,6 @@
                     <div class="programGrid">
                     </div>
                 </div>
-                <!--                <div style="overflow-x: scroll;overflow-y:scroll;position:absolute;right: 1em;left: 1em;top: 135px;bottom: 30px;">
-                    <div class="timeslotHeaders"></div>
-                    <div id="guide"></div>
-                </div>-->
             </div>
         </div>
     </div>
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html
index 40ad897cd1..6d43bf7e0d 100644
--- a/dashboard-ui/livetvrecordings.html
+++ b/dashboard-ui/livetvrecordings.html
@@ -28,7 +28,7 @@
                             <br />
                         </div>
                         <div id="recordingGroups" style="display: none;">
-                            <h1 class="listHeader">Recording Archive</h1>
+                            <h1 class="listHeader"><a href="livetvrecordinglist.html">All Recordings<img src="css/images/rightarrow.png" class="headerArrowImage" /></a></h1>
                             <div id="recordingGroupItems"></div>
                         </div>
                     </td>
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 68433bd22d..c25db02540 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -300,7 +300,21 @@
 
             html += '<div class="channelHeaderCell">';
             html += '<a class="channelHeaderCellInner" href="livetvchannel.html?id=' + channel.Id + '">';
-            html += channel.Name + '<br/>' + channel.Number;
+
+            html += '<div class="guideChannelInfo">' + channel.Name + '<br/>' + channel.Number + '</div>';
+
+            if (channel.ImageTags.Primary) {
+
+                var url = ApiClient.getUrl("LiveTV/Channels/" + channel.Id + "/Images/Primary", {
+                    maxheight: 200,
+                    maxwidth: 200,
+                    tag: channel.ImageTags.Primary,
+                    type: "Primary"
+                });
+
+                html += '<img class="guideChannelImage" src="' + url + '" />';
+            }
+
             html += '</a>';
             html += '</div>';
 
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index f63508a9b9..822279b721 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -99,11 +99,11 @@
         if (query.GroupId) {
 
             ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) {
-                $('.listName', page).show().html(group.Name);
+                $('.listName', page).html(group.Name);
             });
 
         } else {
-            $('.listName', page).hide();
+            $('.listName', page).html('All Recordings');
         }
 
     }).on('pageshow', "#liveTvRecordingListPage", function () {