diff --git a/dashboard-ui/css/fonts/RobotoLight.woff b/dashboard-ui/css/fonts/RobotoLight.woff
new file mode 100644
index 0000000000..14a130f518
Binary files /dev/null and b/dashboard-ui/css/fonts/RobotoLight.woff differ
diff --git a/dashboard-ui/css/fonts/RobotoMedium.woff b/dashboard-ui/css/fonts/RobotoMedium.woff
new file mode 100644
index 0000000000..221c51339d
Binary files /dev/null and b/dashboard-ui/css/fonts/RobotoMedium.woff differ
diff --git a/dashboard-ui/css/fonts/RobotoRegular.woff b/dashboard-ui/css/fonts/RobotoRegular.woff
new file mode 100644
index 0000000000..ebea05151a
Binary files /dev/null and b/dashboard-ui/css/fonts/RobotoRegular.woff differ
diff --git a/dashboard-ui/css/fonts/RobotoThin.woff b/dashboard-ui/css/fonts/RobotoThin.woff
new file mode 100644
index 0000000000..a48824f371
Binary files /dev/null and b/dashboard-ui/css/fonts/RobotoThin.woff differ
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index bc690377be..c0a2579124 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -116,7 +116,7 @@
.listHeader {
margin-top: .5em;
- margin-bottom: .25em;
+ margin-bottom: .2em;
padding-left: 7px;
}
diff --git a/dashboard-ui/css/posteritem.css b/dashboard-ui/css/posteritem.css
index 19b172dae7..90b41a5a6d 100644
--- a/dashboard-ui/css/posteritem.css
+++ b/dashboard-ui/css/posteritem.css
@@ -338,11 +338,11 @@
@media all and (min-width: 1440px) {
.squarePosterItem {
- width: 180px;
+ width: 167px;
}
.squarePosterItem .posterItemImage {
- height: 180px;
+ height: 167px;
}
.backdropPosterItem {
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index e0dff5b79b..cb7ae804f4 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -26,6 +26,31 @@
src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(fonts/OpenSans-ExtraBold.woff) format('woff');
}
+@font-face {
+ font-family: 'Roboto';
+ font-style: normal;
+ font-weight: 100;
+ src: local('Roboto Thin'), local('Roboto-Thin'), url(fonts/RobotoThin.woff) format('woff');
+}
+@font-face {
+ font-family: 'Roboto';
+ font-style: normal;
+ font-weight: 300;
+ src: local('Roboto Light'), local('Roboto-Light'), url(fonts/RobotoLight.woff) format('woff');
+}
+@font-face {
+ font-family: 'Roboto';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Roboto Regular'), local('Roboto-Regular'), url(fonts/RobotoRegular.woff) format('woff');
+}
+@font-face {
+ font-family: 'Roboto';
+ font-style: normal;
+ font-weight: 500;
+ src: local('Roboto Medium'), local('Roboto-Medium'), url(fonts/RobotoMedium.woff) format('woff');
+}
+
* {
text-shadow: none!important;
}
@@ -45,8 +70,9 @@ body {
}
h1 {
- font-weight: 300;
- font-size: 2em;
+ font-weight: 100;
+ font-size: 28px;
+ font-family: Roboto;
}
.ui-loader h1 {
diff --git a/dashboard-ui/libraryreport.html b/dashboard-ui/libraryreport.html
index 0ce13a4271..84823e0781 100644
--- a/dashboard-ui/libraryreport.html
+++ b/dashboard-ui/libraryreport.html
@@ -132,11 +132,14 @@
+
+
+
-
+
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 9c1c6af170..68dabe3acc 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -68,19 +68,11 @@
function getItemHref(item) {
- if (item.Type == 'ManualCollectionsFolder') {
+ if (item.Type == 'ManualCollectionsFolder' || item.CollectionType == 'boxsets') {
return 'collections.html?topParentId=' + item.Id;
}
- if (item.CollectionType == 'boxsets') {
- return 'moviecollections.html?topParentId=' + item.Id;
- }
-
- if (item.CollectionType == 'trailers') {
- return 'movietrailers.html?topParentId=' + item.Id;
- }
-
- if (item.Type == 'TrailerCollectionFolder') {
+ if (item.CollectionType == 'trailers' || item.Type == 'TrailerCollectionFolder') {
return 'movietrailers.html?topParentId=' + item.Id;
}
diff --git a/dashboard-ui/scripts/libraryreport.js b/dashboard-ui/scripts/libraryreport.js
index a66f43ff34..83e1c0826d 100644
--- a/dashboard-ui/scripts/libraryreport.js
+++ b/dashboard-ui/scripts/libraryreport.js
@@ -600,6 +600,7 @@
$('#chkSD', page).checked(query.IsHD == false).checkboxradio('refresh');
$('#chkSubtitle', page).checked(query.HasSubtitles == true).checkboxradio('refresh');
+ $('#chkNoSubtitle', page).checked(query.HasSubtitles === false).checkboxradio('refresh');
$('#chkTrailer', page).checked(query.HasTrailer == true).checkboxradio('refresh');
$('#chkSpecialFeature', page).checked(query.HasSpecialFeature == true).checkboxradio('refresh');
$('#chkThemeSong', page).checked(query.HasThemeSong == true).checkboxradio('refresh');
@@ -712,6 +713,18 @@
query.StartIndex = 0;
query.HasSubtitles = this.checked ? true : null;
+ $('#chkNoSubtitle', page).checked(false).checkboxradio('refresh');
+
+ reloadItems(page);
+ });
+
+ $('#chkNoSubtitle', page).on('change', function () {
+
+ query.StartIndex = 0;
+ query.HasSubtitles = this.checked ? false : null;
+
+ $('#chkSubtitle', page).checked(false).checkboxradio('refresh');
+
reloadItems(page);
});
diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js
index 565dc30a40..2a4961ccad 100644
--- a/dashboard-ui/scripts/musicrecommended.js
+++ b/dashboard-ui/scripts/musicrecommended.js
@@ -13,7 +13,7 @@
SortBy: "DateCreated",
SortOrder: "Descending",
IncludeItemTypes: "MusicAlbum",
- Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5),
+ Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true,
Fields: "PrimaryImageAspectRatio",
ParentId: parentId
@@ -36,7 +36,7 @@
SortBy: "DateCreated",
SortOrder: "Descending",
IncludeItemTypes: "Audio",
- Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5),
+ Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo",
ParentId: parentId
@@ -59,7 +59,7 @@
SortBy: "DatePlayed",
SortOrder: "Descending",
IncludeItemTypes: "Audio",
- Limit: screenWidth >= 1920 ? 6 : (screenWidth >= 1440 ? 6 : 5),
+ Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 7 : 5),
Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo",
Filters: "IsPlayed",
@@ -89,7 +89,7 @@
SortBy: "PlayCount",
SortOrder: "Descending",
IncludeItemTypes: "Audio",
- Limit: screenWidth >= 1920 ? 12 : (screenWidth >= 1440 ? 12 : 10),
+ Limit: screenWidth >= 1920 ? 14 : (screenWidth >= 1440 ? 14 : 10),
Recursive: true,
Fields: "PrimaryImageAspectRatio,AudioInfo",
Filters: "IsPlayed",
diff --git a/dashboard-ui/thirdparty/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/mediabrowser.apiclient.js
index adab495171..d141c27573 100644
--- a/dashboard-ui/thirdparty/mediabrowser.apiclient.js
+++ b/dashboard-ui/thirdparty/mediabrowser.apiclient.js
@@ -2041,16 +2041,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
if (ratio) {
if (options.width) {
- options.width = options.width * ratio;
+
+ options.width = Math.round(options.width * ratio);
}
if (options.height) {
- options.height = options.height * ratio;
+ options.height = Math.round(options.height * ratio);
}
if (options.maxWidth) {
- options.maxWidth = options.maxWidth * ratio;
+ options.maxWidth = Math.round(options.maxWidth * ratio);
}
if (options.maxHeight) {
- options.maxHeight = options.maxHeight * ratio;
+ options.maxHeight = Math.round(options.maxHeight * ratio);
}
}