update series recording editor

This commit is contained in:
Luke Pulverenti 2016-09-30 14:43:59 -04:00
parent faeb1c6d22
commit 711b0541fa
50 changed files with 285 additions and 213 deletions

View File

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.277", "version": "1.4.278",
"_release": "1.4.277", "_release": "1.4.278",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.277", "tag": "1.4.278",
"commit": "721497f3b6225061614ee301e8b38a5eb5f34eb2" "commit": "d22da1b6808a6102794830c9c749c8f74ff50647"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

View File

@ -784,24 +784,21 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
} }
if (options.showChannelName) {
lines.push(item.ChannelName || '');
}
if (options.showAirTime) { if (options.showAirTime) {
var airTimeText; var airTimeText = '';
if (item.StartDate) { if (item.StartDate) {
try { try {
var date = datetime.parseISO8601Date(item.StartDate); var date = datetime.parseISO8601Date(item.StartDate);
airTimeText = datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' }); if (options.showAirDateTime) {
airTimeText += datetime.toLocaleDateString(date, { weekday: 'short', month: 'short', day: 'numeric' }) + ' ';
}
airTimeText += ' ' + datetime.getDisplayTime(date); airTimeText += datetime.getDisplayTime(date);
if (item.EndDate) { if (item.EndDate && options.showAirEndTime) {
date = datetime.parseISO8601Date(item.EndDate); date = datetime.parseISO8601Date(item.EndDate);
airTimeText += ' - ' + datetime.getDisplayTime(date); airTimeText += ' - ' + datetime.getDisplayTime(date);
} }
@ -814,38 +811,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines.push(airTimeText || ''); lines.push(airTimeText || '');
} }
if (options.showCurrentProgram && item.Type == 'TvChannel') { if (options.showChannelName) {
if (item.CurrentProgram) {
lines.push(item.CurrentProgram.Name);
} else {
lines.push('');
}
}
if (options.showSeriesYear) {
if (item.Status == "Continuing") {
lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
} else {
lines.push(item.ProductionYear || '');
}
}
if (options.showProgramAirInfo) {
var text;
if (item.StartDate) {
var startDate = datetime.parseISO8601Date(item.StartDate, true);
text = datetime.toLocaleDateString(startDate, { weekday: 'short', month: 'short', day: 'numeric' }) + ' ' + datetime.getDisplayTime(startDate);
} else {
text = '';
}
lines.push(text || ' ');
if (item.ChannelId) { if (item.ChannelId) {
@ -875,6 +841,27 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines.push(item.ChannelName || ' '); lines.push(item.ChannelName || ' ');
} }
} }
if (options.showCurrentProgram && item.Type == 'TvChannel') {
if (item.CurrentProgram) {
lines.push(item.CurrentProgram.Name);
} else {
lines.push('');
}
}
if (options.showSeriesYear) {
if (item.Status == "Continuing") {
lines.push(globalize.translate('sharedcomponents#SeriesYearToPresent', item.ProductionYear || ''));
} else {
lines.push(item.ProductionYear || '');
}
}
} }
if ((showTitle || !imgUrl) && forceName && overlayText && lines.length == 1) { if ((showTitle || !imgUrl) && forceName && overlayText && lines.length == 1) {
@ -1048,7 +1035,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (options.coverImage || imgInfo.coverImage) { if (options.coverImage || imgInfo.coverImage) {
cardImageContainerClass += ' coveredImage'; cardImageContainerClass += ' coveredImage';
if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder' || item.Type == 'Program') { if (item.MediaType == 'Photo' || item.Type == 'PhotoAlbum' || item.Type == 'Folder' || item.ProgramInfo || item.Type == 'Program') {
cardImageContainerClass += ' coveredImage-noScale'; cardImageContainerClass += ' coveredImage-noScale';
} }
} }

View File

@ -21,8 +21,9 @@
.mdl-radio__button { .mdl-radio__button {
line-height: 24px; line-height: 24px;
position: absolute; position: absolute;
width: 0; /* 1px is for focusing purposes, so the focusManager doesn't skip over it */
height: 0; width: 1px;
height: 1px;
margin: 0; margin: 0;
padding: 0; padding: 0;
opacity: 0; opacity: 0;
@ -89,6 +90,10 @@
} }
.mdl-radio__button:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle { .mdl-radio__button:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle {
box-shadow: 0 0 0px 10px rgba(255, 255, 255, 0.76);
}
.mdl-radio__button:checked:focus + .mdl-radio__label + .mdl-radio__outer-circle + .mdl-radio__inner-circle {
box-shadow: 0 0 0px 10px rgba(82, 181, 75, 0.26); box-shadow: 0 0 0px 10px rgba(82, 181, 75, 0.26);
} }

View File

@ -14,10 +14,11 @@
<div class="timeslotHeaders smoothScrollX guideScroller" style="scroll-behavior: auto;"></div> <div class="timeslotHeaders smoothScrollX guideScroller" style="scroll-behavior: auto;"></div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;flex-grow:1;overflow:hidden;">
<button is="emby-button" type="button" class="btnCategories"> <button is="emby-button" type="button" class="btnCategories">
<div class="btnCategoriesText">${Categories}</div></button> <div class="btnCategoriesText">${Categories}</div>
</button>
<div class="smoothScrollY guideVerticalScroller programContainer guideScroller" style="flex-grow: 1;"> <div class="smoothScrollY guideVerticalScroller programContainer guideScroller" style="flex-grow: 1;">
<div class="channelsContainer"> <div class="channelsContainer">

View File

@ -151,6 +151,50 @@
context.querySelector('.selectKeepUpTo').innerHTML = html; context.querySelector('.selectKeepUpTo').innerHTML = html;
} }
function embed(itemId, serverId, options) {
recordingUpdated = false;
recordingDeleted = false;
currentServerId = serverId;
loading.show();
options = options || {};
require(['text!./seriesrecordingeditor.template.html'], function (template) {
var dialogOptions = {
removeOnClose: true,
scrollY: false
};
if (layoutManager.tv) {
dialogOptions.size = 'fullscreen';
} else {
dialogOptions.size = 'small';
}
var dlg = options.context;
dlg.classList.add('hide');
dlg.innerHTML = globalize.translateDocument(template, 'sharedcomponents');
dlg.querySelector('.formDialogHeader').classList.add('hide');
dlg.querySelector('.formDialogFooter').classList.add('hide');
dlg.querySelector('.formDialogContent').className = '';
dlg.querySelector('.dialogContentInner').className = '';
dlg.classList.remove('hide');
dlg.addEventListener('change', function () {
dlg.querySelector('.btnSubmit').click();
});
currentDialog = dlg;
init(dlg);
reload(dlg, itemId);
});
}
function showEditor(itemId, serverId, options) { function showEditor(itemId, serverId, options) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
@ -195,7 +239,7 @@
currentDialog = dlg; currentDialog = dlg;
dlg.addEventListener('close', function () { dlg.addEventListener('closing', function () {
if (!recordingDeleted) { if (!recordingDeleted) {
this.querySelector('.btnSubmit').click(); this.querySelector('.btnSubmit').click();
@ -228,6 +272,7 @@
} }
return { return {
show: showEditor show: showEditor,
embed: embed
}; };
}); });

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\u0414\u043e\u0431\u0430\u0432\u0438", "Add": "\u0414\u043e\u0431\u0430\u0432\u0438",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Afegeix", "Add": "Afegeix",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "P\u0159idat", "Add": "P\u0159idat",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Del", "Share": "Del",
"Add": "Tilf\u00f8j", "Add": "Tilf\u00f8j",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Teilen", "Share": "Teilen",
"Add": "Hinzuf\u00fcgen", "Add": "Hinzuf\u00fcgen",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b5", "Add": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b5",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",
@ -313,5 +317,5 @@
"News": "News", "News": "News",
"Movies": "Movies", "Movies": "Movies",
"Kids": "Kids", "Kids": "Kids",
"EnableColorCodedBackgrounds": "Enable color coded backgrounds" "EnableColorCodedBackgrounds": "Enable colour-coded backgrounds"
} }

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Especial - {0}", "ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Compartir", "Share": "Compartir",
"Add": "Agregar", "Add": "Agregar",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Compartir", "Share": "Compartir",
"Add": "A\u00f1adir", "Add": "A\u00f1adir",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Sp\u00e9cial - {0}", "ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
"Share": "Partager", "Share": "Partager",
"Add": "Ajouter", "Add": "Ajouter",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\u05d4\u05d5\u05e1\u05e3", "Add": "\u05d4\u05d5\u05e1\u05e3",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Specijal - {0}", "ValueSpecialEpisodeName": "Specijal - {0}",
"Share": "Dijeli", "Share": "Dijeli",
"Add": "Dodaj", "Add": "Dodaj",
@ -308,10 +312,10 @@
"LabelKeep:": "Zadr\u017ei:", "LabelKeep:": "Zadr\u017ei:",
"UntilIDelete": "Dok ne izbri\u0161em", "UntilIDelete": "Dok ne izbri\u0161em",
"UntilSpaceNeeded": "Dok ne treba prostora", "UntilSpaceNeeded": "Dok ne treba prostora",
"Categories": "Categories", "Categories": "Kategorije",
"Sports": "Sports", "Sports": "Sportovi",
"News": "News", "News": "Vijesti",
"Movies": "Movies", "Movies": "Filmovi",
"Kids": "Kids", "Kids": "Djeca",
"EnableColorCodedBackgrounds": "Enable color coded backgrounds" "EnableColorCodedBackgrounds": "Omogu\u0107i kodirane boje pozadine"
} }

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Megoszt\u00e1s", "Share": "Megoszt\u00e1s",
"Add": "Hozz\u00e1ad", "Add": "Hozz\u00e1ad",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Aggiungi", "Add": "Aggiungi",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}", "ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
"Share": "\u041e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443", "Share": "\u041e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\u0443",
"Add": "\u04ae\u0441\u0442\u0435\u0443", "Add": "\u04ae\u0441\u0442\u0435\u0443",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\ucd94\uac00", "Add": "\ucd94\uac00",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Spesial - {0}", "ValueSpecialEpisodeName": "Spesial - {0}",
"Share": "Del", "Share": "Del",
"Add": "Legg til", "Add": "Legg til",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Speciaal - {0}", "ValueSpecialEpisodeName": "Speciaal - {0}",
"Share": "Delen", "Share": "Delen",
"Add": "Toevoegen", "Add": "Toevoegen",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Dodaj", "Add": "Dodaj",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Especial - {0}", "ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Compartilhar", "Share": "Compartilhar",
"Add": "Adicionar", "Add": "Adicionar",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Especial - {0}", "ValueSpecialEpisodeName": "Especial - {0}",
"Share": "Partilhar", "Share": "Partilhar",
"Add": "Adicionar", "Add": "Adicionar",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}", "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
"Share": "\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f", "Share": "\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f",
"Add": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c", "Add": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Specialavsnitt - {0}", "ValueSpecialEpisodeName": "Specialavsnitt - {0}",
"Share": "Dela", "Share": "Dela",
"Add": "L\u00e4gg till", "Add": "L\u00e4gg till",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Ekle", "Add": "Ekle",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Add", "Add": "Add",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "Th\u00eam", "Add": "Th\u00eam",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\u6dfb\u52a0", "Add": "\u6dfb\u52a0",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "Share", "Share": "Share",
"Add": "\u65b0\u589e", "Add": "\u65b0\u589e",

