From 28271a08676474deea8307a45d39a73be280e2de Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 16 Aug 2015 18:03:22 -0400
Subject: [PATCH] update recording styles

---
 .../iron-a11y-keys-behavior/.bower.json       |  6 +--
 .../bower_components/paper-styles/.bower.json |  4 +-
 dashboard-ui/cordova/android/mediasession.js  |  8 ++++
 dashboard-ui/livetv.html                      | 31 +-----------
 dashboard-ui/scripts/livetvseriestimers.js    |  2 -
 dashboard-ui/scripts/livetvtimers.js          | 47 ++++++++++++-------
 6 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json
index 4072b4af76..f0a9c76d51 100644
--- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json
+++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json
@@ -29,14 +29,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior",
+  "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "cf833eab5c55a26c5aa92e56d3fcb079120ce66a"
   },
-  "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git",
+  "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-a11y-keys-behavior"
+  "_originalSource": "polymerelements/iron-a11y-keys-behavior"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-styles/.bower.json b/dashboard-ui/bower_components/paper-styles/.bower.json
index 04e2128c81..91d22f3562 100644
--- a/dashboard-ui/bower_components/paper-styles/.bower.json
+++ b/dashboard-ui/bower_components/paper-styles/.bower.json
@@ -34,7 +34,7 @@
     "tag": "v1.0.11",
     "commit": "347542e9ebe3e6e5f0830ee10e1c20c12956ff2c"
   },
-  "_source": "git://github.com/PolymerElements/paper-styles.git",
+  "_source": "git://github.com/polymerelements/paper-styles.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-styles"
+  "_originalSource": "polymerelements/paper-styles"
 }
\ No newline at end of file
diff --git a/dashboard-ui/cordova/android/mediasession.js b/dashboard-ui/cordova/android/mediasession.js
index 036ff85da9..b51a4c31f7 100644
--- a/dashboard-ui/cordova/android/mediasession.js
+++ b/dashboard-ui/cordova/android/mediasession.js
@@ -35,6 +35,14 @@
 
         var artist = parts.length == 1 ? '' : parts[0];
         var title = parts[parts.length - 1];
+
+        // Switch these two around for video
+        if (state.NowPlayingItem.MediaType == 'Video') {
+            var temp = artist;
+            artist = title;
+            title = temp;
+        }
+
         var album = state.NowPlayingItem.Album || '';
         var itemId = state.NowPlayingItem.Id;
 
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index 7b359156b1..0f5b037a2a 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -138,40 +138,13 @@
                 </neon-animatable>
                 <neon-animatable>
                     <div class="pageTabContent timersTabContent">
-                        <div style="max-width: 600px; margin: 0 auto;">
-                            <div id="items"></div>
+                        <div style="max-width: 700px; margin: 0 auto;" id="items">
                         </div>
                     </div>
                 </neon-animatable>
                 <neon-animatable>
                     <div class="pageTabContent seriesTimersTabContent">
-                        <div style="max-width: 600px; margin: 0 auto;">
-                            <div style="text-align: right;">
-                                <button data-mini="true" data-inline="true" onclick="$('#sortPanel', $(this).parents('.page')).panel( 'toggle' );">${ButtonSort}</button>
-                            </div>
-                            <div id="items"></div>
-                        </div>
-                        <div data-role="panel" id="sortPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
-                            <form>
-                                <fieldset data-role="controlgroup">
-                                    <legend>
-                                        ${HeaderSortBy}
-                                    </legend>
-                                    <input class="radioSortBy defaultSort" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
-                                    <label for="radioSortName">${OptionNameSort}</label>
-                                    <input class="radioSortBy" type="radio" name="radioSortBy" id="radioPriority" value="off" data-sortby="Priority" data-mini="true">
-                                    <label for="radioPriority">${OptionPriority}</label>
-                                </fieldset>
-                                <fieldset data-role="controlgroup">
-                                    <legend>
-                                        ${HeaderSortOrder}
-                                    </legend>
-                                    <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
-                                    <label for="radioAscending">${OptionAscending}</label>
-                                    <input class="radioSortOrder" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
-                                    <label for="radioDescending">${OptionDescending}</label>
-                                </fieldset>
-                            </form>
+                        <div style="max-width: 700px; margin: 0 auto;" id="items">
                         </div>
                     </div>
                 </neon-animatable>
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index 928017159e..3fc791a7cd 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -31,8 +31,6 @@
 
         html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
 
