diff --git a/dashboard-ui/boxset.html b/dashboard-ui/boxset.html index f7280ecbb..0ffc3dacd 100644 --- a/dashboard-ui/boxset.html +++ b/dashboard-ui/boxset.html @@ -34,7 +34,7 @@
- + diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index db8540ea9..b599e724a 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -20,7 +20,6 @@ } .libraryPage, .itemListContent { - background: #262626!important; background: #494949 url(images/bgflip.png) repeat-x!important; background-attachment: fixed!important; } @@ -29,6 +28,10 @@ color: #fff; } +.listPage { + background: #262626!important; +} + .listHeader { margin-top: 1em; margin-bottom: 5px; @@ -106,7 +109,7 @@ @media all and (min-width: 650px) { .libraryPage .ui-content { - padding: 15px 30px 100px; + padding: 10px 15px 100px; } } @@ -158,6 +161,11 @@ padding: 0 10px; } +.itemMiscInfo { + color: #ddd; + font-size: 14px; +} + .mediaInfoStream { display: inline-block; vertical-align: top; @@ -189,6 +197,7 @@ background-color: #008FBB; padding: 3px 10px; border-bottom-left-radius: 10px; + color: #fff; } /* Firefox and Polyfill */ @@ -196,13 +205,8 @@ border: solid #222222 1px; background: #444444 !important; /* !important only needed in polyfill */ border-radius: 0!important; - height: 12px; + height: 14px; opacity: .7; - position: absolute; - left: 10%; - right: 10%; - bottom: 61px; - width: 80%; } /* Chrome */ @@ -235,3 +239,91 @@ background-image: -ms-linear-gradient( center bottom, rgb(43,194,83) 37%, rgb(84,240,84) 69% ); background-image: -o-linear-gradient( center bottom, rgb(43,194,83) 37%, rgb(84,240,84) 69% ); } + +.posterDetailViewItem { + background: #333; + padding: 10px 10px 3px; + margin: 3px 0; + text-shadow: none; + cursor: pointer; + font-weight: normal!important; + display: block; + font-size: 14px; + position: relative; +} + + .posterDetailViewItem .starRating { + width: 15px; + height: 13px; + } + +.posterDetailViewImage { + max-height: 90px; + max-width: 47%; +} + +.posterDetailViewItem p { + margin: .75em 0; +} + +.posterDetailViewItem .imgUserItemRating { + height: 18px; + width: 18px; +} + +.posterDetailViewContentContainer { + display: inline-block; + width: 50%; + padding-left: 10px; + color: #fff; + text-align: left; + vertical-align: top; +} + +.posterDetailViewName { + font-weight: bold; +} + +.posterDetailViewItem .userDataIcons { + display: none; +} + +@media all and (min-width: 850px) { + .posterDetailViewItem { + width: 46%; + display: inline-block; + margin-left: 3px; + margin-right: 3px; + } + + .posterDetailViewImage { + max-height: 140px; + } +} + +@media all and (min-width: 1200px) { + .posterDetailViewItem { + width: 31%; + } + + .posterDetailViewItem .userDataIcons { + display: block; + } +} + +@media all and (min-width: 1440px) { + .posterDetailViewImage { + max-height: 170px; + } +} + + +@media all and (min-width: 1920px) { + .posterDetailViewItem { + width: 31.5%; + } + + .posterDetailViewImage { + max-height: 200px; + } +} diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 8d28c42a8..a97ba7b27 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -472,7 +472,7 @@ form, .readOnlyContent { bottom: 28px; } -.posterViewItem:hover, .userItem:hover { +.posterViewItem:hover, .userItem:hover, .posterDetailViewItem:hover { -moz-box-shadow: 0 0 20px 3px #2572EB; -webkit-box-shadow: 0 0 20px 3px #2572EB; box-shadow: 0 0 20px 3px #2572EB; diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 788c08292..e1af6b459 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -15,7 +15,7 @@
Movies
";
+ }
+ else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
+
+ html += "
";
+ }
+ else {
+
+ html += "
";
+ }
+
+ html += '' + LibraryBrowser.getFiveStarRatingHtml(item) + '
'; + } + + html += '' + LibraryBrowser.getMiscInfoHtml(item, false) + '
'; + + html += '' + LibraryBrowser.getUserDataIconsHtml(item) + '
'; + + if (item.PlayedPercentage || (item.UserData && item.UserData.PlaybackPositionTicks)) { + html += '' + LibraryBrowser.getProgressBarHtml(item) + '
'; + } + + html += '
";
- }
- else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
-
- html += "
";
- }
- else {
-
- html += "
";
- }
-
- if (showText) {
- html += "
';
+ html += '
';
} else {
- html += '
';
+ html += '
';
}
}
if (typeof userData.Likes == "undefined") {
- html += '
';
+ html += '
';
} else {
- html += '
';
+ html += '
';
}
return html;
@@ -720,7 +786,7 @@
return html;
},
- getMiscInfoHtml: function (item) {
+ getMiscInfoHtml: function (item, includeMediaInfo) {
var miscInfo = [];
@@ -741,13 +807,16 @@
miscInfo.push(parseInt(minutes) + "min");
}
- if (item.DisplayMediaType) {
- miscInfo.push(item.DisplayMediaType);
+ if (includeMediaInfo !== false) {
+ if (item.DisplayMediaType) {
+ miscInfo.push(item.DisplayMediaType);
+ }
+
+ if (item.VideoFormat && item.VideoFormat !== 'Standard') {
+ miscInfo.push(item.VideoFormat);
+ }
}
- if (item.VideoFormat && item.VideoFormat !== 'Standard') {
- miscInfo.push(item.VideoFormat);
- }
return miscInfo.join(' ');
},
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 6aa6b44bd..c3dec5fe7 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -1,6 +1,6 @@
(function ($, document) {
- var view = "Poster";
+ var view = "Tile";
// The base query options
var query = {
@@ -118,7 +118,7 @@
function reloadItems(page) {
Dashboard.showLoadingMsg();
-
+
ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
var html = '';
@@ -129,7 +129,14 @@
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
}
- if (view == "Poster") {
+ if (view == "Tile") {
+ html += LibraryBrowser.getPosterDetailViewHtml({
+ items: result.Items,
+ useAverageAspectRatio: true,
+ preferBackdrop: true
+ });
+ }
+ else if (view == "Poster") {
html += LibraryBrowser.getPosterViewHtml({
items: result.Items,
useAverageAspectRatio: true
@@ -150,7 +157,7 @@
elem.html(html).trigger('create');
- $('select', elem).on('change', function() {
+ $('select', elem).on('change', function () {
query.StartIndex = (parseInt(this.value) - 1) * query.Limit;
reloadItems(page);
});
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 7fa337de8..fb596ff90 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -1,5 +1,7 @@
(function ($, document) {
+ var view = "Tile";
+
// The base query options
var query = {
@@ -7,91 +9,57 @@
SortOrder: "Ascending",
IncludeItemTypes: "Series",
Recursive: true,
- Fields: "PrimaryImageAspectRatio,SeriesInfo,ItemCounts,DateCreated"
+ Fields: "PrimaryImageAspectRatio,SeriesInfo,ItemCounts,DateCreated",
+ Limit: LibraryBrowser.getDetaultPageSize(),
+ StartIndex: 0
};
- function getTableHtml(items) {
-
- var html = '| '; - html += ' | Name | '; - html += 'Year | '; - html += 'Official Rating | '; - html += 'Runtime | '; - html += 'Community Rating | '; - html += '
|---|
';
- }
-
- html += '