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

Add user cinema mode setting

Browse source
This commit is contained in:
Luke Pulverenti 2014-10-01 20:28:16 -04:00
parent b5820d6e0b
commit b89eafa799
19 changed files with 222 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dashboard-ui/scripts/dashboardpage.js
View file

@ -1072,6 +1072,17 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
html += '<div style="margin: 0;color:' + color + ';">' + date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase() + '</div>';
html += '<div class="notificationName" style="margin:.5em 0 0;white-space:nowrap;">';
if (entry.UserId && entry.UserPrimaryImageTag) {
var userImgUrl = ApiClient.getUserImageUrl(entry.UserId, {
type: 'Primary',
tag: entry.UserPrimaryImageTag,
height: 20
});
html += '<img src="' + userImgUrl + '" style="height:20px;vertical-align:middle;margin-right:5px;" />';
}
html += entry.Name;
html += '</div>';

3
dashboard-ui/scripts/edititemmetadata.js
View file

@ -294,7 +294,7 @@
$('#fldCustomRating', page).show();
}
if (item.Type == "Movie" || item.Type == "AdultVideo" || item.Type == "Trailer" || item.Type == "MusicArtist") {
if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "MusicArtist") {
$('#countriesCollapsible', page).show();
} else {
$('#countriesCollapsible', page).hide();
@ -318,7 +318,6 @@
if (item.Type == "Movie" ||
item.Type == "Trailer" ||
item.Type == "AdultVideo" ||
item.Type == "Series" ||
item.Type == "Game" ||
item.Type == "BoxSet" ||

1
dashboard-ui/scripts/indexpage.js
View file

@ -47,7 +47,6 @@
case "trailers":
imgUrl = "css/images/items/folders/movies.png";
break;
case "adultvideos":
case "homevideos":
imgUrl = "css/images/items/folders/homevideos.png";
break;

1
dashboard-ui/scripts/medialibrarypage.js
View file

@ -227,7 +227,6 @@
{ name: Globalize.translate('FolderTypeHomeVideos'), value: "homevideos" },
{ name: Globalize.translate('FolderTypeMusicVideos'), value: "musicvideos" },
{ name: Globalize.translate('FolderTypePhotos'), value: "photos" },
{ name: Globalize.translate('FolderTypeAdultVideos'), value: "adultvideos" },
{ name: Globalize.translate('FolderTypeMixed'), value: "mixed" }
];

1
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -880,7 +880,6 @@
}
else if (maxAllowedWidth >= 460) {
options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 });
options.push({ name: '480p - 3.5Mbps', maxWidth: 720, bitrate: 3500000 });
options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 });
options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 });
options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 });

1
dashboard-ui/scripts/metadataimagespage.js
View file

@ -414,7 +414,6 @@
{ name: 'OptionSongs', type: 'Audio' },
{ name: 'OptionHomeVideos', type: 'Video' },
{ name: 'OptionBooks', type: 'Book' },
{ name: 'OptionAdultVideos', type: 'AdultVideo' },
{ name: 'OptionPeople', type: 'Person' }
//{ name: 'Genres', type: 'Genre' },
//{ name: 'Studios', type: 'Studio' }

47
dashboard-ui/scripts/mypreferenceslanguages.js
View file

@ -29,10 +29,39 @@
$('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh").trigger('change');
$('#chkPlayDefaultAudioTrack', page).checked(user.Configuration.PlayDefaultAudioTrack || false).checkboxradio("refresh");
$('#chkEnableCinemaMode', page).checked(user.Configuration.EnableCinemaMode || false).checkboxradio("refresh");
Dashboard.hideLoadingMsg();
}
function loadPage(page) {
Dashboard.showLoadingMsg();
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
var promise1 = ApiClient.getUser(userId);
var promise2 = Dashboard.getCurrentUser();
var allCulturesPromise = ApiClient.getCultures();
$.when(promise1, promise2).done(function (response1, response2) {
loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
});
ApiClient.getNamedConfiguration("cinemamode").done(function (cinemaConfig) {
if (cinemaConfig.EnableIntrosForMovies || cinemaConfig.EnableIntrosForEpisodes) {
$('.cinemaModeOptions', page).show();
} else {
$('.cinemaModeOptions', page).hide();
}
});
}
function saveUser(page, user) {
user.Configuration.AudioLanguagePreference = $('#selectAudioLanguage', page).val();
@ -40,6 +69,7 @@
user.Configuration.SubtitleMode = $('#selectSubtitlePlaybackMode', page).val();
user.Configuration.PlayDefaultAudioTrack = $('#chkPlayDefaultAudioTrack', page).checked();
user.Configuration.EnableCinemaMode = $('#chkEnableCinemaMode', page).checked();
ApiClient.updateUser(user).done(function () {
Dashboard.alert(Globalize.translate('SettingsSaved'));
@ -79,22 +109,7 @@
var page = this;
Dashboard.showLoadingMsg();
var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
var promise1 = ApiClient.getUser(userId);
var promise2 = Dashboard.getCurrentUser();
var allCulturesPromise = ApiClient.getCultures();
$.when(promise1, promise2).done(function (response1, response2) {
loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
});
loadPage(page);
});
window.LanguagePreferencesPage = {

1
dashboard-ui/scripts/site.js
View file

@ -513,7 +513,6 @@ var Dashboard = {
html += '<form>';
html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
html += '<p><a data-mini="true" data-role="button" href="useredit.html?userId=' + user.Id + '" data-icon="user">' + Globalize.translate('ButtonMyProfile') + '</button></a>';
html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
html += '</form>';

2
dashboard-ui/scripts/useredit.js
View file

@ -21,7 +21,7 @@
}
if (user.Id && loggedInUser.Configuration.IsAdministrator) {
$('#fldConnectInfo', page).show();
$('#fldConnectInfo', page).hide();
} else {
$('#fldConnectInfo', page).hide();
}