diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 905a7aa363..24568f953b 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -765,6 +765,7 @@ progress { right: 0; left: 0; width: 100%; + height: 100%; border: 0; z-index: 99996; } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 5010d5a517..4bd3031834 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -152,14 +152,7 @@ html += '
' + seriesName + '
'; } - var name = item.Name; - - if (item.IndexNumber != null) { - name = item.IndexNumber + " - " + name; - } - if (item.ParentIndexNumber != null) { - name = item.ParentIndexNumber + "." + name; - } + var name = LibraryBrowser.getPosterViewDisplayName(item); html += '
' + name + '
'; @@ -531,14 +524,7 @@ html += '
'; - var name = item.Name; - - if (item.IndexNumber != null) { - name = item.IndexNumber + " - " + name; - } - if (item.ParentIndexNumber != null) { - name = item.ParentIndexNumber + "." + name; - } + var name = LibraryBrowser.getPosterViewDisplayName(item); if (!imgUrl && !options.showTitle) { html += "
"; @@ -579,6 +565,36 @@ return html; }, + + getPosterViewDisplayName: function(item) { + + var name = item.Name; + + if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { + + var displayIndexNumber = item.IndexNumber < 10 ? "0" + item.IndexNumber : item.IndexNumber; + + var number = item.ParentIndexNumber + "x" + displayIndexNumber; + + if (item.IndexNumberEnd) { + + displayIndexNumber = item.IndexNumberEnd < 10 ? "0" + item.IndexNumberEnd : item.IndexNumberEnd; + number += "-x" + displayIndexNumber; + } + + name = number + " - " + name; + + } else { + if (item.IndexNumber != null && item.Type !== "Season") { + name = item.IndexNumber + " - " + name; + } + if (item.ParentIndexNumber != null && item.Type != "Episode") { + name = item.ParentIndexNumber + "." + name; + } + } + + return name; + }, getNewIndicatorHtml: function (item) { @@ -660,24 +676,7 @@ renderName: function (item, nameElem, linkToElement) { - var name = item.Name; - - if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { - - var displayIndexNumber = item.IndexNumber < 10 ? "0" + item.IndexNumber : item.IndexNumber; - - name = item.ParentIndexNumber + "x" + displayIndexNumber + " - " + name; - - } else { - if (item.IndexNumber != null && item.Type !== "Season") { - name = item.IndexNumber + " - " + name; - } - if (item.ParentIndexNumber != null && item.Type != "Episode") { - name = item.ParentIndexNumber + "." + name; - } - } - - Dashboard.setPageTitle(name); + Dashboard.setPageTitle(LibraryBrowser.getPosterViewDisplayName(item)); if (linkToElement) { nameElem.html('' + name + '').trigger('create');