-
-+
' + text + '');
- $('.supporterIconContainer', page).hide();
} else {
imgUrl = "css/images/supporter/nonsupporterbadge.png";
- text = "Please support Media Browser.";
+ text = Globalize.translate('MessagePleaseSupportMediaBrowser');
$('.supporterIconContainer', page).html('' + text + '');
- $('.supporterIconContainer', page).hide();
}
},
diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js
index 3f844b2379..366da370d7 100644
--- a/dashboard-ui/scripts/devices.js
+++ b/dashboard-ui/scripts/devices.js
@@ -79,7 +79,7 @@
ApiClient.getJSON(ApiClient.getUrl('Devices', {
- SupportsUniqueIdentifier: true
+ SupportsPersistentIdentifier: true
})).done(function (result) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index cf9d17a45c..29d7e9103f 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -492,10 +492,6 @@
return "itemlist.html?parentId=" + item.Id;
}
- if (item.CollectionType == 'movies') {
- return 'movieslatest.html?topParentId=' + item.Id;
- }
-
if (item.CollectionType == 'tvshows') {
return 'tvrecommended.html?topParentId=' + item.Id;
}
diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js
index 985ef28fab..9d8ed7975d 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 = 40;
+ var limit = 5;
var elem = $('.notificationsFlyoutlist');
refreshNotifications(startIndex, limit, elem, null, false).done(function() {
@@ -177,16 +177,18 @@
html += '' + notification.Name + '
'; + html += ''; + if (notification.Url) { + html += '' + notification.Name + ''; + } else { + html += notification.Name; + } + html += '
'; - html += '' + humane_date(notification.Date) + '
'; + html += '' + humane_date(notification.Date) + '
'; if (notification.Description) { - html += '' + notification.Description + '
'; - } - - if (notification.Url) { - html += ''; + html += ''; } html += ''; - html += ''; + html += ''; html += ''; html += '
'; html += ''; - html += ''; + html += ''; html += ''; html += '
'; diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js index b75c1eacb2..d844ceabdb 100644 --- a/dashboard-ui/scripts/userlibraryaccess.js +++ b/dashboard-ui/scripts/userlibraryaccess.js @@ -6,7 +6,7 @@ html += ''; - $('.mediaFolderAccess', page).html(html).trigger('create'); + $('.folderAccess', page).html(html).trigger('create'); + + $('#chkEnableAllFolders', page).checked(user.Policy.EnableAllFolders).checkboxradio('refresh').trigger('change'); } function loadChannels(page, user, channels) { @@ -110,11 +112,14 @@ function saveUser(user, page) { - user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { + user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked(); + user.Policy.EnabledFolders = user.Policy.EnableAllFolders ? + [] : + $('.chkFolder:checked', page).map(function () { - return this.getAttribute('data-foldername'); + return this.getAttribute('data-id'); - }).get(); + }).get(); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? @@ -182,6 +187,16 @@ }); + $('#chkEnableAllFolders', page).on('change', function () { + + if (this.checked) { + $('.folderAccessListContainer', page).hide(); + } else { + $('.folderAccessListContainer', page).show(); + } + + }); + }).on('pageshow', "#userLibraryAccessPage", function () { var page = this; @@ -210,7 +225,7 @@ var promise4 = ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false })); var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels")); var promise6 = ApiClient.getJSON(ApiClient.getUrl('Devices', { - SupportsUniqueIdentifier: true + SupportsPersistentIdentifier: true })); $.when(promise1, promise2, promise4, promise5, promise6).done(function (response1, response2, response4, response5, response6) { diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index 3d1e3bb0a9..4dfe10aa52 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -6,7 +6,7 @@ html += ''; - $('.mediaFolderAccess', page).html(html).trigger('create'); + $('.folderAccess', page).html(html).trigger('create'); + + $('#chkEnableAllFolders', page).checked(true).checkboxradio('refresh').trigger('change'); } function loadChannels(page, channels) { @@ -83,11 +85,14 @@ ApiClient.createUser(name).done(function (user) { - user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { + user.Policy.EnableAllFolders = $('#chkEnableAllFolders', page).checked(); + user.Policy.EnabledFolders = user.Policy.EnableAllFolders ? + [] : + $('.chkFolder:checked', page).map(function () { - return this.getAttribute('data-id'); + return this.getAttribute('data-id'); - }).get(); + }).get(); user.Policy.EnableAllChannels = $('#chkEnableAllChannels', page).checked(); user.Policy.EnabledChannels = user.Policy.EnableAllChannels ? @@ -142,6 +147,16 @@ }); + $('#chkEnableAllFolders', page).on('change', function () { + + if (this.checked) { + $('.folderAccessListContainer', page).hide(); + } else { + $('.folderAccessListContainer', page).show(); + } + + }); + }).on('pageshow', "#newUserPage", function () { var page = this; diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js index 17e8ae4c48..b79cc8731c 100644 --- a/dashboard-ui/scripts/userprofilespage.js +++ b/dashboard-ui/scripts/userprofilespage.js @@ -341,7 +341,7 @@ ApiClient.getJSON(ApiClient.getUrl("Channels", {})).done(function (channelsResult) { - var shareExcludes = $(".chkShareFolder:not(:checked)", page).get().map(function (i) { + var shareExcludes = $(".chkShareFolder:checked", page).get().map(function (i) { return i.getAttribute('data-folderid'); }); @@ -355,7 +355,7 @@ data: { ConnectUsername: $('#txtConnectUsername', page).val(), - ExcludedLibraries: shareExcludes.join(','), + EnabledLibraries: shareExcludes.join(','), SendingUserId: Dashboard.getCurrentUserId(), EnableLiveTv: false } diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html index 48bf07908e..f63ccc4104 100644 --- a/dashboard-ui/userlibraryaccess.html +++ b/dashboard-ui/userlibraryaccess.html @@ -16,10 +16,18 @@
- 
- 
- 
- 
- 
- 
- 
- 
-