diff --git a/ApiClient.js b/ApiClient.js index 36476511e..de96c4de9 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -506,6 +506,20 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.createLiveTvTimer = function (options) { + + if (!options) { + throw new Error("null options"); + } + + var url = self.getUrl("LiveTv/Timers", options); + + return self.ajax({ + type: "POST", + url: url + }); + }; + /** * Gets the current server status */ @@ -1019,9 +1033,11 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi /** * Gets the server's scheduled tasks */ - self.getScheduledTasks = function () { + self.getScheduledTasks = function (options) { - var url = self.getUrl("ScheduledTasks"); + options = options || {}; + + var url = self.getUrl("ScheduledTasks", options); return self.ajax({ type: "GET", diff --git a/dashboard-ui/css/images/mblogoicon.png b/dashboard-ui/css/images/mblogoicon.png index fc266e2e1..9762648d3 100644 Binary files a/dashboard-ui/css/images/mblogoicon.png and b/dashboard-ui/css/images/mblogoicon.png differ diff --git a/dashboard-ui/css/images/userdata/playedoff.png b/dashboard-ui/css/images/userdata/checkedoff.png similarity index 100% rename from dashboard-ui/css/images/userdata/playedoff.png rename to dashboard-ui/css/images/userdata/checkedoff.png diff --git a/dashboard-ui/css/images/userdata/playedon.png b/dashboard-ui/css/images/userdata/checkedon.png similarity index 100% rename from dashboard-ui/css/images/userdata/playedon.png rename to dashboard-ui/css/images/userdata/checkedon.png diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 182530312..2753c1cc9 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -362,7 +362,7 @@ a.itemTag:hover { } .itemBackdropContent { - height: 230px; + height: 245px; } .lnkSibling { @@ -396,7 +396,7 @@ a.itemTag:hover { } .itemDetailImage { - height: 240px; + height: 255px; -moz-box-shadow: 0px 0 20px #000; -webkit-box-shadow: 0px 0 20px #000; box-shadow: 0px 0 20px #000; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 3601edd1e..7b4751a16 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -717,8 +717,8 @@ progress { /* Detail Page*/ .imgUserItemRating { - height: 17px; - width: 17px; + height: 16px; + width: 16px; margin-right: 1em; cursor: pointer; vertical-align: top; @@ -728,10 +728,6 @@ progress { opacity: .5; } -.imgPlayed, .imgPlayedOff { - border-radius: 4px; -} - /* Now playing bar */ #nowPlayingBar { padding: 6px .5em; @@ -1042,6 +1038,34 @@ input[type="range"]::-ms-fill-upper { } } +@media (min-width: 1700px) { + .itemVideo:not(.fullscreenVideo) { + width: 500px; + } + + .positionSlider { + width: 500px; + } + + .itemVideo { + left: -660px; + } +} + +@media (min-width: 2400px) { + .itemVideo:not(.fullscreenVideo) { + width: 550px; + } + + .positionSlider { + width: 550px; + } + + .itemVideo { + left: -710px; + } +} + #editItemMetadataPage #txtOverview { height: 70px; } diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css index 34060b9f2..a032e9177 100644 --- a/dashboard-ui/css/tileitem.css +++ b/dashboard-ui/css/tileitem.css @@ -112,11 +112,6 @@ font-weight: normal; } -.tileItem .userDataIcons img { - height: 18px; - width: 18px; -} - @media all and (min-width: 540px) { .tileItem { @@ -190,10 +185,6 @@ display: inline-block; } - .smallBackdropTileItem .tileImage { - height: 95px; - } - .backdropTileItem .tileImage { height: 105px; } @@ -257,10 +248,6 @@ .smallPosterTileItem { width: 22%; } - - .smallBackdropTileItem { - width: 30%; - } } @media all and (min-width: 1440px) { diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 208e354d5..458662c1a 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -48,7 +48,7 @@
';
+ html += '
';
} else {
- html += '
';
+ html += '
';
}
}
@@ -1549,10 +1549,10 @@
}
if (markAsPlayed) {
- link.src = "css/images/userdata/playedon.png";
+ link.src = "css/images/userdata/checkedon.png";
$link.addClass('imgPlayed').removeClass('imgPlayedOff');
} else {
- link.src = "css/images/userdata/playedoff.png";
+ link.src = "css/images/userdata/checkedoff.png";
$link.addClass('imgPlayedOff').removeClass('imgPlayed');
}
},
@@ -1713,53 +1713,55 @@
var url;
+ var imageHeight = 510;
+
if (imageTags.Primary) {
if (item.Type == "Channel") {
url = ApiClient.getUrl("LiveTV/Channels/" + item.Id + "/Images/Primary", {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "Person") {
url = ApiClient.getPersonImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "Genre") {
url = ApiClient.getGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "MusicGenre") {
url = ApiClient.getMusicGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "GameGenre") {
url = ApiClient.getGameGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "Studio") {
url = ApiClient.getStudioImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
@@ -1767,7 +1769,7 @@
else {
url = ApiClient.getImageUrl(item.Id, {
type: "Primary",
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.ImageTags.Primary
});
}
@@ -1776,42 +1778,42 @@
if (item.Type == "Person") {
url = ApiClient.getPersonImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
}
else if (item.Type == "Genre") {
url = ApiClient.getGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
}
else if (item.Type == "MusicGenre") {
url = ApiClient.getMusicGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
}
else if (item.Type == "GameGenre") {
url = ApiClient.getGameGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
}
else if (item.Type == "Studio") {
url = ApiClient.getStudioImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
}
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0],
type: "Backdrop"
});
@@ -1819,7 +1821,7 @@
else {
url = ApiClient.getImageUrl(item.Id, {
type: "Backdrop",
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.BackdropImageTags[0]
});
}
@@ -1828,42 +1830,42 @@
if (item.Type == "Person") {
url = ApiClient.getPersonImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
}
else if (item.Type == "Genre") {
url = ApiClient.getGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
}
else if (item.Type == "MusicGenre") {
url = ApiClient.getMusicGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
}
else if (item.Type == "GameGenre") {
url = ApiClient.getGameGenreImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
}
else if (item.Type == "Studio") {
url = ApiClient.getStudioImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
}
else if (item.Type == "MusicArtist") {
url = ApiClient.getArtistImageUrl(item.Name, {
- maxheight: 480,
+ maxheight: imageHeight,
tag: imageTags.Thumb,
type: "Thumb"
});
@@ -1871,7 +1873,7 @@
else {
url = ApiClient.getImageUrl(item.Id, {
type: "Thumb",
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.ImageTags.Thumb
});
}
@@ -1880,7 +1882,7 @@
url = ApiClient.getImageUrl(item.Id, {
type: "Disc",
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.ImageTags.Disc
});
}
@@ -1888,7 +1890,7 @@
url = ApiClient.getImageUrl(item.AlbumId, {
type: "Primary",
- maxheight: 480,
+ maxheight: imageHeight,
tag: item.AlbumPrimaryImageTag
});
@@ -2007,7 +2009,7 @@
}
}
- if (item.RunTimeTicks) {
+ if (item.RunTimeTicks && item.Type != "Series") {
if (item.Type == "Audio") {
@@ -2349,7 +2351,7 @@
if (user.PrimaryImageTag) {
var url = ApiClient.getUserImageUrl(user.Id, {
- width: 225,
+ height: 40,
tag: user.PrimaryImageTag,
type: "Primary"
});
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index ba26349e4..f057c635d 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -1,7 +1,30 @@
(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) {
+
+ if (result) {
+
+ Dashboard.showLoadingMsg();
+
+ ApiClient.deleteLiveTvRecording(id).done(function () {
+
+ Dashboard.alert('Recording deleted');
+
+ reload(page);
+ });
+ }
+
+ });
+ }
+
function renderRecordings(page, recordings) {
-
+
var html = '';
var cssClass = "detailTable";
@@ -28,7 +51,6 @@
html += '