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

duplicate password fields on admin side

This commit is contained in:
Luke Pulverenti 2015-01-31 22:29:26 -05:00
parent fd496448ac
commit 0a89e195a5
5 changed files with 87 additions and 36 deletions

View file

@ -551,7 +551,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
} }
.ui-page-theme-a .detailSectionHeader { .ui-page-theme-a .detailSectionHeader {
background-color: #fff; background-color: #ddd;
border: 1px solid #ddd; border: 1px solid #ddd;
border-radius: 2px; border-radius: 2px;
} }

View file

@ -4,7 +4,7 @@
<title>${TitleMediaBrowser}</title> <title>${TitleMediaBrowser}</title>
</head> </head>
<body> <body>
<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage" data-contextname="${HeaderPreferences}"> <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage" data-contextname="${HeaderPreferences}">
<div class="libraryViewNav"> <div class="libraryViewNav">
<a href="#" class="lnkDisplayPreferences">${TabDisplay}</a> <a href="#" class="lnkDisplayPreferences">${TabDisplay}</a>

View file

@ -181,20 +181,7 @@
window.MyProfilePage = new myProfilePage(); window.MyProfilePage = new myProfilePage();
$(document).on('pagebeforeshow', "#userImagePage", function () { $(document).on('pageinit', "#userImagePage", function () {
var page = this;
Dashboard.getCurrentUser().done(function (loggedInUser) {
if (loggedInUser.Policy.IsAdministrator) {
$('#lnkParentalControl', page).show();
} else {
$('#lnkParentalControl', page).hide();
}
});
}).on('pageinit', "#userImagePage", function () {
var page = this; var page = this;
@ -416,20 +403,7 @@
window.UpdatePasswordPage = new updatePasswordPage(); window.UpdatePasswordPage = new updatePasswordPage();
$(document).on('pagebeforeshow', "#userImagePage", function () { $(document).on('pageshow', ".userPasswordPage", function () {
var page = this;
Dashboard.getCurrentUser().done(function (loggedInUser) {
if (loggedInUser.Policy.IsAdministrator) {
$('#lnkParentalControl', page).show();
} else {
$('#lnkParentalControl', page).hide();
}
});
}).on('pageshow', "#userImagePage", function () {
var page = this; var page = this;

View file

@ -4,7 +4,13 @@
Dashboard.setPageTitle(user.Name); Dashboard.setPageTitle(user.Name);
$('.lnkEditUserPreferences', page).attr('href', 'myprofile.html?userId=' + user.Id); if (user.ConnectLinkType == 'Guest') {
$('.connectMessage', page).show();
}
else {
$('.connectMessage', page).hide();
}
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }

View file

@ -4,7 +4,7 @@
<title></title> <title></title>
</head> </head>
<body> <body>
<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users"> <div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -16,10 +16,81 @@
</div> </div>
<div class="readOnlyContent"> <div class="readOnlyContent">
<p>${HeaderDashboardUserPassword}</p>
<p> <div class="connectMessage readOnlyContent" style="display:none;">
<a data-role="button" data-icon="lock" class="lnkEditUserPreferences" href="#" target="_blank">${ButtonConfigurePassword}</a> <p>${MessageProfileInfoSynced}</p>
</p> <div style="margin-top: .75em;"><a href="http://mediabrowser.tv/connect" target="_blank">${ButtonLearnMoreAboutMediaBrowserConnect}</a></div>
</div>
<form class="adminUpdatePasswordForm passwordSection" style="display:none;margin: 0 auto 2em;">
<div class="detailSection">
<div class="detailSectionContent">
<div id="fldCurrentPassword" style="display: none;">
<label for="txtCurrentPassword">${LabelCurrentPassword}</label>
<input type="password" id="txtCurrentPassword" name="txtCurrentPassword" />
<br />
</div>
<div>
<label for="txtNewPassword">${LabelNewPassword}</label>
<input type="password" id="txtNewPassword" name="txtNewPassword" />
</div>
<br />
<div>
<label for="txtNewPasswordConfirm">${LabelNewPasswordConfirm}</label>
<input type="password" id="txtNewPasswordConfirm" name="txtNewPasswordConfirm" />
</div>
<br />
<div>
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
${ButtonSave}
</button>
<div id="btnResetPassword" style="display: none;">
<button type="button" data-icon="lock" onclick="UpdatePasswordPage.resetPassword();" data-mini="true">
${ButtonResetPassword}
</button>
</div>
</div>
</div>
</div>
</form>
<br />
<form class="adminLocalAccessForm localAccessSection" style="margin: 0 auto;">
<div class="detailSection">
<div class="detailSectionHeader">
${HeaderEasyPinCode}
</div>
<div class="detailSectionContent">
<br />
<div>${EasyPasswordHelp}</div>
<br />
<div>
<label for="txtEasyPassword">${LabelEasyPinCode}</label>
<input type="password" id="txtEasyPassword" />
</div>
<br />
<div>
<label for="chkEnableLocalEasyPassword">${LabelInNetworkSignInWithEasyPassword}</label>
<input type="checkbox" id="chkEnableLocalEasyPassword" />
<div class="fieldDescription">${LabelInNetworkSignInWithEasyPasswordHelp}</div>
</div>
<br />
<div>
<button type="submit" data-theme="b" data-icon="check" data-mini="true">
${ButtonSave}
</button>
<button id="btnResetEasyPassword" style="display:none;" type="button" data-icon="lock" onclick="UpdatePasswordPage.resetEasyPassword();" data-mini="true">
${ButtonResetEasyPassword}
</button>
</div>
</div>
</div>
</form>
<script type="text/javascript">
$('.adminUpdatePasswordForm').off('submit', UpdatePasswordPage.onSubmit).on('submit', UpdatePasswordPage.onSubmit);
$('.adminLocalAccessForm').off('submit', UpdatePasswordPage.onLocalAccessSubmit).on('submit', UpdatePasswordPage.onLocalAccessSubmit);
</script>
</div> </div>
</div> </div>
</div> </div>