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 f0a9c76d51..4072b4af76 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-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 26486f6c6d..321be71437 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -42,7 +42,7 @@ "tag": "v1.0.3", "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ 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 91d22f3562..04e2128c81 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/channelitems.html b/dashboard-ui/channelitems.html index a127ce9a6a..004e121b5a 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -28,7 +28,7 @@
- +
diff --git a/dashboard-ui/css/livetv.css b/dashboard-ui/css/livetv.css index bbed9e10a3..fba6c5e6f1 100644 --- a/dashboard-ui/css/livetv.css +++ b/dashboard-ui/css/livetv.css @@ -121,7 +121,6 @@ height: 12px; border-radius: 50%; background: #cc0000; - vertical-align: top; border: 1px solid #cc3333; margin-left: 1em; } diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html index 36a163cda1..74681ac9dc 100644 --- a/dashboard-ui/episodes.html +++ b/dashboard-ui/episodes.html @@ -56,7 +56,7 @@
- +
diff --git a/dashboard-ui/gamegenres.html b/dashboard-ui/gamegenres.html index 6a0199a931..80d6e735f0 100644 --- a/dashboard-ui/gamegenres.html +++ b/dashboard-ui/gamegenres.html @@ -32,7 +32,7 @@
- +
diff --git a/dashboard-ui/games.html b/dashboard-ui/games.html index 1b54894729..e5ccde3ecc 100644 --- a/dashboard-ui/games.html +++ b/dashboard-ui/games.html @@ -46,7 +46,7 @@
- +
diff --git a/dashboard-ui/gamestudios.html b/dashboard-ui/gamestudios.html index f83c058a09..f040b86157 100644 --- a/dashboard-ui/gamestudios.html +++ b/dashboard-ui/gamestudios.html @@ -32,7 +32,7 @@
- +
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html index 4171b54e2a..59a005c3a8 100644 --- a/dashboard-ui/itemlist.html +++ b/dashboard-ui/itemlist.html @@ -37,7 +37,7 @@
- +
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index 0f5b037a2a..9c13bb2d81 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -88,31 +88,6 @@
-
-
-
- ${TabView} - ${TabFilter} -
-
-
- - -
-
-
-
- ${HeaderFilters} - - - - - - -
-
-
-
@@ -151,6 +126,31 @@ +
+
+
+ ${TabView} + ${TabFilter} +
+
+
+ + +
+
+
+
+ ${HeaderFilters} + + + + + + +
+
+
+
diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html index 33ee109b62..a0e10f7c82 100644 --- a/dashboard-ui/livetvitems.html +++ b/dashboard-ui/livetvitems.html @@ -31,7 +31,7 @@
- +
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html index f2a6a82dbf..575c4d4e6f 100644 --- a/dashboard-ui/livetvnewrecording.html +++ b/dashboard-ui/livetvnewrecording.html @@ -4,7 +4,7 @@ Emby -
+
@@ -20,93 +20,65 @@
-

${HeaderPrePostPadding}

+

${HeaderAdvanced}


  • - - +
  • - - + ${OptionPrePaddingRequired}
  • -
    +
  • - - -
    • -
  • - - + ${OptionPostPaddingRequired}


-
    -
  • - - -
    • -
+
+ + + ${ButtonCancel} +
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html index cbc2ccd0cf..bf48cc1306 100644 --- a/dashboard-ui/livetvseriestimer.html +++ b/dashboard-ui/livetvseriestimer.html @@ -4,8 +4,8 @@ Emby -
- +
+

@@ -23,83 +23,55 @@

-
-
    -
  • -

    ${HeaderDays}

    -
    - - - - - - - - - - - - - - - - - - - - - -
    -
    • -
  • -

    ${HeaderRepeatingOptions}

    -
    - - - - - - - -
    -
    • -
+
+

${HeaderDays}

+
+
+ ${OptionSunday} + ${OptionMonday} + ${OptionTuesday} + ${OptionWednesday} + ${OptionThursday} + ${OptionFriday} + ${OptionSaturday} +
+
+

${HeaderRepeatingOptions}

+
+
+ ${OptionRecordOnlyNewEpisodes} + ${OptionRecordAnytime} + ${OptionRecordOnAllChannels} +
+
-

${HeaderPrePostPadding}

+

${HeaderAdvanced}


  • - - +
  • - - + ${OptionPrePaddingRequired}
  • -
    +
  • - - -
    • -
  • - - + ${OptionPostPaddingRequired}

