diff --git a/ApiClient.js b/ApiClient.js index 2b282e5e42..49ce5fd959 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -441,7 +441,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi self.getLiveTvPrograms = function (options) { options = options || {}; - + if (options.channelIds && options.channelIds.length > 1800) { return self.ajax({ @@ -453,7 +453,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); } else { - + return self.ajax({ type: "GET", url: self.getUrl("LiveTv/Programs", options), @@ -666,6 +666,37 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.getFileOrganizationResults = function (options) { + + var url = self.getUrl("Library/FileOrganization", options || {}); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + + self.deleteOriginalFileFromOrganizationResult = function (id) { + + var url = self.getUrl("Library/FileOrganizations/" + id + "/File"); + + return self.ajax({ + type: "DELETE", + url: url + }); + }; + + self.performOrganization = function (id) { + + var url = self.getUrl("Library/FileOrganizations/" + id + "/Organize"); + + return self.ajax({ + type: "POST", + url: url + }); + }; + self.getLiveTvSeriesTimer = function (id) { if (!id) { @@ -4003,7 +4034,7 @@ MediaBrowser.ApiClient.create = function (clientName, applicationVersion) { var loc = window.location; var address = loc.protocol + '//' + loc.hostname; - + if (loc.port) { address += ':' + loc.port; } diff --git a/dashboard-ui/css/detailtable.css b/dashboard-ui/css/detailtable.css index c12e620fa6..c7920d5fdd 100644 --- a/dashboard-ui/css/detailtable.css +++ b/dashboard-ui/css/detailtable.css @@ -76,3 +76,10 @@ background-color: #eeeeee; /* non-RGBA fallback */ background-color: rgba(0,0,0,.1); } + + +.stripedTable tbody tr:nth-child(odd) td, +.stripedTable tbody tr:nth-child(odd) th { + background-color: #eeeeee; /* non-RGBA fallback */ + background-color: rgba(0,0,0,.04); +} diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index f64002755d..eee3b1cd8c 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -171,7 +171,7 @@ } .labelPageSize { - margin-left: 1em; + margin-left: 1em!important; } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 64ffa009e0..4c04b96099 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -845,4 +845,13 @@ progress { .dashboardContent { max-width: 1100px; } +} + +.organizerButtonCell { + white-space: nowrap; +} + +.organizerButton { + margin-top: 0; + margin-bottom: 0; } \ No newline at end of file diff --git a/dashboard-ui/libraryfileorganizer.html b/dashboard-ui/libraryfileorganizer.html index d721b9b0c1..aeff074004 100644 --- a/dashboard-ui/libraryfileorganizer.html +++ b/dashboard-ui/libraryfileorganizer.html @@ -1,153 +1,145 @@
-