View File

@ -1,4 +1,8 @@
{ {
"SortChannelsBy": "Sort channels by:",
"ChannelNumber": "Channel number",
"RecentlyWatched": "Recently watched",
"PlaceFavoriteChannelsAtBeginning": "Place favorite channels at the beginning",
"ValueSpecialEpisodeName": "Special - {0}", "ValueSpecialEpisodeName": "Special - {0}",
"Share": "\u5206\u4eab", "Share": "\u5206\u4eab",
"Add": "\u6dfb\u52a0", "Add": "\u6dfb\u52a0",

View File

@ -1,79 +1,24 @@
<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-menubutton="false"> <div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-title="${HeaderLiveTv}" data-menubutton="false">
<style>
@media all and (min-width: 800px) {
.seriesTimerSchedule .backdropCard {
width: 33.333333333333333333333333333333%;
}
}
</style>
<div data-role="content"> <div data-role="content">
<div style="margin:auto; max-width: 900px;"> <div style="margin:auto; max-width: 700px;">
<div> <div>
<h1 class="itemName"></h1> <h1 class="itemName"></h1>
</div> </div>
<form class="liveTvSeriesTimerForm" style="max-width: initial;">
<div>
<h1>${HeaderDays}</h1>
</div>
<div class="checkboxList">
<label>
<input type="checkbox" is="emby-checkbox" id="chkSunday" />
<span>${OptionSunday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkMonday" />
<span>${OptionMonday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkTuesday" />
<span>${OptionTuesday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkWednesday" />
<span>${OptionWednesday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkThursday" />
<span>${OptionThursday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkFriday" />
<span>${OptionFriday}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkSaturday" />
<span>${OptionSaturday}</span>
</label>
</div>
<div>
<h1>${HeaderRepeatingOptions}</h1>
</div>
<div class="checkboxList">
<label>
<input type="checkbox" is="emby-checkbox" id="chkNewOnly" />
<span>${OptionRecordOnlyNewEpisodes}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkAnyTime" />
<span>${OptionRecordAnytime}</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" id="chkAllChannels" />
<span>${OptionRecordOnAllChannels}</span>
</label>
</div>
<h1>
${HeaderAdvanced}
</h1>
<div class="inputContainer">
<input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" />
</div>
<div class="inputContainer">
<input is="emby-input" id="txtPostPaddingMinutes" type="number" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}" />
</div>
<div class="hide"> <div class="recordingEditor">
<button is="emby-button" type="submit" class="raised submit block btnSubmit"><span>${ButtonSave}</span></button>
<button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><span>${ButtonCancel}</span></button>
</div> </div>
</form> <div class="scheduleTab seriesTimerSchedule"></div>
<div class="scheduleTab"></div>
</div> </div>
</div> </div>

View File

@ -128,7 +128,9 @@
overlayMoreButton: true, overlayMoreButton: true,
preferThumb: true, preferThumb: true,
overlayText: false, overlayText: false,
showProgramAirInfo: true showAirTime: true,
showAirDateTime: true,
showChannelName: true
}); });
break; break;

View File

@ -4,8 +4,8 @@
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile && AppInfo.enableAppLayouts;
} }
function getSquareShape() { function getBackdropShape() {
return enableScrollX() ? 'overflowSquare' : 'square'; return enableScrollX() ? 'overflowBackdrop' : 'backdrop';
} }
function getTimersHtml(timers, options) { function getTimersHtml(timers, options) {
@ -83,14 +83,17 @@
html += cardBuilder.getCardsHtml({ html += cardBuilder.getCardsHtml({
items: group.items, items: group.items,
shape: getSquareShape(), shape: getBackdropShape(),
showTitle: true, showTitle: true,
showAirTime: true, showAirTime: true,
showAirEndTime: true,
showChannelName: true, showChannelName: true,
lazy: true, lazy: true,
cardLayout: true, cardLayout: true,
action: 'edit', action: 'edit',
cardFooterAside: 'none' cardFooterAside: 'none',
preferThumb: true,
coverImage: true
}); });
html += '</div>'; html += '</div>';

View File

@ -67,7 +67,9 @@
overlayText: false, overlayText: false,
showTitle: true, showTitle: true,
showParentTitle: query.IsSeries !== false && !query.IsMovie, showParentTitle: query.IsSeries !== false && !query.IsMovie,
showProgramAirInfo: params.type != 'Recordings' && params.type != 'RecordingSeries', showAirTime: params.type != 'Recordings' && params.type != 'RecordingSeries',
showAirDateTime: params.type != 'Recordings' && params.type != 'RecordingSeries',
showChannelName: params.type != 'Recordings' && params.type != 'RecordingSeries',
overlayMoreButton: true, overlayMoreButton: true,
showYear: query.IsMovie && params.type == 'Recordings', showYear: query.IsMovie && params.type == 'Recordings',
coverImage: true coverImage: true

View File

@ -1,45 +1,4 @@
define(['datetime', 'dom', 'emby-itemscontainer'], function (datetime, dom) { define(['datetime', 'dom', 'seriesRecordingEditor', 'emby-itemscontainer'], function (datetime, dom, seriesRecordingEditor) {
function getDaysOfWeek() {
// Do not localize. These are used as values, not text.
return LiveTvHelpers.getDaysOfWeek().map(function (d) {
return d.value;
});
}
function selectDays(page, days) {
var daysOfWeek = getDaysOfWeek();
for (var i = 0, length = daysOfWeek.length; i < length; i++) {
var day = daysOfWeek[i];
page.querySelector('#chk' + day).checked = days.indexOf(day) != -1;
}
}
function getDays(page) {
var daysOfWeek = getDaysOfWeek();
var days = [];
for (var i = 0, length = daysOfWeek.length; i < length; i++) {
var day = daysOfWeek[i];
if (page.querySelector('#chk' + day).checked) {
days.push(day);
}
}
return days;
}
return function (view, params) { return function (view, params) {
@ -47,43 +6,9 @@
page.querySelector('.itemName').innerHTML = item.Name; page.querySelector('.itemName').innerHTML = item.Name;
page.querySelector('#txtPrePaddingMinutes').value = item.PrePaddingSeconds / 60;
page.querySelector('#txtPostPaddingMinutes').value = item.PostPaddingSeconds / 60;
page.querySelector('#chkNewOnly').checked = item.RecordNewOnly;
page.querySelector('#chkAllChannels').checked = item.RecordAnyChannel;
page.querySelector('#chkAnyTime').checked = item.RecordAnyTime;
selectDays(page, item.Days);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
function onSubmit(e) {
var form = this;
var id = params.id;
ApiClient.getLiveTvSeriesTimer(id).then(function (item) {
item.PrePaddingSeconds = form.querySelector('#txtPrePaddingMinutes').value * 60;
item.PostPaddingSeconds = form.querySelector('#txtPostPaddingMinutes').value * 60;
item.RecordNewOnly = form.querySelector('#chkNewOnly').checked;
item.RecordAnyChannel = form.querySelector('#chkAllChannels').checked;
item.RecordAnyTime = form.querySelector('#chkAnyTime').checked;
item.Days = getDays(form);
ApiClient.updateLiveTvSeriesTimer(item);
});
e.preventDefault();
// Disable default form submission
return false;
}
function renderSchedule(page, result) { function renderSchedule(page, result) {
var timers = result.Items; var timers = result.Items;
@ -119,11 +44,10 @@
}); });
} }
view.querySelector('form').addEventListener('change', function () { seriesRecordingEditor.embed(params.id, ApiClient.serverId(), {
view.querySelector('.btnSubmit').click(); context: view.querySelector('.recordingEditor')
}); });
view.querySelector('.liveTvSeriesTimerForm').addEventListener('submit', onSubmit);
view.querySelector('.scheduleTab').addEventListener('timercancelled', reload); view.querySelector('.scheduleTab').addEventListener('timercancelled', reload);
view.addEventListener('viewbeforeshow', reload); view.addEventListener('viewbeforeshow', reload);
}; };

View File

@ -126,7 +126,9 @@
overlayMoreButton: overlayButton != 'play', overlayMoreButton: overlayButton != 'play',
overlayPlayButton: overlayButton == 'play', overlayPlayButton: overlayButton == 'play',
allowBottomPadding: !enableScrollX(), allowBottomPadding: !enableScrollX(),
showProgramAirInfo: true showAirTime: true,
showAirDateTime: true,
showChannelName: true
//cardFooterAside: 'logo' //cardFooterAside: 'logo'
}); });