diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 29084da7ed..60574d7e2e 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -149,46 +149,13 @@ color: #fff; } -/* Firefox and Polyfill */ .itemProgress { - border: solid #222222 1px; - background: #444444 !important; /* !important only needed in polyfill */ - border-radius: 0!important; - height: 14px; - opacity: .7; + vertical-align: top; + font-size: 20px; + color: #6FBD45; + margin-right: 10px; } - /* Chrome */ - .itemProgress::-webkit-progress-bar { - background: #444444; - border-radius: 0!important; - } - - /* - * Background of the progress bar value - */ - - /* Firefox */ - .itemProgress::-moz-progress-bar { - border-radius: 0!important; - background-image: -moz-linear-gradient( center bottom, rgb(43,194,83) 37%, rgb(84,240,84) 69% ); - } - - /* Chrome */ - .itemProgress::-webkit-progress-value { - border-radius: 0!important; - background-image: -webkit-gradient( linear, left bottom, left top, color-stop(0, rgb(43,194,83)), color-stop(1, rgb(84,240,84)) ); - background-image: -webkit-linear-gradient( center bottom, rgb(43,194,83) 37%, rgb(84,240,84) 69% ); - } - - /* Polyfill */ - .itemProgress[aria-valuenow]:before { - border-radius: 0!important; - background-image: -moz-linear-gradient( center bottom, rgb(43,194,83) 37%, rgb(84,240,84) 69% ); - 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; @@ -200,6 +167,12 @@ position: relative; } + + .posterDetailViewItem .itemProgress { + font-size: 14px; + font-weight: bold; + } + .posterDetailViewItem .starRating { width: 15px; height: 13px; @@ -211,7 +184,7 @@ } .posterDetailViewItem p { - margin: .75em 0; + margin: .35em 0; } .posterDetailViewItem .imgUserItemRating { @@ -232,8 +205,9 @@ font-weight: bold; } -.posterDetailViewItem .userDataIcons { - display: none; +.posterDetailViewItem .userDataIcons img { + height: 14px; + width: 14px; } .detailPagePrimaryInfo { @@ -258,8 +232,17 @@ max-height: 140px; } - .posterDetailViewItem .userDataIcons { - display: block; + .posterDetailViewItem .userDataIcons img { + height: 18px; + width: 18px; + } + + .posterDetailViewItem p { + margin: .75em 0; + } + + .posterDetailViewItem .itemProgress { + font-size: 17px; } } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index f79123674a..f103146229 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -130,10 +130,6 @@ html += '

' + LibraryBrowser.getUserDataIconsHtml(item) + '

'; - if (item.PlayedPercentage || (item.UserData && item.UserData.PlaybackPositionTicks)) { - html += '

' + LibraryBrowser.getProgressBarHtml(item) + '

