From 8d17f5f79eb26c379674c2a5c93f679d1f8f9053 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 1 Dec 2013 01:25:19 -0500 Subject: [PATCH] updated live tv endpoints --- dashboard-ui/css/detailtable.css | 18 +++++----- dashboard-ui/css/librarybrowser.css | 6 ++-- dashboard-ui/css/posteritem.css | 1 - dashboard-ui/css/search.css | 3 +- dashboard-ui/css/site.css | 24 ++++--------- dashboard-ui/css/tileitem.css | 5 --- dashboard-ui/library.html | 2 +- dashboard-ui/livetvchannel.html | 2 +- dashboard-ui/livetvrecordings.html | 23 ++++++++++++- dashboard-ui/livetvtimers.html | 4 +-- dashboard-ui/moviesrecommended.html | 4 +-- dashboard-ui/musicrecommended.html | 2 +- dashboard-ui/scripts/librarybrowser.js | 12 +++---- dashboard-ui/scripts/livetvrecordings.js | 44 +++++------------------- dashboard-ui/scripts/livetvtimers.js | 24 +++++++------ dashboard-ui/scripts/medialibrarypage.js | 2 +- dashboard-ui/tvrecommended.html | 2 +- dashboard-ui/wizardlibrary.html | 2 +- 18 files changed, 80 insertions(+), 100 deletions(-) diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css index 9725f8eaef..4f29011a8b 100644 --- a/dashboard-ui/css/detailtable.css +++ b/dashboard-ui/css/detailtable.css @@ -29,28 +29,24 @@ border-spacing: 0; border-top: 1px solid #444; border-bottom: 1px solid #444; - padding: 3px 5px; + padding: 5px 5px; } .detailTable th { border-spacing: 0; border-bottom: 1px solid #444; padding: 5px; - font-weight: normal; + font-weight: bold; text-align: left; vertical-align: top; } -.detailTable tr:hover { - background: #555; -} - .userDataCell { width: 130px; text-align: right; } -.tabletColumn { +.tabletColumn, .desktopColumn { display: none; } @@ -66,8 +62,14 @@ opacity: .6; } -@media all and (min-width: 750px) { +@media all and (min-width: 600px) { .tabletColumn { display: table-cell; } } + +@media all and (min-width: 1100px) { + .desktopColumn { + display: table-cell; + } +} diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 2753c1cc93..e65f25b4e4 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -34,7 +34,9 @@ z-index: 1000; top: 0; border-bottom: 1px solid #111; - font-size: 13px; +} +.viewMenuLink { + font-size: 90%; } .viewSummary { @@ -812,7 +814,7 @@ a.itemTag:hover { width: 27px; z-index: 1000; text-align: center; - font-size: 13px; + font-size: 14px; display: none; line-height: 1; } diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css index 0ebbf762a1..f679f00b5a 100644 --- a/dashboard-ui/css/posteritem.css +++ b/dashboard-ui/css/posteritem.css @@ -37,7 +37,6 @@ } .posterItemStoreText { - font-family: 'Open Sans', sans-serif; font-weight: normal; text-overflow: ellipsis; overflow: hidden; diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index 35e65c7817..132266dcf3 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -93,11 +93,12 @@ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + font-size: 14px; } .searchHintSecondaryText { font-size: 12px; - color: #999; + color: #555; margin-top: 3px; white-space: nowrap; text-overflow: ellipsis; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index b46004b3f8..8593d621b7 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -32,7 +32,7 @@ body { overflow-y: scroll!important; - font-size: 14px; + font-size: 90%; } .textlink { @@ -45,19 +45,19 @@ body { * { font-family: 'Open Sans', Arial, Helvetica, sans-serif; + text-shadow: none; } .ui-header .ui-btn-inner, .ui-footer .ui-btn-inner, .ui-mini .ui-btn-inner { - font-size: 13.5px; + font-size: 13px; } + .ui-li-desc { font-size: 13px; } h1 { - font-family: 'Open Sans', Arial, Helvetica, sans-serif; - font-weight: 200; - font-size: 22pt; + font-weight: 300; } .toolsSidebar h1 { @@ -70,9 +70,7 @@ h1 { } h2 { - font-family: 'Open Sans', Arial, Helvetica, sans-serif; font-weight: 400; - font-size: 20pt; } h1 a { @@ -88,16 +86,6 @@ h1 a:hover { text-decoration: underline; } -@media all and (min-width: 750px) { - h1 { - font-size: 28pt; - } - - h2 { - font-size: 22pt; - } -} - pre, textarea.pre { display: block; padding: 8.5px; @@ -233,6 +221,7 @@ form, .readOnlyContent { .fieldDescription { font-size: 12px; padding-left: 5px; + font-weight: normal; } .warningFieldDescription { @@ -455,7 +444,6 @@ form, .readOnlyContent { .directoryPickerHeadline { border: 1px solid #f7c942; color: #222; - text-shadow: 0 1px 0 #fff; background: #fff9df; background-image: -webkit-gradient(linear,left top,left bottom,from(#fffadf),to(#fff3a5)); background-image: -webkit-linear-gradient(#fffadf,#fff3a5); diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css index a032e91772..2f5122bc90 100644 --- a/dashboard-ui/css/tileitem.css +++ b/dashboard-ui/css/tileitem.css @@ -2,7 +2,6 @@ background: #333; padding: 10px 7px 5px; margin: 3px 0; - text-shadow: none; font-weight: normal!important; display: block; position: relative; @@ -196,10 +195,6 @@ .posterTileItem { width: 30.5%; } - - .tileItem .itemProgress { - font-size: 17px; - } } @media all and (min-width: 1000px) { diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html index 7252e449d5..9d5e311b1b 100644 --- a/dashboard-ui/library.html +++ b/dashboard-ui/library.html @@ -27,7 +27,7 @@

