From 2704b524931c7da6d30243e4d14a11f5f8ab16a8 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 7 Jan 2014 13:39:35 -0500 Subject: [PATCH] added a new encoding settings page under advanced --- ApiClient.js | 11 ++ dashboard-ui/advanced.html | 9 +- dashboard-ui/css/livetv.css | 22 ++-- dashboard-ui/encodingsettings.html | 57 ++++++++++ dashboard-ui/livetvchannel.html | 1 - dashboard-ui/livetvguide.html | 2 +- dashboard-ui/scripts/encodingsettings.js | 50 +++++++++ dashboard-ui/scripts/librarybrowser.js | 8 +- dashboard-ui/scripts/livetvchannel.js | 38 +++---- dashboard-ui/scripts/livetvchannels.js | 58 ++-------- dashboard-ui/scripts/livetvguide.js | 113 ++++++++++++++------ dashboard-ui/scripts/livetvprogram.js | 10 +- dashboard-ui/scripts/livetvrecordinglist.js | 4 +- dashboard-ui/scripts/site.js | 2 +- dashboard-ui/scripts/tvupcoming.js | 16 +-- packages.config | 2 +- 16 files changed, 267 insertions(+), 136 deletions(-) create mode 100644 dashboard-ui/encodingsettings.html create mode 100644 dashboard-ui/scripts/encodingsettings.js diff --git a/ApiClient.js b/ApiClient.js index be2a342c9b..f2b2d6b7b1 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -389,6 +389,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.getLiveTvGuideInfo = function (options) { + + var url = self.getUrl("LiveTv/GuideInfo", options || {}); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + self.getLiveTvChannel = function (id, userId) { if (!id) { diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 20b6e13572..c31c641086 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -4,14 +4,19 @@ Advanced -
+
+ +
+ General + Encoding +
    -