-        html += '<li data-role="list-divider">' + Globalize.translate('HeaderSeriesRecordings') + '</li>';
-
         for (var i = 0, length = timers.length; i < length; i++) {
 
             var timer = timers[i];
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index 98f66ddb8f..339bd513b1 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -23,7 +23,6 @@
 
         var html = '';
 
-        html += '<ul data-role="listview" data-inset="true" data-split-icon="delete">';
 
         var index = '';
 
@@ -34,11 +33,20 @@
             var startDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(timer.StartDate, { toLocal: true }));
 
             if (startDateText != index) {
-                html += '<li data-role="list-divider">' + startDateText + '</li>';
+
+                if (index) {
+                    html += '</div>';
+                    html += '</div>';
+                }
+
+                html += '<div class="homePageSection">';
+                html += '<h1>' + startDateText + '</h1>';
+                //html += '<ul data-role="listview" data-split-icon="delete">';
+                html += '<div class="paperList">';
                 index = startDateText;
             }
 
-            html += '<li><a href="livetvtimer.html?id=' + timer.Id + '">';
+            html += '<paper-icon-item>';
 
             var program = timer.ProgramInfo || {};
             var imgUrl;
@@ -50,22 +58,28 @@
                     tag: program.ImageTags.Primary,
                     type: "Primary"
                 });
-            } else {
-                imgUrl = "css/images/items/searchhintsv2/tv.png";
             }
 
-            html += '<img src="css/images/items/searchhintsv2/tv.png" style="display:none;">';
-            html += '<div class="ui-li-thumb" style="background-image:url(\'' + imgUrl + '\');width:5em;height:5em;background-repeat:no-repeat;background-position:center center;background-size: cover;"></div>';
+            if (imgUrl) {
+                html += '<paper-fab class="listAvatar blue" style="background-image:url(\'' + imgUrl + '\');background-repeat:no-repeat;background-position:center center;background-size: cover;" item-icon></paper-fab>';
+            } else {
+                html += '<paper-fab class="listAvatar blue" icon="tv" item-icon></paper-fab>';
+            }
 
-            html += '<h3>';
+            html += '<paper-item-body two-line>';
+            html += '<a class="clearLink" href="livetvtimer.html?id=' + timer.Id + '">';
+
+            html += '<div>';
             html += timer.Name;
-            html += '</h3>';
+            html += '</div>';
 
-            html += '<p>';
+            html += '<div secondary>';
             html += LibraryBrowser.getDisplayTime(timer.StartDate);
             html += ' - ' + LibraryBrowser.getDisplayTime(timer.EndDate);
-            html += '</p>';
+            html += '</div>';
 
+            html += '</a>';
+            html += '</paper-item-body>';
 
             if (timer.SeriesTimerId) {
                 html += '<div class="ui-li-aside" style="right:0;">';
@@ -75,14 +89,15 @@
                 html += '</div>';
             }
 
-            html += '</a>';
+            html += '<paper-icon-button icon="delete" data-timerid="' + timer.Id + '" title="' + Globalize.translate('ButonCancelRecording') + '" class="btnDeleteTimer"></paper-icon-button>';
 
-            html += '<a data-timerid="' + timer.Id + '" href="#" title="' + Globalize.translate('ButonCancelRecording') + '" class="btnDeleteTimer">' + Globalize.translate('ButonCancelRecording') + '</a>';
-
-            html += '</li>';
+            html += '</paper-icon-item>';
         }
 
-        html += '</ul>';
+        if (timers.length) {
+            html += '</div>';
+            html += '</div>';
+        }
 
         var elem = $('#items', page).html(html).trigger('create');