- - + + ${ButtonCancel}
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html index e411d8c1e7..3a8f2b94a3 100644 --- a/dashboard-ui/livetvtimer.html +++ b/dashboard-ui/livetvtimer.html @@ -4,7 +4,7 @@ Emby -
+
@@ -24,57 +24,44 @@

-

- +

- +
+ ${ButtonCancelRecording} +

- +

${HeaderRecordingOptions}

-

${HeaderPrePostPadding}

+

${HeaderAdvanced}


  • - - +
  • - - + ${OptionPrePaddingRequired}
  • -
    +
  • - - -
    • -
  • - - + ${OptionPostPaddingRequired}


+
+ -
    -
  • - - -
    • -
-

- -

+ ${ButtonCancel} +
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html index a8a7063c85..a65616cfe9 100644 --- a/dashboard-ui/musicalbumartists.html +++ b/dashboard-ui/musicalbumartists.html @@ -52,7 +52,7 @@
- +
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index 0e898a6135..7452210774 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -53,7 +53,7 @@
- +
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index e1ca72090f..63ef2c84fd 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -51,7 +51,7 @@
- +
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index b1532d35fb..d5e69573e1 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -40,7 +40,7 @@
- +
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index 36a81fb0fa..4ea2903612 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -39,7 +39,7 @@
- +
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html index 5ff8d82c8e..a9575271a7 100644 --- a/dashboard-ui/reports.html +++ b/dashboard-ui/reports.html @@ -59,7 +59,7 @@ '; + } var elem = $('#items', page).html(html).trigger('create'); diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 51d5da7790..36b652b90d 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -59,10 +59,14 @@ $('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60); $('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60); - $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh'); - $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh'); + $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired); + $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired); - $('.timerStatus', page).html('Status:   ' + item.Status); + if (item.Status == 'New') { + $('.timerStatus', page).hide(); + } else { + $('.timerStatus', page).show().html('Status:   ' + item.Status); + } Dashboard.hideLoadingMsg(); } @@ -81,6 +85,7 @@ item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); ApiClient.updateLiveTvTimer(item).done(function () { + Dashboard.hideLoadingMsg(); Dashboard.alert(Globalize.translate('MessageRecordingSaved')); }); }); diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js index 339bd513b1..f0654e7d0b 100644 --- a/dashboard-ui/scripts/livetvtimers.js +++ b/dashboard-ui/scripts/livetvtimers.js @@ -23,7 +23,6 @@ var html = ''; - var index = ''; for (var i = 0, length = timers.length; i < length; i++) { @@ -62,8 +61,21 @@ if (imgUrl) { html += ''; - } else { - html += ''; + } + else if (program.IsKids) { + html += ''; + } + else if (program.IsSports) { + html += ''; + } + else if (program.IsMovie) { + html += ''; + } + else if (program.IsNews) { + html += ''; + } + else { + html += ''; } html += ''; diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html index 8353eae13a..e0262683ec 100644 --- a/dashboard-ui/songs.html +++ b/dashboard-ui/songs.html @@ -35,7 +35,7 @@
- +
diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index 748c2e3234..968e3b6b16 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -1521,5 +1521,6 @@ "LabelSyncPath": "Synced content path:", "OptionSyncOnlyOnWifi": "Sync only on Wifi", "OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality", - "HeaderMetadata": "Metadata" + "HeaderMetadata": "Metadata", + "HeaderRecordingOptions": "Recording Options" } diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 31538f9540..1c52daf193 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -373,6 +373,11 @@ paper-menu-item { border-color: #2ad; } +.paperCheckboxList paper-checkbox { + display: block; + padding: .5em 0; +} + .ui-page-theme-b paper-input label, .ui-page-theme-b paper-textarea label { color: #ccc !important; font-size: 20px !important; @@ -420,4 +425,4 @@ paper-dropdown-menu { paper-dropdown-menu paper-item { display: block; - } + } \ No newline at end of file diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html index e745f3aec9..9c8a6ff7f6 100644 --- a/dashboard-ui/tvgenres.html +++ b/dashboard-ui/tvgenres.html @@ -44,7 +44,7 @@
- +
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html index 9a358fd2be..7e64a38a87 100644 --- a/dashboard-ui/tvshows.html +++ b/dashboard-ui/tvshows.html @@ -50,7 +50,7 @@
- +
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html index b32c1187ee..de2e8fc03c 100644 --- a/dashboard-ui/tvstudios.html +++ b/dashboard-ui/tvstudios.html @@ -35,7 +35,7 @@
- +