From c1a71bf41695e13c028fe427d9ca3b871347711c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 11 Jan 2014 18:07:56 -0500
Subject: [PATCH] added sorting for series recordings

---
 dashboard-ui/encodingsettings.html         |  2 +-
 dashboard-ui/livetvseriestimers.html       | 34 +++++++++++++++++
 dashboard-ui/scripts/itemdetailpage.js     |  2 +-
 dashboard-ui/scripts/livetvchannel.js      | 39 +++++++++++++++++--
 dashboard-ui/scripts/livetvrecordings.js   |  4 +-
 dashboard-ui/scripts/livetvseriestimers.js | 44 +++++++++++++++++++++-
 6 files changed, 116 insertions(+), 9 deletions(-)

diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index a254b2a402..510259b43e 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -52,7 +52,7 @@
                             <input type="checkbox" id="chkEnableCustomTranscodingTempPath" name="chkEnableCustomTranscodingTempPath" data-mini="true" />
                             <label for="chkEnableCustomTranscodingTempPath">Use custom transcoding temporary path</label>
                             <div class="fieldDescription">
-                                This folder contains working files used by the media browser transcoder.
+                                This folder contains working files used by the transcoder.
                             </div>
                         </li>
                         <li id="fldEnterTranscodingTempPath" style="display: none;">
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html
index b443ba94ab..26804ba5eb 100644
--- a/dashboard-ui/livetvseriestimers.html
+++ b/dashboard-ui/livetvseriestimers.html
@@ -15,9 +15,43 @@
         </div>
         <div data-role="content">
             <div style="max-width: 600px; margin: 0 auto;">
+
+                <div style="text-align: right;">
+                    <button data-mini="true" data-icon="sort" data-inline="true" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">Sort</button>
+                </div>
+
                 <div id="items"></div>
             </div>
         </div>
+        <div data-role="panel" id="sortPanel" data-position="right" data-display="overlay" data-theme="a" data-position-fixed="true">
+
+            <form>
+                <fieldset data-role="controlgroup">
+                    <legend>
+                        <strong>Sort By:</strong>
+                    </legend>
+
+                    <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
+                    <label for="radioSortName">Name</label>
+
+                    <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPriority" value="off" data-sortby="Priority" data-mini="true">
+                    <label for="radioPriority">Priority</label>
+                </fieldset>
+
+                <fieldset data-role="controlgroup">
+                    <legend>
+                        <strong>Sort Order:</strong>
+                    </legend>
+
+                    <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
+                    <label for="radioAscending">Ascending</label>
+
+                    <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
+                    <label for="radioDescending">Descending</label>
+                </fieldset>
+            </form>
+        </div>
+
     </div>
 </body>
 </html>
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index e5b4ce852f..0ee9ce182f 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -195,7 +195,7 @@
             $('#scenesCollapsible', page).show();
             renderScenes(page, item, 4);
         }
-        if (item.LocalTrailerCount || !item.RemoteTrailers.length) {
+        if (item.LocalTrailerCount || !item.RemoteTrailers.length || item.Type == "Trailer") {
             $('#trailersCollapsible', page).addClass('hide');
         } else {
             $('#trailersCollapsible', page).removeClass('hide');
diff --git a/dashboard-ui/scripts/livetvchannel.js b/dashboard-ui/scripts/livetvchannel.js
index 45c5637be6..7bc335fbf9 100644
--- a/dashboard-ui/scripts/livetvchannel.js
+++ b/dashboard-ui/scripts/livetvchannel.js
@@ -56,7 +56,7 @@
             html += '<div class="' + cssClass + '">';
 
             var name = program.Name;
-            
+
             if (program.IsRepeat) {
                 name += " (R)";
             }
@@ -182,11 +182,42 @@
                 }
             }
 
-            date = date.toLocaleTimeString();
+            var lower = date.toLocaleTimeString().toLowerCase();
 
-            date = date.replace('0:00', '0').replace(':00 ', '').replace(' ', '');
+            var hours = date.getHours();
+            var minutes = date.getMinutes();
 
-            return date;
+            var text;
+
+            if (lower.indexOf('am') != -1 || lower.indexOf('pm') != -1) {
+
+                var suffix = hours > 11 ? 'pm' : 'am';
+
+                hours = (hours % 12) || 12;
+
+                text = hours;
+                
+                if (minutes) {
+
+                    text += ':';
+                    if (minutes < 10) {
+                        text += '0';
+                    }
+                    text += minutes;
+                }
+
+                text += suffix;
+
+            } else {
+                text = hours + ':';
+
+                if (minutes < 10) {
+                    text += '0';
+                }
+                text += minutes;
+            }
+
+            return text;
         },
 
         renderMiscProgramInfo: function (elem, obj) {
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index 683d6ff7f7..a37be9919c 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: "backdrop",
+            shape: "square",
             showTitle: true,
             showParentTitle: true,
             overlayText: true,
@@ -79,7 +79,7 @@
         apiClient.getLiveTvRecordings({
 
             userId: Dashboard.getCurrentUserId(),
-            limit: 12,
+            limit: 15,
             isRecording: false
 
         }).done(function (result) {
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index 6bf34e07f3..71880ef31e 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -1,5 +1,11 @@
 (function ($, document, apiClient) {
 
+    var query = {
+
+        SortBy: "SortName",
+        SortOrder: "Ascending"
+    };
+
     function deleteSeriesTimer(page, id) {
 
         Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Cancellation", function (result) {
@@ -87,18 +93,54 @@
 
         Dashboard.showLoadingMsg();
 
-        apiClient.getLiveTvSeriesTimers().done(function (result) {
+        apiClient.getLiveTvSeriesTimers(query).done(function (result) {
 
             renderTimers(page, result.Items);
 
         });
     }
 
+    function updateFilterControls(page) {
+
+        // Reset form values using the last used query
+        $('.radioSortBy', page).each(function () {
+
+            this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
+
+        }).checkboxradio('refresh');
+
+        $('.radioSortOrder', page).each(function () {
+
+            this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
+
+        }).checkboxradio('refresh');
+    }
+
     $(document).on('pagebeforeshow', "#liveTvSeriesTimersPage", function () {
 
         var page = this;
 
         reload(page);
+        
+    }).on('pageinit', "#liveTvSeriesTimersPage", function () {
+
+        var page = this;
+
+        $('.radioSortBy', this).on('click', function () {
+            query.StartIndex = 0;
+            query.SortBy = this.getAttribute('data-sortby');
+            reload(page);
+        });
+
+        $('.radioSortOrder', this).on('click', function () {
+            query.StartIndex = 0;
+            query.SortOrder = this.getAttribute('data-sortorder');
+            reload(page);
+        });
+
+    }).on('pageshow', "#liveTvSeriesTimersPage", function () {
+
+        updateFilterControls(this);
     });
 
 })(jQuery, document, ApiClient);
\ No newline at end of file