From 71271abcb1dfcd60ee1309eb21103e6ef7dcfa34 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 13 Jan 2014 00:41:00 -0500
Subject: [PATCH] live tv updates

---
 dashboard-ui/css/librarybrowser.css      |  8 +------
 dashboard-ui/livetvnewrecording.html     |  4 ++--
 dashboard-ui/livetvprogram.html          |  3 +++
 dashboard-ui/livetvseriestimer.html      |  4 ++--
 dashboard-ui/livetvtimer.html            |  4 ++--
 dashboard-ui/scripts/livetvprogram.js    | 30 ++++++++++++++++++++++++
 dashboard-ui/scripts/livetvrecordings.js |  4 ++--
 dashboard-ui/scripts/livetvsuggested.js  |  4 ++--
 8 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 3c27a45df3..123c916956 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -749,7 +749,7 @@ a.itemTag:hover {
 @media all and (min-width: 1440px) {
 
     .ehsContent {
-        max-width: 980px;
+        max-width: 950px;
     }
 }
 
@@ -759,12 +759,6 @@ a.itemTag:hover {
     }
 }
 
-@media all and (min-width: 2300px) {
-    .ehsContent {
-        max-width: 1540px;
-    }
-}
-
 .detailPageParentLink {
     text-decoration: none;
 }
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html
index 7f40155cea..6311d48017 100644
--- a/dashboard-ui/livetvnewrecording.html
+++ b/dashboard-ui/livetvnewrecording.html
@@ -82,7 +82,7 @@
                         <ul data-role="listview" class="ulForm">
                             <li>
                                 <label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
-                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -93,7 +93,7 @@
                             </li>
                             <li>
                                 <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
-                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html
index 39f7d79a8c..863d3a5b17 100644
--- a/dashboard-ui/livetvprogram.html
+++ b/dashboard-ui/livetvprogram.html
@@ -41,6 +41,9 @@
             <span id="playButtonContainer" style="display: none;">
                 <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
             </span>
+            <span id="cancelRecordingButtonContainer" style="display: none;">
+                <button id="btnCancelRecording" type="button" data-icon="delete" data-inline="true" data-mini="true">Cancel Recording</button>
+            </span>
             <span id="recordButtonContainer" style="display: none;">
                 <button id="btnRecord" type="button" data-icon="video" data-inline="true" data-mini="true">Record</button>
             </span>
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 54fed216d6..7477078bf0 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -79,7 +79,7 @@
                             <ul data-role="listview" class="ulForm">
                                 <li>
                                     <label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
-                                    <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                    <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                                 </li>
                                 <li>
                                     <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -90,7 +90,7 @@
                                 </li>
                                 <li>
                                     <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
-                                    <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                    <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                                 </li>
                                 <li>
                                     <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index 00413c25aa..857919903a 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -46,7 +46,7 @@
                         <ul data-role="listview" class="ulForm">
                             <li>
                                 <label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
-                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@@ -57,7 +57,7 @@
                             </li>
                             <li>
                                 <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
-                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="10" step=".5" />
+                                <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="30" step="1" />
                             </li>
                             <li>
                                 <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
diff --git a/dashboard-ui/scripts/livetvprogram.js b/dashboard-ui/scripts/livetvprogram.js
index f68ca35ab3..a203fbb3d3 100644
--- a/dashboard-ui/scripts/livetvprogram.js
+++ b/dashboard-ui/scripts/livetvprogram.js
@@ -2,6 +2,25 @@
 
     var currentItem;
 
+    function deleteTimer(page, id) {
+
+        Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) {
+
+            if (result) {
+
+                Dashboard.showLoadingMsg();
+
+                ApiClient.cancelLiveTvTimer(id).done(function () {
+
+                    Dashboard.alert('Recording cancelled.');
+
+                    reload(page);
+                });
+            }
+
+        });
+    }
+
     function reload(page) {
 
         Dashboard.showLoadingMsg();
@@ -48,6 +67,12 @@
                 ApiClient.sendWebSocketMessage("Context", vals.join('|'));
             }
 
+            if (item.TimerId) {
+                $('#cancelRecordingButtonContainer', page).show();
+            } else {
+                $('#cancelRecordingButtonContainer', page).hide();
+            }
+
             if (!item.TimerId && !item.SeriesTimerId) {
                 $('#recordButtonContainer', page).show();
             } else {
@@ -101,6 +126,11 @@
             });
         });
 
+        $('#btnCancelRecording', page).on('click', function () {
+
+            deleteTimer(page, currentItem.TimerId);
+        });
+
     }).on('pageshow', "#liveTvProgramPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 5240385f61..b673265fb9 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -52,7 +52,7 @@
         $('.recordingItems', elem).html(LibraryBrowser.getPosterViewHtml({
             
             items: recordings,
-            shape: "square",
+            shape: "backdrop",
             showTitle: true,
             showParentTitle: true,
             overlayText: true,
@@ -79,7 +79,7 @@
         apiClient.getLiveTvRecordings({
 
             userId: Dashboard.getCurrentUserId(),
-            limit: 15,
+            limit: 12,
             isRecording: false
 
         }).done(function (result) {
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 93e26bbe12..a69a5b11c7 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -15,7 +15,7 @@
             var html = LibraryBrowser.getPosterViewHtml({
 
                 items: result.Items,
-                shape: "square",
+                shape: "backdrop",
                 showTitle: true,
                 showParentTitle: true,
                 overlayText: true,
@@ -38,7 +38,7 @@
             var html = LibraryBrowser.getPosterViewHtml({
 
                 items: result.Items,
-                shape: "square",
+                shape: "backdrop",
                 showTitle: true,
                 showParentTitle: true,
                 overlayText: true,