diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 87000da27c..8d76bae7aa 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -320,7 +320,7 @@ h1 .imageLink { border: 0; display: none; text-align: left; - width: 240px; + width: 250px; position: fixed; top: 51px; left: 0; @@ -478,7 +478,7 @@ h1 .imageLink { .content-primary { padding: 80px 15px 3em 0; - margin: 0 0 0 280px; + margin: 0 0 0 290px; } .content-primary ul:first-child { diff --git a/dashboard-ui/notificationlist.html b/dashboard-ui/notificationlist.html index 2c28275fd6..0bd531dbaa 100644 --- a/dashboard-ui/notificationlist.html +++ b/dashboard-ui/notificationlist.html @@ -1,20 +1,14 @@  - ${TitleAdvanced} + ${TitleNotifications} -
+
-
- ${TabGeneral} - ${TabNotifications} - ${TabScheduledTasks} -
-
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index 8726a75d32..dc0636add3 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -805,6 +805,7 @@ text = "Please support Media Browser."; $('.supporterIconContainer', page).html('' + text + ''); + $('.supporterIconContainer', page).hide(); } }, diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js index d8f26b68ca..985ef28fab 100644 --- a/dashboard-ui/scripts/notifications.js +++ b/dashboard-ui/scripts/notifications.js @@ -73,7 +73,7 @@ self.isFlyout = true; var startIndex = 0; - var limit = 4; + var limit = 40; var elem = $('.notificationsFlyoutlist'); refreshNotifications(startIndex, limit, elem, null, false).done(function() { diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index 0e94d2701c..3d1e3bb0a9 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -54,6 +54,8 @@ } else { $('.channelAccessContainer', page).hide(); } + + $('#chkEnableAllChannels', page).checked(true).checkboxradio('refresh').trigger('change'); } function loadUser(page) { @@ -87,18 +89,14 @@ }).get(); - var allChannels = $('.chkChannel', page); - var enabledChannels = $('.chkChannel:checked', page).map(function () { + user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); + user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? + [] : + $('.chkChannel:checked', page).map(function () { - return this.getAttribute('data-id'); + return this.getAttribute('data-id'); - }).get(); - - user.Policy.EnableAllChannels = enabledChannels.length == allChannels.length; - - if (!user.Policy.EnableAllChannels) { - user.Policy.EnabledChannels = enabledChannels; - } + }).get(); ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { Dashboard.navigate("useredit.html?userId=" + user.Id); @@ -130,7 +128,21 @@ 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; diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html index 3d350516e9..288d732c4c 100644 --- a/dashboard-ui/usernew.html +++ b/dashboard-ui/usernew.html @@ -28,14 +28,19 @@
-