This is the default media library that will be shared with all users unless individual libraries are created.

- +

diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index 366c0d7386..aa1c651ba9 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -46,7 +46,7 @@
Programs
-
+
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html index fa1b3e00c7..8f41abce90 100644 --- a/dashboard-ui/livetvrecordings.html +++ b/dashboard-ui/livetvrecordings.html @@ -12,7 +12,28 @@ Timers
-
+
+ +
+
+ + + + + + + + + + + + + + + +
NameChannelDateStartEndStatus
+
+
diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html index 0926708117..d4b3346209 100644 --- a/dashboard-ui/livetvtimers.html +++ b/dashboard-ui/livetvtimers.html @@ -12,9 +12,7 @@ Timers
-

- New Timer -

+
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html index 1204109522..a90b94584e 100644 --- a/dashboard-ui/moviesrecommended.html +++ b/dashboard-ui/moviesrecommended.html @@ -21,7 +21,7 @@ '; @@ -426,10 +426,10 @@ if (item.AlbumArtist) { - html += ''; + html += ''; } else { - html += ''; + html += ''; } } @@ -450,9 +450,9 @@ html += ''; - html += ''; + html += ''; - html += ''; + html += ''; html += ''; } diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js index ad737caaf8..2cf8b75ad2 100644 --- a/dashboard-ui/scripts/livetvrecordings.js +++ b/dashboard-ui/scripts/livetvrecordings.js @@ -1,9 +1,5 @@ (function ($, document, apiClient) { - function playRecording(page, id) { - - } - function deleteRecording(page, id) { Dashboard.confirm("Are you sure you wish to delete this recording?", "Confirm Recording Deletion", function (result) { @@ -27,36 +23,21 @@ var html = ''; - var cssClass = "detailTable"; - - html += '
-

Latest Unwatched Movies

+

Latest Movies

@@ -34,7 +34,7 @@
' + item.AlbumArtist + '' + item.AlbumArtist + '' + time + '' + (item.UserData ? item.UserData.PlayCount : 0) + '' + (item.UserData ? item.UserData.PlayCount : 0) + '' + LibraryBrowser.getUserDataIconsHtml(item) + '' + LibraryBrowser.getUserDataIconsHtml(item) + '
'; - - html += ''; - - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - - html += ''; - for (var i = 0, length = recordings.length; i < length; i++) { var recording = recordings[i]; html += ''; - html += ''; - html += ''; - html += ''; + + html += ''; - html += ''; + html += ''; - html += ''; + html += ''; html += ''; } - html += '
 NameChannelDateStartEndStatus
'; - html += ''; + html += ''; html += ''; html += '' + (recording.Name || '') + ''; + html += '' + recording.Name + ''; + html += ''; if (recording.ChannelId) { html += '' + recording.ChannelName + ''; } @@ -76,23 +57,14 @@ html += '' + LiveTvHelpers.getDisplayTime(recording.StartDate) + '' + LiveTvHelpers.getDisplayTime(recording.EndDate) + '' + LiveTvHelpers.getDisplayTime(recording.EndDate) + '' + (recording.Status || '') + '' + (recording.Status || '') + '
'; - - var elem = $('#items', page).html(html).trigger('create'); - - $('.btnPlayRecording', elem).on('click', function () { - - var recordingId = this.getAttribute('data-recordingid'); - - playRecording(page, recordingId); - }); + var elem = $('#table-column-toggle tbody', page).html(html).trigger('create'); $('.btnDeleteRecording', elem).on('click', function () { diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js index 9b266c66e8..7edde7cddf 100644 --- a/dashboard-ui/scripts/livetvtimers.js +++ b/dashboard-ui/scripts/livetvtimers.js @@ -33,14 +33,14 @@ html += ''; - html += ' '; + html += ' '; html += 'Name'; - html += 'Channel'; + html += 'Channel'; html += 'Date'; html += 'Start'; - html += 'End'; - html += 'Status'; - html += 'Recurring'; + html += 'End'; + html += 'Status'; + html += 'Recurring'; html += ''; @@ -50,13 +50,15 @@ html += ''; - html += ''; + html += ''; html += ''; html += ''; - html += '' + (timer.Name || '') + ''; - html += ''; + html += '' + timer.Name + ''; + html += ''; + + html += ''; if (timer.ChannelId) { html += '' + timer.ChannelName + ''; } @@ -76,11 +78,11 @@ html += '' + LiveTvHelpers.getDisplayTime(timer.StartDate) + ''; - html += '' + LiveTvHelpers.getDisplayTime(timer.EndDate) + ''; + html += '' + LiveTvHelpers.getDisplayTime(timer.EndDate) + ''; - html += '' + (timer.Status || '') + ''; + html += '' + (timer.Status || '') + ''; - html += ''; + html += ''; if (timer.IsRecurring) { html += ' '; diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index ac48b3ba11..cc91114cdc 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -87,7 +87,7 @@ getVirtualFolderHtml: function (virtualFolder, isCollapsed, index) { isCollapsed = isCollapsed ? "true" : "false"; - var html = '
'; + var html = '
'; html += '

' + virtualFolder.Name + '

'; diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html index af23b08391..d171809e02 100644 --- a/dashboard-ui/tvrecommended.html +++ b/dashboard-ui/tvrecommended.html @@ -19,7 +19,7 @@
-

Latest Unwatched Episodes

+

Latest Episodes

diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html index 871eab8b45..6df9b874d1 100644 --- a/dashboard-ui/wizardlibrary.html +++ b/dashboard-ui/wizardlibrary.html @@ -19,7 +19,7 @@

This is the default media library that will be shared with all users unless individual libraries are created.

- +