1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

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": {},
"ignore": [],
"version": "1.4.277",
"_release": "1.4.277",
"version": "1.4.278",
"_release": "1.4.278",
"_resolution": {
"type": "version",
"tag": "1.4.277",
"commit": "721497f3b6225061614ee301e8b38a5eb5f34eb2"
"tag": "1.4.278",
"commit": "d22da1b6808a6102794830c9c749c8f74ff50647"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_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) {
var airTimeText;
var airTimeText = '';
if (item.StartDate) {
try {
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);
airTimeText += ' - ' + datetime.getDisplayTime(date);
}
@ -814,38 +811,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
lines.push(airTimeText || '');
}
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 (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 (options.showChannelName) {
if (item.ChannelId) {
@ -875,6 +841,27 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
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) {
@ -1048,7 +1035,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (options.coverImage || imgInfo.coverImage) {
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';
}
}
@ -1422,7 +1409,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
function onTimerCreated(programId, newTimerId, itemsContainer) {
var cells = itemsContainer.querySelectorAll('.card[data-id="' + programId + '"]');
for (var i = 0, length = cells.length; i < length; i++) {

View file

@ -21,8 +21,9 @@
.mdl-radio__button {
line-height: 24px;
position: absolute;
width: 0;
height: 0;
/* 1px is for focusing purposes, so the focusManager doesn't skip over it */
width: 1px;
height: 1px;
margin: 0;
padding: 0;
opacity: 0;
@ -89,6 +90,10 @@
}
.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);
}

View file

@ -14,10 +14,11 @@
<div class="timeslotHeaders smoothScrollX guideScroller" style="scroll-behavior: auto;"></div>
</div>
<div style="display: flex;">
<div style="display: flex;flex-grow:1;overflow:hidden;">
<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="channelsContainer">

View file

@ -151,6 +151,50 @@
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) {
return new Promise(function (resolve, reject) {
@ -195,7 +239,7 @@
currentDialog = dlg;
dlg.addEventListener('close', function () {
dlg.addEventListener('closing', function () {
if (!recordingDeleted) {
this.querySelector('.btnSubmit').click();
@ -228,6 +272,7 @@
}
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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Del",
"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}",
"Share": "Teilen",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"Add": "Add",
@ -313,5 +317,5 @@
"News": "News",
"Movies": "Movies",
"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}",
"Share": "Share",
"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}",
"Share": "Compartir",
"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}",
"Share": "Compartir",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Partager",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Dijeli",
"Add": "Dodaj",
@ -308,10 +312,10 @@
"LabelKeep:": "Zadr\u017ei:",
"UntilIDelete": "Dok ne izbri\u0161em",
"UntilSpaceNeeded": "Dok ne treba prostora",
"Categories": "Categories",
"Sports": "Sports",
"News": "News",
"Movies": "Movies",
"Kids": "Kids",
"EnableColorCodedBackgrounds": "Enable color coded backgrounds"
"Categories": "Kategorije",
"Sports": "Sportovi",
"News": "Vijesti",
"Movies": "Filmovi",
"Kids": "Djeca",
"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}",
"Share": "Megoszt\u00e1s",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "\u041e\u0440\u0442\u0430\u049b\u0442\u0430\u0441\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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Del",
"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}",
"Share": "Delen",
"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}",
"Share": "Share",
"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}",
"Share": "Compartilhar",
"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}",
"Share": "Partilhar",
"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}",
"Share": "Share",
"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}",
"Share": "\u041f\u043e\u0434\u0435\u043b\u0438\u0442\u044c\u0441\u044f",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Dela",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "Share",
"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}",
"Share": "\u5206\u4eab",
"Add": "\u6dfb\u52a0",