mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fixes #838 - Support rtmp protocol with channels
This commit is contained in:
parent
812a07005b
commit
43d35c0f6f
4 changed files with 24 additions and 37 deletions
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
.libraryPage > .ui-content {
|
.libraryPage > .ui-content {
|
||||||
padding-top: 10px;
|
padding-top: 10px;
|
||||||
padding-bottom: 70px;
|
padding-bottom: 120px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryPage .currentUsername {
|
.libraryPage .currentUsername {
|
||||||
|
|
|
@ -30,9 +30,9 @@
|
||||||
|
|
||||||
})[0];
|
})[0];
|
||||||
|
|
||||||
var message = 'The following file will be <b>deleted</b>:<p style="word-wrap:break-word;">' + item.OriginalPath + '</p><p>Are you sure you wish to proceed?</p>';
|
var message = Globalize.translate('MessageFileWillBeDeleted') + '<p style="word-wrap:break-word;">' + item.OriginalPath + '</p><p>' + Globalize.translate('MessageSureYouWishToProceed') + '</p>';
|
||||||
|
|
||||||
Dashboard.confirm(message, "Delete File", function (confirmResult) {
|
Dashboard.confirm(message, Globalize.translate('HeaderDeleteFile'), function (confirmResult) {
|
||||||
|
|
||||||
if (confirmResult) {
|
if (confirmResult) {
|
||||||
|
|
||||||
|
@ -107,17 +107,17 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var message = 'The following file will be moved from:<p style="word-wrap:break-word;">' + item.OriginalPath + '</p><p>to:</p><p style="word-wrap:break-word;">' + item.TargetPath + '</p>';
|
var message = Globalize.translate('MessageFollowingFileWillBeMovedFrom') + '<p style="word-wrap:break-word;">' + item.OriginalPath + '</p><p>' + Globalize.translate('MessageDestinationTo') + '</p><p style="word-wrap:break-word;">' + item.TargetPath + '</p>';
|
||||||
|
|
||||||
if (item.DuplicatePaths.length) {
|
if (item.DuplicatePaths.length) {
|
||||||
message += '<p><b>In addition the following dupliates will be deleted:</b></p>';
|
message += '<p><b>' + Globalize.translate('MessageDuplicatesWillBeDeleted') + '</b></p>';
|
||||||
|
|
||||||
message += '<p style="word-wrap:break-word;">' + item.DuplicatePaths.join('<br/>') + '</p>';
|
message += '<p style="word-wrap:break-word;">' + item.DuplicatePaths.join('<br/>') + '</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
message += '<p>Are you sure you wish to proceed?</p>';
|
message += '<p>' + Globalize.translate('MessageSureYouWishToProceed') + '</p>';
|
||||||
|
|
||||||
Dashboard.confirm(message, "Organize File", function (confirmResult) {
|
Dashboard.confirm(message, Globalize.translate('HeaderOrganizeFile'), function (confirmResult) {
|
||||||
|
|
||||||
if (confirmResult) {
|
if (confirmResult) {
|
||||||
|
|
||||||
|
@ -184,15 +184,15 @@
|
||||||
var color = null;
|
var color = null;
|
||||||
|
|
||||||
if (status == 'SkippedExisting') {
|
if (status == 'SkippedExisting') {
|
||||||
status = 'Skipped';
|
status = Globalize.translate('StatusSkipped');
|
||||||
}
|
}
|
||||||
else if (status == 'Failure') {
|
else if (status == 'Failure') {
|
||||||
color = '#cc0000';
|
color = '#cc0000';
|
||||||
status = 'Failed';
|
status = Globalize.translate('StatusFailed');
|
||||||
}
|
}
|
||||||
if (status == 'Success') {
|
if (status == 'Success') {
|
||||||
color = 'green';
|
color = 'green';
|
||||||
status = 'Success';
|
status = Globalize.translate('StatusSuccess');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enhance && enhance) {
|
if (enhance && enhance) {
|
||||||
|
@ -221,8 +221,8 @@
|
||||||
|
|
||||||
|
|
||||||
if (item.Status != 'Success') {
|
if (item.Status != 'Success') {
|
||||||
html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="delete" data-mini="true" data-iconpos="notext" class="btnDeleteResult organizerButton" title="Delete File">Delete File</button>';
|
html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="delete" data-mini="true" data-iconpos="notext" class="btnDeleteResult organizerButton" title="' + Globalize.translate('ButtonDeleteFile') + '">' + Globalize.translate('ButtonDeleteFile') + '</button>';
|
||||||
html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="action" data-mini="true" data-iconpos="notext" class="btnProcessResult organizerButton" title="Organize File">Process</button>';
|
html += '<button data-resultid="' + item.Id + '" type="button" data-inline="true" data-icon="action" data-mini="true" data-iconpos="notext" class="btnProcessResult organizerButton" title="' + Globalize.translate('ButtonOrganizeFile') + '">' + Globalize.translate('ButtonOrganizeFile') + '</button>';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '</td>';
|
html += '</td>';
|
||||||
|
|
|
@ -2,7 +2,9 @@
|
||||||
|
|
||||||
function updateSeasonPatternHelp(page, value) {
|
function updateSeasonPatternHelp(page, value) {
|
||||||
|
|
||||||
var replacementHtmlResult = 'Result: ' + value.replace('%s', '1').replace('%0s', '01').replace('%00s', '001');
|
var resultValue = value.replace('%s', '1').replace('%0s', '01').replace('%00s', '001');
|
||||||
|
|
||||||
|
var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', resultValue);
|
||||||
|
|
||||||
$('.seasonFolderFieldDescription', page).html(replacementHtmlResult);
|
$('.seasonFolderFieldDescription', page).html(replacementHtmlResult);
|
||||||
}
|
}
|
||||||
|
@ -40,7 +42,7 @@
|
||||||
|
|
||||||
value = getEpisodeFileName(value, false);
|
value = getEpisodeFileName(value, false);
|
||||||
|
|
||||||
var replacementHtmlResult = 'Result: ' + value;
|
var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', value);
|
||||||
|
|
||||||
$('.episodePatternDescription', page).html(replacementHtmlResult);
|
$('.episodePatternDescription', page).html(replacementHtmlResult);
|
||||||
}
|
}
|
||||||
|
@ -49,7 +51,7 @@
|
||||||
|
|
||||||
value = getEpisodeFileName(value, true);
|
value = getEpisodeFileName(value, true);
|
||||||
|
|
||||||
var replacementHtmlResult = 'Result: ' + value;
|
var replacementHtmlResult = Globalize.translate('OrganizePatternResult').replace('{0}', value);
|
||||||
|
|
||||||
$('.multiEpisodePatternDescription', page).html(replacementHtmlResult);
|
$('.multiEpisodePatternDescription', page).html(replacementHtmlResult);
|
||||||
}
|
}
|
||||||
|
@ -112,9 +114,9 @@
|
||||||
picker.close();
|
picker.close();
|
||||||
},
|
},
|
||||||
|
|
||||||
header: "Select Watch Folder",
|
header: Globalize.translate('HeaderSelectWatchFolder'),
|
||||||
|
|
||||||
instruction: "Browse or enter the path to your watch folder. The folder must be writeable."
|
instruction: Globalize.translate('HeaderSelectWatchFolderHelp')
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -466,21 +466,6 @@
|
||||||
html: text,
|
html: text,
|
||||||
image: imgUrl
|
image: imgUrl
|
||||||
};
|
};
|
||||||
|
|
||||||
//var playstate = session.PlayState;
|
|
||||||
|
|
||||||
//if (playstate) {
|
|
||||||
|
|
||||||
// if (playstate.PlayMethod == 'DirectPlay') {
|
|
||||||
// return 'Direct playing';
|
|
||||||
// }
|
|
||||||
// if (playstate.PlayMethod == 'DirectStream') {
|
|
||||||
// return 'Direct streaming';
|
|
||||||
// }
|
|
||||||
// if (playstate.PlayMethod == 'Transcode') {
|
|
||||||
// text = text + '<div class="sessionPlayMethod">Transcoding</div>';
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
getUsersHtml: function (session) {
|
getUsersHtml: function (session) {
|
||||||
|
@ -776,7 +761,7 @@
|
||||||
|
|
||||||
$('#pUpdateNow', page).show();
|
$('#pUpdateNow', page).show();
|
||||||
|
|
||||||
$('#newVersionNumber', page).html("Version " + version.versionStr + " is now available for download.");
|
$('#newVersionNumber', page).html(Globalize.translate('VersionXIsAvailableForDownload').replace('{0}', version.versionStr));
|
||||||
}
|
}
|
||||||
|
|
||||||
}).fail(function () {
|
}).fail(function () {
|
||||||
|
@ -845,9 +830,9 @@
|
||||||
|
|
||||||
var update = updates[i];
|
var update = updates[i];
|
||||||
|
|
||||||
html += '<p><strong>A new version of ' + update.name + ' is available!</strong></p>';
|
html += '<p><strong>' + Globalize.translate('NewVersionOfSomethingAvailable').replace('{0}', update.name) + '</strong></p>';
|
||||||
|
|
||||||
html += '<button type="button" data-icon="arrow-d" data-theme="b" onclick="DashboardPage.installPluginUpdate(this);" data-name="' + update.name + '" data-guid="' + update.guid + '" data-version="' + update.versionStr + '" data-classification="' + update.classification + '">Update Now</button>';
|
html += '<button type="button" data-icon="arrow-d" data-theme="b" onclick="DashboardPage.installPluginUpdate(this);" data-name="' + update.name + '" data-guid="' + update.guid + '" data-version="' + update.versionStr + '" data-classification="' + update.classification + '">' + Globalize.translate('ButtonUpdateNow') + '</button>';
|
||||||
}
|
}
|
||||||
|
|
||||||
elem.html(html).trigger('create');
|
elem.html(html).trigger('create');
|
||||||
|
@ -912,7 +897,7 @@
|
||||||
|
|
||||||
restart: function () {
|
restart: function () {
|
||||||
|
|
||||||
Dashboard.confirm("Are you sure you wish to restart Media Browser Server?", "Restart", function (result) {
|
Dashboard.confirm(Globalize.translate('MessageConfirmRestart'), Globalize.translate('HeaderRestart'), function (result) {
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
$('#btnRestartServer').buttonEnabled(false);
|
$('#btnRestartServer').buttonEnabled(false);
|
||||||
|
@ -925,7 +910,7 @@
|
||||||
|
|
||||||
shutdown: function () {
|
shutdown: function () {
|
||||||
|
|
||||||
Dashboard.confirm("Are you sure you wish to shutdown Media Browser Server?", "Shutdown", function (result) {
|
Dashboard.confirm(Globalize.translate('MessageConfirmShutdown'), Globalize.translate('HeaderShutdown'), function (result) {
|
||||||
|
|
||||||
if (result) {
|
if (result) {
|
||||||
$('#btnRestartServer').buttonEnabled(false);
|
$('#btnRestartServer').buttonEnabled(false);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue