mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
add connect linking
This commit is contained in:
Luke Pulverenti
parent
54c04849d8
commit
503a18926b
9 changed files with 260 additions and 130 deletions
|
|
@ -1,6 +1,10 @@
|
|||
(function ($, window, document) {
|
||||
|
||||
function loadUser(page, user, loggedInUser) {
|
||||
var currentConnectInfo;
|
||||
|
||||
function loadUser(page, user, loggedInUser, connectInfo) {
|
||||
|
||||
currentConnectInfo = connectInfo;
|
||||
|
||||
if (!loggedInUser.Configuration.IsAdministrator) {
|
||||
|
||||
|
|
@ -16,6 +20,12 @@
|
|||
$('.lnkEditUserPreferencesContainer', page).show();
|
||||
}
|
||||
|
||||
if (user.Id && loggedInUser.Configuration.IsAdministrator) {
|
||||
$('#fldConnectInfo', page).show();
|
||||
} else {
|
||||
$('#fldConnectInfo', page).hide();
|
||||
}
|
||||
|
||||
if (!loggedInUser.Configuration.IsAdministrator || !user.Id) {
|
||||
|
||||
$('.lnkEditUserPreferencesContainer', page).hide();
|
||||
|
|
@ -29,6 +39,7 @@
|
|||
Dashboard.setPageTitle(user.Name || Globalize.translate('AddUser'));
|
||||
|
||||
$('#txtUserName', page).val(user.Name);
|
||||
$('#txtConnectUserName', page).val(connectInfo.Username);
|
||||
|
||||
$('#chkIsAdmin', page).checked(user.Configuration.IsAdministrator || false).checkboxradio("refresh");
|
||||
$('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh");
|
||||
|
|
@ -45,19 +56,78 @@
|
|||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
function onSaveComplete(page) {
|
||||
function onSaveComplete(page, user) {
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
|
||||
var userId = getParameterByName("userId");
|
||||
|
||||
if (userId) {
|
||||
Dashboard.alert(Globalize.translate('SettingsSaved'));
|
||||
|
||||
var currentConnectUsername = currentConnectInfo.Username || '';
|
||||
var enteredConnectUsername = $('#txtConnectUserName', page).val();
|
||||
|
||||
if (currentConnectUsername == enteredConnectUsername) {
|
||||
Dashboard.alert(Globalize.translate('SettingsSaved'));
|
||||
} else {
|
||||
updateConnectInfo(page, user);
|
||||
}
|
||||
} else {
|
||||
Dashboard.navigate("userprofiles.html");
|
||||
}
|
||||
}
|
||||
|
||||
function updateConnectInfo(page, user) {
|
||||
|
||||
var currentConnectUsername = currentConnectInfo.Username || '';
|
||||
var enteredConnectUsername = $('#txtConnectUserName', page).val();
|
||||
|
||||
var linkUrl = ApiClient.getUrl('Users/' + user.Id + '/Connect/Link');
|
||||
|
||||
if (currentConnectUsername && !enteredConnectUsername) {
|
||||
|
||||
// Remove connect info
|
||||
// Add/Update connect info
|
||||
ApiClient.ajax({
|
||||
|
||||
type: "DELETE",
|
||||
url: linkUrl
|
||||
|
||||
}).done(function () {
|
||||
|
||||
Dashboard.alert(Globalize.translate('SettingsSaved'));
|
||||
loadData(page);
|
||||
});
|
||||
|
||||
}
|
||||
else if (currentConnectUsername != enteredConnectUsername) {
|
||||
|
||||
// Add/Update connect info
|
||||
ApiClient.ajax({
|
||||
|
||||
type: "POST",
|
||||
url: linkUrl,
|
||||
data: {
|
||||
ConnectUsername: enteredConnectUsername
|
||||
}
|
||||
|
||||
}).done(function () {
|
||||
|
||||
Dashboard.alert({
|
||||
|
||||
message: Globalize.translate('MessageMediaBrowserAccontAdded'),
|
||||
title: Globalize.translate('HeaderMediaBrowserAccountAdded'),
|
||||
|
||||
callback: function () {
|
||||
|
||||
loadData(page);
|
||||
}
|
||||
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function saveUser(user, page) {
|
||||
|
||||
user.Name = $('#txtUserName', page).val();
|
||||
|
|
@ -78,11 +148,11 @@
|
|||
|
||||
if (userId) {
|
||||
ApiClient.updateUser(user).done(function () {
|
||||
onSaveComplete(page);
|
||||
onSaveComplete(page, user);
|
||||
});
|
||||
} else {
|
||||
ApiClient.createUser(user).done(function () {
|
||||
onSaveComplete(page);
|
||||
onSaveComplete(page, user);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -97,23 +167,70 @@
|
|||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var userId = getParameterByName("userId");
|
||||
|
||||
if (!userId) {
|
||||
saveUser({
|
||||
Configuration: {}
|
||||
}, page);
|
||||
} else {
|
||||
ApiClient.getUser(userId).done(function (result) {
|
||||
saveUser(result, page);
|
||||
});
|
||||
}
|
||||
getUser().done(function (result) {
|
||||
saveUser(result, page);
|
||||
});
|
||||
|
||||
// Disable default form submission
|
||||
return false;
|
||||
};
|
||||
}
|
||||
|
||||
function getUser() {
|
||||
|
||||
var userId = getParameterByName("userId");
|
||||
|
||||
if (userId) {
|
||||
|
||||
return ApiClient.getUser(userId);
|
||||
}
|
||||
|
||||
var deferred = $.Deferred();
|
||||
|
||||
deferred.resolveWith(null, [{
|
||||
Configuration: {
|
||||
IsAdministrator: false,
|
||||
EnableLiveTvManagement: true,
|
||||
EnableLiveTvAccess: true,
|
||||
EnableRemoteControlOfOtherUsers: true,
|
||||
EnableMediaPlayback: true
|
||||
}
|
||||
}]);
|
||||
|
||||
return deferred.promise();
|
||||
}
|
||||
|
||||
function getConnectUserInfo() {
|
||||
|
||||
var userId = getParameterByName("userId");
|
||||
|
||||
if (userId) {
|
||||
|
||||
return ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Connect/Info'));
|
||||
}
|
||||
|
||||
var deferred = $.Deferred();
|
||||
|
||||
deferred.resolveWith(null, [[{}]]);
|
||||
|
||||
return deferred.promise();
|
||||
}
|
||||
|
||||
function loadData(page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var promise1 = getUser();
|
||||
var promise2 = Dashboard.getCurrentUser();
|
||||
var promise3 = getConnectUserInfo();
|
||||
|
||||
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
|
||||
|
||||
loadUser(page, response1[0] || response1, response2[0], response3[0]);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
window.EditUserPage = new editUserPage();
|
||||
|
||||
$(document).on('pagebeforeshow', "#editUserPage", function () {
|
||||
|
|
@ -141,39 +258,7 @@
|
|||
|
||||
var page = this;
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var userId = getParameterByName("userId");
|
||||
|
||||
var promise1;
|
||||
|
||||
if (!userId) {
|
||||
|
||||
var deferred = $.Deferred();
|
||||
|
||||
deferred.resolveWith(null, [{
|
||||
Configuration: {
|
||||
IsAdministrator: true,
|
||||
EnableLiveTvManagement: true,
|
||||
EnableLiveTvAccess: true,
|
||||
EnableRemoteControlOfOtherUsers: true,
|
||||
EnableMediaPlayback: true
|
||||
}
|
||||
}]);
|
||||
|
||||
promise1 = deferred.promise();
|
||||
} else {
|
||||
|
||||
promise1 = ApiClient.getUser(userId);
|
||||
}
|
||||
|
||||
var promise2 = Dashboard.getCurrentUser();
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
|
||||
loadUser(page, response1[0] || response1, response2[0]);
|
||||
|
||||
});
|
||||
loadData(page);
|
||||
|
||||
$("form input:first", page).focus();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,19 +1,63 @@
|
|||
(function (document, window, $) {
|
||||
|
||||
function deleteUser(page, id, name) {
|
||||
function deleteUser(page, id) {
|
||||
|
||||
var msg = Globalize.translate('DeleteUserConfirmation').replace('{0}', name);
|
||||
$('.userMenu', page).on("popupafterclose.deleteuser", function() {
|
||||
|
||||
Dashboard.confirm(msg, Globalize.translate('DeleteUser'), function (result) {
|
||||
$(this).off('popupafterclose.deleteuser');
|
||||
|
||||
if (result) {
|
||||
Dashboard.showLoadingMsg();
|
||||
var msg = Globalize.translate('DeleteUserConfirmation');
|
||||
|
||||
ApiClient.deleteUser(id).done(function () {
|
||||
Dashboard.confirm(msg, Globalize.translate('DeleteUser'), function (result) {
|
||||
|
||||
loadUsers(page);
|
||||
});
|
||||
}
|
||||
if (result) {
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.deleteUser(id).done(function () {
|
||||
|
||||
loadUsers(page);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}).popup('close');
|
||||
}
|
||||
|
||||
function closeUserMenu(page) {
|
||||
$('.userMenu', page).popup('close').remove();
|
||||
}
|
||||
|
||||
function showUserMenu(elem) {
|
||||
|
||||
var card = $(elem).parents('.card');
|
||||
var page = $(elem).parents('.page');
|
||||
var userId = card.attr('data-userid');
|
||||
|
||||
$('.userMenu', page).popup("close").remove();
|
||||
|
||||
var html = '<div data-role="popup" class="userMenu" data-history="false" data-theme="a">';
|
||||
|
||||
html += '<ul data-role="listview" style="min-width: 180px;">';
|
||||
html += '<li data-role="list-divider">Menu</li>';
|
||||
|
||||
html += '<li><a href="#" class="btnDeleteUser" data-userid="' + userId + '">' + Globalize.translate('ButtonDelete') + '</a></li>';
|
||||
|
||||
html += '<li><a href="useredit.html?userid=' + userId + '">' + Globalize.translate('ButtonOpen') + '</a></li>';
|
||||
|
||||
html += '</ul>';
|
||||
|
||||
html += '</div>';
|
||||
|
||||
page.append(html);
|
||||
|
||||
var flyout = $('.userMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
|
||||
|
||||
$(this).off("popupafterclose").remove();
|
||||
|
||||
});
|
||||
|
||||
$('.btnDeleteUser', flyout).on('click', function () {
|
||||
deleteUser(page, this);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -21,7 +65,13 @@
|
|||
|
||||
var html = '';
|
||||
|
||||
html += "<div class='card homePageSquareCard alternateHover bottomPaddedCard'>";
|
||||
var cssClass = "card homePageSquareCard alternateHover bottomPaddedCard";
|
||||
|
||||
if (user.Configuration.IsDisabled) {
|
||||
cssClass += ' grayscale';
|
||||
}
|
||||
|
||||
html += "<div data-userid='" + user.Id + "' class='" + cssClass + "'>";
|
||||
|
||||
html += '<div class="cardBox visualCardBox">';
|
||||
html += '<div class="cardScalable">';
|
||||
|
|
@ -36,7 +86,7 @@
|
|||
if (user.PrimaryImageTag) {
|
||||
|
||||
imgUrl = ApiClient.getUserImageUrl(user.Id, {
|
||||
width: 200,
|
||||
width: 300,
|
||||
tag: user.PrimaryImageTag,
|
||||
type: "Primary"
|
||||
});
|
||||
|
|
@ -66,7 +116,7 @@
|
|||
|
||||
html += '<div class="cardText" style="text-align:right; float:right;">';
|
||||
|
||||
html += '<button type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 2px 0 0;"></button>';
|
||||
html += '<button class="btnUserMenu" type="button" data-inline="true" data-iconpos="notext" data-icon="ellipsis-v" style="margin: 2px 0 0;"></button>';
|
||||
html += "</div>";
|
||||
|
||||
html += '<div class="cardText" style="margin-right: 30px; padding: 11px 0 10px;">';
|
||||
|
|
@ -82,54 +132,37 @@
|
|||
// card
|
||||
html += "</div>";
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
function getUserSectionHtml(users) {
|
||||
|
||||
//html += "<li>";
|
||||
var html = '';
|
||||
|
||||
//html += "<a href='useredit.html?userId=" + user.Id + "'>";
|
||||
|
||||
//if (user.PrimaryImageTag) {
|
||||
|
||||
// var url = ApiClient.getUserImageUrl(user.Id, {
|
||||
// width: 80,
|
||||
// tag: user.PrimaryImageTag,
|
||||
// type: "Primary"
|
||||
// });
|
||||
// html += "<img src='" + url + "' />";
|
||||
//} else {
|
||||
// html += "<img src='css/images/userflyoutdefault.png' />";
|
||||
//}
|
||||
|
||||
//html += "<h3>" + user.Name;
|
||||
|
||||
//html += "</h3>";
|
||||
|
||||
//html += "<p class='ui-li-aside'>";
|
||||
//if (user.HasConfiguredPassword) html += '<img src="css/images/userdata/password.png" alt="' + Globalize.translate('Password') + '" title="' + Globalize.translate('Password') + '" class="userProfileIcon" />';
|
||||
//if (user.Configuration.IsAdministrator) html += '<img src="css/images/userdata/administrator.png" alt="' + Globalize.translate('Administrator') + '" title="' + Globalize.translate('Administrator') + '" class="userProfileIcon" />';
|
||||
|
||||
//html += "</p>";
|
||||
|
||||
//html += "</a>";
|
||||
|
||||
|
||||
//html += "<a onclick='UserProfilesPage.deleteUser(this);' data-userid='" + user.Id + "' data-username='" + user.Name + "' href='#'>" + Globalize.translate('Delete') + "</a>";
|
||||
|
||||
//html += "</li>";
|
||||
html += users.map(getUserHtml).join('');
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
function renderUsers(page, users) {
|
||||
|
||||
var html = '';
|
||||
|
||||
html += getUserSectionHtml(users);
|
||||
|
||||
var elem = $('.users', page).html(html).trigger('create');
|
||||
|
||||
$('.btnUserMenu', elem).on('click', function () {
|
||||
showUserMenu(this);
|
||||
});
|
||||
}
|
||||
|
||||
function loadUsers(page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
ApiClient.getUsers().done(function (users) {
|
||||
|
||||
var html = users.map(getUserHtml).join('');
|
||||
|
||||
$('.users', page).html(html).trigger('create');
|
||||
|
||||
renderUsers(page, users);
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue