diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js
index 3106027fea..d6d78e6323 100644
--- a/dashboard-ui/scripts/autoorganizelog.js
+++ b/dashboard-ui/scripts/autoorganizelog.js
@@ -285,7 +285,14 @@
deleteOriginalFile(page, id);
});
- var pagingHtml = LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false);
+ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
+
$('.listTopPaging', page).html(pagingHtml).trigger('create');
if (result.TotalRecordCount > query.Limit && result.TotalRecordCount > 50) {
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 166f2f919e..4b5e2cf274 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -93,11 +93,7 @@
$('#ports', page).html(Globalize.translate('LabelRunningOnPort', '
' + systemInfo.HttpServerPortNumber + ''));
}
- if (systemInfo.CanSelfRestart) {
- $('.btnRestartContainer', page).removeClass('hide');
- } else {
- $('.btnRestartContainer', page).addClass('hide');
- }
+ $('.btnRestartContainer', page).visible(systemInfo.CanSelfRestart);
DashboardPage.renderUrls(page, systemInfo);
DashboardPage.renderPendingInstallations(page, systemInfo);
@@ -142,7 +138,13 @@
var pagingHtml = '';
pagingHtml += '
';
- pagingHtml += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false);
+ pagingHtml += LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
pagingHtml += '
';
html = html.join('') + pagingHtml;
@@ -1159,7 +1161,13 @@ $(document).on('pageshowready', "#dashboardPage", DashboardPage.onPageShow).on('
var query = { StartIndex: startIndex, Limit: limit };
- html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, limit, false);
+ html += LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
}
$(elem).html(html).trigger('create');
diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
index 61282c1fb2..c042cc260f 100644
--- a/dashboard-ui/scripts/extensions.js
+++ b/dashboard-ui/scripts/extensions.js
@@ -596,7 +596,7 @@ function ticks_to_human(str) {
$.fn.visible = function(visible) {
if (visible) {
- return this.removeClass('forceHide');
+ return this.removeClass('hide');
}
- return this.addClass('forceHide');
+ return this.addClass('hide');
};
\ No newline at end of file
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index a92b93b733..7cad7f798f 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -439,7 +439,17 @@
var html = '';
if (result.TotalRecordCount > query.Limit) {
- $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
+
+ var pagingHtml = LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
+
+ $('.listTopPaging', page).html(pagingHtml);
+
$('.viewSettings', page).show();
} else {
$('.listTopPaging', page).html('');
@@ -509,7 +519,13 @@
});
}
- html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
+ html += LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
$('#items', page).html(html).trigger('create').lazyChildren();
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 8590f0a9dc..e0041aa782 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -71,11 +71,7 @@
$('.splitVersionContainer', page).hide();
}
- if (LibraryBrowser.getMoreCommands(item, user).length) {
- $('.btnMoreCommands', page).show();
- } else {
- $('.btnMoreCommands', page).show();
- }
+ $('.btnMoreCommands', page).visible(LibraryBrowser.getMoreCommands(item, user).length > 0);
if (user.Policy.IsAdministrator) {
$('.chapterSettingsButton', page).show();
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 85d22504a3..536bd22b76 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2117,20 +2117,19 @@
if (showControls) {
- html += '
';
-
- html += '
';
+ html += '
';
+ html += '
= totalRecordCount ? 'disabled' : '') + '>';
}
html += (options.additionalButtonsHtml || '');
if (options.addSelectionButton) {
- html += '
';
+ html += '
';
}
if (options.viewButton) {
- html += '
';
+ html += '
';
}
html += '
';
@@ -2161,72 +2160,6 @@
return html;
},
- getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) {
-
- if (query.Limit && updatePageSizeSetting !== false) {
- try {
- store.setItem(pageSizeKey, query.Limit);
- } catch (e) {
-
- }
- }
-
- var html = '';
-
- var recordsEnd = Math.min(query.StartIndex + query.Limit, totalRecordCount);
-
- // 20 is the minimum page size
- var showControls = totalRecordCount > 20 || query.Limit < totalRecordCount;
-
- html += '
';
-
- html += '
';
-
- var startAtDisplay = totalRecordCount ? query.StartIndex + 1 : 0;
- html += startAtDisplay + '-' + recordsEnd + ' of ' + totalRecordCount;
-
- html += '';
-
- if (showControls) {
-
- html += '
';
- html += '';
-
- html += '';
- html += '
';
-
- if (showLimit !== false) {
- var id = "selectPageSize" + new Date().getTime();
-
- var options = '';
-
- function getOption(val) {
-
- if (query.Limit == val) {
-
- return '
';
-
- } else {
- return '
';
- }
- }
-
- pageSizes = pageSizes || [20, 50, 100, 200, 300, 400, 500];
-
- for (var j = 0, length = pageSizes.length; j < length; j++) {
- options += getOption(pageSizes[j]);
- }
-
- // Add styles to defeat jquery mobile
- html += '
';
- }
- }
-
- html += '
';
-
- return html;
- },
-
getRatingHtml: function (item, metascore) {
var html = "";
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index a3620052af..2a862352e7 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -81,7 +81,13 @@
});
- var channelPagingHtml = LibraryBrowser.getPagingHtml(channelQuery, channelsResult.TotalRecordCount, false, [10, 20, 30, 50, 100]);
+ var channelPagingHtml = LibraryBrowser.getQueryPagingHtml({
+ startIndex: channelQuery.StartIndex,
+ limit: channelQuery.Limit,
+ totalRecordCount: channelsResult.TotalRecordCount,
+ updatePageSizeSetting: false
+ });
+
$('.channelPaging', page).html(channelPagingHtml).trigger('create');
$('.btnNextPage', page).on('click', function () {
diff --git a/dashboard-ui/scripts/livetvrecordinglist.js b/dashboard-ui/scripts/livetvrecordinglist.js
index 5d47f6dfcd..ae367fe963 100644
--- a/dashboard-ui/scripts/livetvrecordinglist.js
+++ b/dashboard-ui/scripts/livetvrecordinglist.js
@@ -18,7 +18,13 @@
var html = '';
- $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create');
+ $('.listTopPaging', page).html(LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ }));
updateFilterControls();
@@ -35,7 +41,13 @@
});
- html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
+ html += LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: result.TotalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
$('#items', page).html(html).lazyChildren();
@@ -75,7 +87,7 @@
}).on('pageshowready', "#liveTvRecordingListPage", function () {
var page = this;
-
+
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js
index 2c67005118..51d7a9556e 100644
--- a/dashboard-ui/scripts/notifications.js
+++ b/dashboard-ui/scripts/notifications.js
@@ -95,7 +95,13 @@
var query = { StartIndex: startIndex, Limit: limit };
- html += LibraryBrowser.getPagingHtml(query, totalRecordCount, false, limit, false);
+ html += LibraryBrowser.getQueryPagingHtml({
+ startIndex: query.StartIndex,
+ limit: query.Limit,
+ totalRecordCount: totalRecordCount,
+ showLimit: false,
+ updatePageSizeSetting: false
+ });
}
for (var i = 0, length = list.length; i < length; i++) {
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index a6a12288b2..8a5d697dc5 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -233,7 +233,7 @@
Velocity.animate(elem, { "left": "100%" },
{
complete: function () {
- $('.viewMenuSearch').addClass('hide');
+ $('.viewMenuSearch').visible(false);
}
});
});
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index ac5a71f271..8d7a168bf0 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -6,13 +6,13 @@
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index f99c41ff0a..ee8a050e47 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -112,33 +112,12 @@ h1, h1 a {
.libraryViewNav .material-icons {
display: block;
margin-top: -5px;
- font-size: 14px;
-}
-
-paper-button[raised].submit {
- background: none !important;
- color: #539FFD !important;
- border: 1px solid #539FFD !important;
-}
-
-paper-button[raised].more {
- background: none !important;
- color: orange !important;
- border: 1px solid orange !important;
-}
-
-paper-button[raised].secondary {
- background: none !important;
- color: green !important;
- border: 1px solid green !important;
-}
-
-paper-button[raised].cancel {
- background: none !important;
- color: #666 !important;
- border: 1px solid #666 !important;
+ font-size: 15px;
}
.btnActiveCast i {
color: #539FFD !important;
}
+.libraryViewNav a:not(.ui-btn-active):hover {
+ color: #539FFD !important;
+}
\ No newline at end of file
diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js
index 89939ca5c1..f7ee4cf26a 100644
--- a/dashboard-ui/thirdparty/cordova/chromecast.js
+++ b/dashboard-ui/thirdparty/cordova/chromecast.js
@@ -657,7 +657,9 @@
}
}
- document.addEventListener("resume", onResume, false);
+ if (!$.browser.safari) {
+ document.addEventListener("resume", onResume, false);
+ }
}
MediaController.registerPlayer(new chromecastPlayer());
diff --git a/dashboard-ui/thirdparty/iron-icons/emby-icons.html b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
index fb582117d6..34d7bde822 100644
--- a/dashboard-ui/thirdparty/iron-icons/emby-icons.html
+++ b/dashboard-ui/thirdparty/iron-icons/emby-icons.html
@@ -38,6 +38,7 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
+
diff --git a/dashboard-ui/thirdparty/paper-button/paper-button-style.css b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
index 4555173f3b..dfa4bf4591 100644
--- a/dashboard-ui/thirdparty/paper-button/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button/paper-button-style.css
@@ -62,44 +62,53 @@
color: #fff;
}
- paper-button.hover:hover {
- background: #eee;
- }
+.ui-page-theme-a paper-button.subdued {
+ color: #fff;
+}
- paper-button.ripple::shadow paper-ripple {
- color: var(--paper-pink-a200);
- }
+.ui-page-theme-a paper-button[raised].subdued {
+ background: #fff;
+ color: #000;
+}
- paper-button.ripple paper-ripple {
- color: var(--paper-pink-a200);
- }
+paper-button.hover:hover {
+ background: #eee;
+}
- paper-button span {
- vertical-align: middle;
- }
+paper-button.ripple::shadow paper-ripple {
+ color: var(--paper-pink-a200);
+}
- paper-button:not(.iconRight) iron-icon, paper-button:not(.iconRight) .fa {
- margin-right: .5em;
- }
+paper-button.ripple paper-ripple {
+ color: var(--paper-pink-a200);
+}
- paper-button:not(.iconRight) .material-icons {
- margin-right: .25em;
- }
+paper-button span {
+ vertical-align: middle;
+}
- paper-button.iconRight iron-icon, paper-button.iconRight .fa, paper-button.iconRight .material-icons {
- position: absolute;
- right: 5px;
- top: 5px;
- }
+paper-button:not(.iconRight) iron-icon, paper-button:not(.iconRight) .fa {
+ margin-right: .5em;
+}
- paper-button .material-icons {
- font-size: 150%;
- vertical-align: middle;
- }
+paper-button:not(.iconRight) .material-icons {
+ margin-right: .25em;
+}
- paper-button .fa {
- vertical-align: middle;
- }
+paper-button.iconRight iron-icon, paper-button.iconRight .fa, paper-button.iconRight .material-icons {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+}
+
+paper-button .material-icons {
+ font-size: 150%;
+ vertical-align: middle;
+}
+
+paper-button .fa {
+ vertical-align: middle;
+}
.clearButton {
background: transparent;
@@ -132,13 +141,13 @@ paper-toast {
}
paper-button.notext {
- min-width: 2em;
+ min-width: 2.8em;
}
-paper-button.notext .content {
- padding-left: 0 !important;
- padding-right: 0 !important;
-}
+ paper-button.notext .content {
+ padding-left: 0 !important;
+ padding-right: 0 !important;
+ }
paper-button.notext iron-icon {
margin-right: 0;
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index c654d416be..dd076eabfd 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -6,14 +6,14 @@
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index f63bf41f90..f4920aa1d0 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -8,14 +8,14 @@
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index 8f6553a843..e9d2db1277 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -6,14 +6,14 @@
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 65a86bf1e1..bdaedccf36 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -16,14 +16,14 @@
schedule${TabUpcoming}
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 56ca05ec35..92d098b210 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -6,14 +6,14 @@
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index b6e4b01870..bc66583500 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -6,14 +6,14 @@
diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html
index a9b3e8a9f2..7ac1daa052 100644
--- a/dashboard-ui/tvupcoming.html
+++ b/dashboard-ui/tvupcoming.html
@@ -13,14 +13,14 @@
schedule${TabUpcoming}