'; - } - html += ''; html += LibraryBrowser.getNewIndicatorHtml(item); @@ -366,27 +362,6 @@ return ''; }, - getProgressBarHtml: function (item) { - - var html = ''; - - var tooltip; - - if (item.PlayedPercentage) { - - tooltip = parseInt(item.PlayedPercentage) + '% watched'; - html += ''; - } - else if (item.UserData && item.UserData.PlaybackPositionTicks && item.RunTimeTicks) { - - tooltip = DashboardPage.getDisplayText(item.UserData.PlaybackPositionTicks) + " / " + DashboardPage.getDisplayText(item.RunTimeTicks); - - html += ''; - } - - return html; - }, - getAveragePrimaryImageAspectRatio: function (items) { var values = []; @@ -568,6 +543,28 @@ var html = ''; + var tooltip; + var pct; + + if (item.PlayedPercentage) { + + tooltip = ''; + pct = item.PlayedPercentage; + } + else if (item.UserData && item.UserData.PlaybackPositionTicks && item.RunTimeTicks) { + + tooltip = DashboardPage.getDisplayText(item.UserData.PlaybackPositionTicks) + " / " + DashboardPage.getDisplayText(item.RunTimeTicks); + + pct = (item.UserData.PlaybackPositionTicks / item.RunTimeTicks) * 100; + } + + if (pct) { + + pct = parseInt(pct); + + html += '' + pct + '%'; + } + var userData = item.UserData || {}; var itemId = item.Id; @@ -980,9 +977,9 @@ }, getGalleryHtml: function (item) { - - var html = ''; - var i, length; + + var html = ''; + var i, length; var imageTags = item.ImageTags || {}; @@ -994,110 +991,110 @@ if (imageTags.Logo) { html += LibraryBrowser.createGalleryImage(item.Id, "Logo", imageTags.Logo); - } - if (imageTags.Thumb) { + } + if (imageTags.Thumb) { - html += LibraryBrowser.createGalleryImage(item.Id, "Thumb", imageTags.Thumb); - } - if (imageTags.Art) { + html += LibraryBrowser.createGalleryImage(item.Id, "Thumb", imageTags.Thumb); + } + if (imageTags.Art) { - html += LibraryBrowser.createGalleryImage(item.Id, "Art", imageTags.Art); + html += LibraryBrowser.createGalleryImage(item.Id, "Art", imageTags.Art); - } - if (imageTags.Menu) { + } + if (imageTags.Menu) { - html += LibraryBrowser.createGalleryImage(item.Id, "Menu", imageTags.Menu); + html += LibraryBrowser.createGalleryImage(item.Id, "Menu", imageTags.Menu); - } - if (imageTags.Disc) { + } + if (imageTags.Disc) { - html += LibraryBrowser.createGalleryImage(item.Id, "Disc", imageTags.Disc); - } - if (imageTags.Box) { + html += LibraryBrowser.createGalleryImage(item.Id, "Disc", imageTags.Disc); + } + if (imageTags.Box) { - html += LibraryBrowser.createGalleryImage(item.Id, "Box", imageTags.Box); - } + html += LibraryBrowser.createGalleryImage(item.Id, "Box", imageTags.Box); + } - if (item.BackdropImageTags) { + if (item.BackdropImageTags) { - for (i = 0, length = item.BackdropImageTags.length; i < length; i++) { - html += LibraryBrowser.createGalleryImage(item.Id, "Backdrop", item.BackdropImageTags[0], i); - } + for (i = 0, length = item.BackdropImageTags.length; i < length; i++) { + html += LibraryBrowser.createGalleryImage(item.Id, "Backdrop", item.BackdropImageTags[0], i); + } - } + } - if (item.ScreenshotImageTags) { + if (item.ScreenshotImageTags) { - for (i = 0, length = item.ScreenshotImageTags.length; i < length; i++) { - html += LibraryBrowser.createGalleryImage(item.Id, "Screenshot", item.ScreenshotImageTags[0], i); - } - } + for (i = 0, length = item.ScreenshotImageTags.length; i < length; i++) { + html += LibraryBrowser.createGalleryImage(item.Id, "Screenshot", item.ScreenshotImageTags[0], i); + } + } - return html; - }, + return html; + }, createGalleryImage: function (itemId, type, tag, index) { - var downloadWidth = 400; - var lightboxWidth = 800; - var html = ''; + var downloadWidth = 400; + var lightboxWidth = 800; + var html = ''; - if (typeof (index) == "undefined") index = 0; + if (typeof (index) == "undefined") index = 0; - html += '
'; - html += ''; - html += ''; - html += '
'; + html += '
'; + html += ''; + html += ''; + html += '
'; - html += '
'; - html += 'Close'; - html += ''; - html += '
'; + html += '
'; + html += 'Close'; + html += ''; + html += '
'; - return html; - }, + return html; + }, - createCastImage: function (cast) { + createCastImage: function (cast) { - var html = ''; + var html = ''; - var role = cast.Role || cast.Type; + var role = cast.Role || cast.Type; - html += ''; - html += '
'; + html += ''; + html += '
'; - if (cast.PrimaryImageTag) { + if (cast.PrimaryImageTag) { - var imgUrl = ApiClient.getPersonImageUrl(cast.Name, { - width: 185, - tag: cast.PrimaryImageTag, - type: "primary" - }); + var imgUrl = ApiClient.getPersonImageUrl(cast.Name, { + width: 185, + tag: cast.PrimaryImageTag, + type: "primary" + }); - html += ''; - } else { - var style = "background-color:" + LibraryBrowser.getMetroColor(cast.Name) + ";"; + html += ''; + } else { + var style = "background-color:" + LibraryBrowser.getMetroColor(cast.Name) + ";"; - html += ''; - } + html += ''; + } - html += '
' + cast.Name + '
'; - html += '
' + role + '
'; + html += '
' + cast.Name + '
'; + html += '
' + role + '
'; - html += '
'; + html += '
'; - return html; - } + return html; + } };