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 profile settings about virtual episodes

Browse source
This commit is contained in:
Luke Pulverenti 2013-10-25 11:52:10 -04:00
parent cd21add046
commit 87a82eae9e
9 changed files with 244 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/edituser.html
View file

@ -10,6 +10,7 @@
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
<a href="#" data-role="button" class="ui-btn-active">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
@ -52,20 +53,7 @@
</li>
</ul>
</div>
<h2>Video Playback Settings</h2>
<ul data-role="listview" class="ulForm">
<li>
<label for="selectAudioLanguage">Audio language preference: </label>
<select name="selectAudioLanguage" id="selectAudioLanguage"></select>
</li>
<li>
<label for="selectSubtitleLanguage">Subtitle language preference: </label>
<select name="selectSubtitleLanguage" id="selectSubtitleLanguage"></select>
</li>
<li>
<input type="checkbox" id="chkForcedSubtitlesOnly" name="chkForcedSubtitlesOnly" />
<label for="chkForcedSubtitlesOnly">Display only forced subtitles</label>
</li>
<li>
<button type="submit" data-theme="b" data-icon="ok">
Save

1
dashboard-ui/library.html
View file

@ -10,6 +10,7 @@
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
<a href="#" data-role="button" onclick="Dashboard.navigate('edituser.html', true);">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" class="ui-btn-active">Media Library</a>

49
dashboard-ui/scripts/Itemdetailpage.js
View file

