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

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-19 15:53:02 -05:00
parent a174be36a9
commit 905733c18c
6 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/css/site.css
View file

@ -320,7 +320,7 @@ h1 .imageLink {
border: 0; border: 0;
display: none; display: none;
text-align: left; text-align: left;
width: 240px; width: 250px;
position: fixed; position: fixed;
top: 51px; top: 51px;
left: 0; left: 0;
@ -478,7 +478,7 @@ h1 .imageLink {
.content-primary { .content-primary {
padding: 80px 15px 3em 0; padding: 80px 15px 3em 0;
margin: 0 0 0 280px; margin: 0 0 0 290px;
} }
.content-primary ul:first-child { .content-primary ul:first-child {

10
dashboard-ui/notificationlist.html
View file

@ -1,20 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>${TitleAdvanced}</title> <title>${TitleNotifications}</title>
</head> </head>
<body> <body>
<div id="notificationsPage" data-role="page" class="page type-interior advancedConfigurationPage"> <div id="notificationsPage" data-role="page" class="page type-interior notificationConfigurationPage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<a href="advanced.html" data-role="button">${TabGeneral}</a>
<a href="#" data-role="button" class="ui-btn-active">${TabNotifications}</a>
<a href="scheduledtasks.html" data-role="button">${TabScheduledTasks}</a>
</div>
<div class="readOnlyContent"> <div class="readOnlyContent">
<div class="notificationsList" style="margin-top: 1em;"> <div class="notificationsList" style="margin-top: 1em;">

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

@ -805,6 +805,7 @@
text = "Please support Media Browser."; text = "Please support Media Browser.";
$('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>'); $('.supporterIconContainer', page).html('<a class="imageLink supporterIcon" href="supporter.html" title="' + text + '"><img src="' + imgUrl + '" style="height:32px;vertical-align: middle; margin-right: .5em;" /><span style="position:relative;top:2px;text-decoration:none;">' + text + '</span></a>');
$('.supporterIconContainer', page).hide();
} }
}, },

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

@ -73,7 +73,7 @@
self.isFlyout = true; self.isFlyout = true;
var startIndex = 0; var startIndex = 0;
var limit = 4; var limit = 40;
var elem = $('.notificationsFlyoutlist'); var elem = $('.notificationsFlyoutlist');
refreshNotifications(startIndex, limit, elem, null, false).done(function() { refreshNotifications(startIndex, limit, elem, null, false).done(function() {

30
dashboard-ui/scripts/usernew.js
View file

@ -54,6 +54,8 @@
} else { } else {
$('.channelAccessContainer', page).hide(); $('.channelAccessContainer', page).hide();
} }
$('#chkEnableAllChannels', page).checked(true).checkboxradio('refresh').trigger('change');
} }
function loadUser(page) { function loadUser(page) {
@ -87,19 +89,15 @@
}).get(); }).get();
var allChannels = $('.chkChannel', page); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked();
var enabledChannels = $('.chkChannel:checked', page).map(function () { user.Policy.EnabledChannels = user.Policy.EnableAllChannels ?
[] :
$('.chkChannel:checked', page).map(function () {
return this.getAttribute('data-id'); return this.getAttribute('data-id');
}).get(); }).get();
user.Policy.EnableAllChannels = enabledChannels.length == allChannels.length;
if (!user.Policy.EnableAllChannels) {
user.Policy.EnabledChannels = enabledChannels;
}
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
Dashboard.navigate("useredit.html?userId=" + user.Id); Dashboard.navigate("useredit.html?userId=" + user.Id);
}); });
@ -130,7 +128,21 @@
window.NewUserPage = new newUserPage(); window.NewUserPage = new newUserPage();
$(document).on('pageshow', "#newUserPage", function () { $(document).on('pageinit', "#newUserPage", function () {
var page = this;
$('#chkEnableAllChannels', page).on('change', function () {
if (this.checked) {
$('.channelAccessListContainer', page).hide();
} else {
$('.channelAccessListContainer', page).show();
}
});
}).on('pageshow', "#newUserPage", function () {
var page = this; var page = this;

13
dashboard-ui/usernew.html
View file

@ -28,14 +28,19 @@
<br /> <br />
</div> </div>
</div> </div>
<div data-role="collapsible" class="channelAccessContainer" style="display:none;"> <br />
<h2>${HeaderChannelAccess}</h2> <br />
<div class="channelAccessContainer" style="display:none;">
<div class="ui-controlgroup-label">${HeaderChannelAccess}</div>
<div> <div>
<label for="chkEnableAllChannels">${OptionEnableAccessToAllChannels}</label>
<input type="checkbox" id="chkEnableAllChannels" />
<div class="fieldDescription">${ChannelAccessHelp}</div>
</div>
<div class="channelAccessListContainer">
<br /> <br />
<div class="channelAccess"> <div class="channelAccess">
</div> </div>
<div class="fieldDescription">${ChannelAccessHelp}</div>
<br />
</div> </div>
</div> </div>