@ -20,10 +20,21 @@
LibraryBrowser.renderParentName(item, $('.parentName', page));
var context = getContext(item);
setInitialCollapsibleState(page, item, context);
Dashboard.getCurrentUser().done(function (user) {
setInitialCollapsibleState(page, item, context, user);
renderDetails(page, item, context);
LibraryBrowser.renderDetailPageBackdrop(page, item);
if (user.Configuration.IsAdministrator) {
$('#editButtonContainer', page).show();
} else {
$('#editButtonContainer', page).hide();
}
});
if (item.LocationType == "Offline") {
$('#offlineIndicator', page).show();
@ -58,16 +69,6 @@
$('#playButtonContainer', page).hide();
}
Dashboard.getCurrentUser().done(function (user) {
if (user.Configuration.IsAdministrator) {
$('#editButtonContainer', page).show();
} else {
$('#editButtonContainer', page).hide();
}
});
$(".autoNumeric").autoNumeric('init');
setPeopleHeader(page, item);
@ -150,11 +151,11 @@
}
}
function setInitialCollapsibleState(page, item, context) {
function setInitialCollapsibleState(page, item, context, user) {
if (item.ChildCount) {
$('#childrenCollapsible', page).removeClass('hide');
renderChildren(page, item);
renderChildren(page, item, user);
}
else {
$('#childrenCollapsible', page).addClass('hide');
@ -235,7 +236,7 @@
$('.itemCommunityRating', page).hide();
}
if (item.Type != "Episode" && item.Type != "Movie") {
if (item.Type != "Episode" && item.Type != "Movie" && item.Type != "Series") {
var premiereDateElem = $('#itemPremiereDate', page).show();
LibraryBrowser.renderPremiereDate(premiereDateElem, item);
} else {
@ -445,14 +446,14 @@
}).join(',');
}
if (item.Studios.length) {
html += ' on <a class="textlink" href="itembynamedetails.html?context=' + context + '&studio=' + ApiClient.encodeName(item.Studios[0].Name) + '">' + item.Studios[0].Name + '</a>';
}
if (item.AirTime) {
html += ' at ' + item.AirTime;
}
if (item.Studios.length) {
html += ' on <a class="textlink" href="itembynamedetails.html?context=' + context + '&studio=' + ApiClient.encodeName(item.Studios[0].Name) + '">' + item.Studios[0].Name + '</a>';
}
if (html) {
html = (item.Status == 'Ended' ? 'Aired ' : 'Airs ') + html;
@ -481,17 +482,21 @@
}
}
function renderChildren(page, item) {
function renderChildren(page, item, user) {
var sortBy = item.Type == "BoxSet" ? "ProductionYear,SortName" : "SortName";
ApiClient.getItems(Dashboard.getCurrentUserId(), {
var query = {
ParentId: item.Id,
SortBy: sortBy,
Fields: "PrimaryImageAspectRatio,ItemCounts,DateCreated,AudioInfo"
};
}).done(function (result) {
if (item.Type == "Series" || item.Type == "Season" && !user.Configuration.DisplayVirtualEpisodes) {
query.ExcludeLocationTypes = "virtual";
}
ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
if (item.Type == "MusicAlbum") {

35
dashboard-ui/scripts/edituserpage.js
View file

@ -1,21 +1,5 @@
(function ($, window, document) {
function populateLanguages(select, allCultures) {
var html = "";
html += "<option value=''>None</option>";
for (var i = 0, length = allCultures.length; i < length; i++) {
var culture = allCultures[i];
html += "<option value='" + culture.ThreeLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
}
select.html(html).selectmenu("refresh");
}
function populateRatings(allParentalRatings, page) {
var html = "";
@ -54,7 +38,7 @@
$('#selectMaxParentalRating', page).html(html).selectmenu("refresh");
}
function loadUser(page, user, loggedInUser, parentalRatingsPromise, allCulturesPromise) {
function loadUser(page, user, loggedInUser, parentalRatingsPromise) {
if (!loggedInUser.Configuration.IsAdministrator) {
$('#parentalControlDiv', page).hide();
@ -91,16 +75,6 @@
$('#selectMaxParentalRating', page).val(ratingValue).selectmenu("refresh");
});
allCulturesPromise.done(function (allCultures) {
populateLanguages($('#selectAudioLanguage', page), allCultures);
populateLanguages($('#selectSubtitleLanguage', page), allCultures);
$('#selectAudioLanguage', page).val(user.Configuration.AudioLanguagePreference || "").selectmenu("refresh");
$('#selectSubtitleLanguage', page).val(user.Configuration.SubtitleLanguagePreference || "").selectmenu("refresh");
});
$('#chkForcedSubtitlesOnly', page).checked(user.Configuration.UseForcedSubtitlesOnly || false).checkboxradio("refresh");
$('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh");
$('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh");
@ -132,9 +106,6 @@
user.Configuration.IsAdministrator = $('#chkIsAdmin', page).checked();
user.Configuration.AudioLanguagePreference = $('#selectAudioLanguage', page).val();
user.Configuration.SubtitleLanguagePreference = $('#selectSubtitleLanguage', page).val();
user.Configuration.UseForcedSubtitlesOnly = $('#chkForcedSubtitlesOnly', page).checked();
user.Configuration.BlockNotRated = $('#chkBlockNotRated', page).checked();
user.Configuration.IsHidden = $('#chkIsHidden', page).checked();
@ -231,11 +202,9 @@
var parentalRatingsPromise = ApiClient.getParentalRatings();
var allCulturesPromise = ApiClient.getCultures();
$.when(promise1, promise2).done(function (response1, response2) {
loadUser(page, response1[0] || response1, response2[0], parentalRatingsPromise, allCulturesPromise);
loadUser(page, response1[0] || response1, response2[0], parentalRatingsPromise);
});

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

@ -2027,8 +2027,7 @@
if (item.Genres && item.Genres.length) {
var prefix = item.Genres.length > 1 ? "Genres" : "Genre";
var html = prefix + ':&nbsp;&nbsp;';
var html = '';
for (var i = 0, length = item.Genres.length; i < length; i++) {

146
dashboard-ui/scripts/usersettings.js Normal file
View file

@ -0,0 +1,146 @@
(function ($, window, document) {
function populateLanguages(select, allCultures) {
var html = "";
html += "<option value=''>None</option>";
for (var i = 0, length = allCultures.length; i < length; i++) {
var culture = allCultures[i];
html += "<option value='" + culture.ThreeLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
}
select.html(html).selectmenu("refresh");
}
function loadUser(page, user, loggedInUser, allCulturesPromise) {
Dashboard.setPageTitle(user.Name);
allCulturesPromise.done(function (allCultures) {
populateLanguages($('#selectAudioLanguage', page), allCultures);
populateLanguages($('#selectSubtitleLanguage', page), allCultures);
$('#selectAudioLanguage', page).val(user.Configuration.AudioLanguagePreference || "").selectmenu("refresh");
$('#selectSubtitleLanguage', page).val(user.Configuration.SubtitleLanguagePreference || "").selectmenu("refresh");
});
$('#chkForcedSubtitlesOnly', page).checked(user.Configuration.UseForcedSubtitlesOnly || false).checkboxradio("refresh");
$('#chkDisplayVirtualEpisodes', page).checked(user.Configuration.DisplayVirtualEpisodes || false).checkboxradio("refresh");
Dashboard.hideLoadingMsg();
}
function onSaveComplete(page) {
Dashboard.hideLoadingMsg();
var userId = getParameterByName("userId");
Dashboard.validateCurrentUser(page);
if (userId) {
Dashboard.alert("Settings saved.");
} else {
Dashboard.navigate("userprofiles.html");
}
}
function saveUser(user, page) {
user.Configuration.AudioLanguagePreference = $('#selectAudioLanguage', page).val();
user.Configuration.SubtitleLanguagePreference = $('#selectSubtitleLanguage', page).val();
user.Configuration.UseForcedSubtitlesOnly = $('#chkForcedSubtitlesOnly', page).checked();
user.Configuration.DisplayVirtualEpisodes = $('#chkDisplayVirtualEpisodes', page).checked();
ApiClient.updateUser(user).done(function () {
onSaveComplete(page);
});
}
function userSettingsPage() {
var self = this;
self.onSubmit = function () {
var page = $(this).parents('.page');
Dashboard.showLoadingMsg();
var userId = getParameterByName("userId");
ApiClient.getUser(userId).done(function (result) {
saveUser(result, page);
});
// Disable default form submission
return false;
};
}
window.UserSettingsPage = new userSettingsPage();
$(document).on('pagebeforeshow', "#userSettingsPage", function () {
var page = this;
var userId = getParameterByName("userId");
if (userId) {
$('#userProfileNavigation', page).show();
} else {
$('#userProfileNavigation', page).hide();
}
Dashboard.getCurrentUser().done(function (loggedInUser) {
if (loggedInUser.Configuration.IsAdministrator) {
$('.lnkMediaLibrary', page).show().prev().removeClass('ui-last-child');
} else {
$('.lnkMediaLibrary', page).hide().prev().addClass('ui-last-child');
}
});
}).on('pageshow', "#userSettingsPage", function () {
var page = this;
Dashboard.showLoadingMsg();
var userId = getParameterByName("userId");
var promise1;
if (!userId) {
var deferred = $.Deferred();
deferred.resolveWith(null, [{
Configuration: {}
}]);
promise1 = deferred.promise();
} else {
promise1 = ApiClient.getUser(userId);
}
var promise2 = Dashboard.getCurrentUser();
var allCulturesPromise = ApiClient.getCultures();
$.when(promise1, promise2).done(function (response1, response2) {
loadUser(page, response1[0] || response1, response2[0], allCulturesPromise);
});
$("#userSettingsForm input:first").focus();
});
})(jQuery, window, document);

3
dashboard-ui/updatepassword.html
View file

@ -10,9 +10,10 @@
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" class="ui-btn-active">Password</a>
<a href="#" data-role="button" class="lnkMediaLibrary" style="display:none;" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
<a href="#" data-role="button" class="lnkMediaLibrary" style="display: none;" onclick="Dashboard.navigate('library.html', true);">Media Library</a>
</div>
<h3 style="display: none;">Create Password</h3>
<form id="updatePasswordForm">

5
dashboard-ui/userimage.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title> </title>
<title></title>
</head>
<body>
<div id="userImagePage" data-role="page" class="page type-interior userProfilesConfigurationPage">
@ -10,9 +10,10 @@
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="#" onclick="Dashboard.navigate('edituser.html', true);" data-role="button">Profile</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('usersettings.html', true);">Settings</a>
<a href="#" data-role="button" class="ui-btn-active">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display:none;">Media Library</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
</div>
<div class="readOnlyContent">
<p id="fldImage"></p>

56
dashboard-ui/usersettings.html Normal file
View file

@ -0,0 +1,56 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
</head>
<body>
<div id="userSettingsPage" data-role="page" class="page type-interior userProfilesConfigurationPage">
<div data-role="content">
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" id="userProfileNavigation" style="display: none;" data-mini="true">
<a href="#" data-role="button" onclick="Dashboard.navigate('edituser.html', true);">Profile</a>
<a href="#" data-role="button" class="ui-btn-active">Settings</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
<a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
</div>
<form id="userSettingsForm">
<ul data-role="listview" class="ulForm">
<li>
<input type="checkbox" id="chkDisplayVirtualEpisodes" name="chkDisplayVirtualEpisodes" />
<label for="chkDisplayVirtualEpisodes">Display missing and unaired episodes within seasons</label>
</li>
</ul>
<h2>Video Playback Settings</h2>
<ul data-role="listview" class="ulForm">
<li>
<label for="selectAudioLanguage">Audio language preference: </label>
<select name="selectAudioLanguage" id="selectAudioLanguage"></select>
</li>
<li>
<label for="selectSubtitleLanguage">Subtitle language preference: </label>
<select name="selectSubtitleLanguage" id="selectSubtitleLanguage"></select>
</li>
<li>
<input type="checkbox" id="chkForcedSubtitlesOnly" name="chkForcedSubtitlesOnly" />
<label for="chkForcedSubtitlesOnly">Display only forced subtitles</label>
</li>
<li>
<button type="submit" data-theme="b" data-icon="ok">
Save
</button>
<button type="button" onclick="history.back();" data-icon="delete">
Cancel
</button>
</li>
</ul>
</form>
</div>
</div>
<script type="text/javascript">
$('#userSettingsForm').on('submit', UserSettingsPage.onSubmit);
</script>
</div>
</body>
</html>