diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs
index be9ef56d2..289196b67 100644
--- a/NzbDrone.Web/Controllers/SeriesController.cs
+++ b/NzbDrone.Web/Controllers/SeriesController.cs
@@ -237,7 +237,7 @@ namespace NzbDrone.Web.Controllers
foreach (var s in seriesInDb)
{
- var episodesTotal = s.Episodes;
+ var episodesTotal = s.Episodes.Where(e => e.AirDate <= DateTime.Today && e.AirDate > new DateTime(1899, 12, 31));
series.Add(new SeriesModel
{
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 159cf426d..e3c66be01 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -633,6 +633,7 @@
+
diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml
index 6fd46c996..e99294695 100644
--- a/NzbDrone.Web/Views/Series/Index.cshtml
+++ b/NzbDrone.Web/Views/Series/Index.cshtml
@@ -13,9 +13,21 @@
function () {
var div = $(this);
var innerdiv = div.find(".progress");
-
var width = Math.round(episodes / totalEpisodes * 100);
innerdiv.css("width", width + "%");
+
+ if (width > 97) {
+ innerdiv.css("-khtml-border-top-right-radius", "7px");
+ innerdiv.css("border-top-right-radius", "7px");
+ innerdiv.css("-moz-border-top-right-radius", "7px");
+ innerdiv.css("-webkit-border-top-right-radius", "7px");
+
+ innerdiv.css("-khtml-border-bottom-right-radius", "7px");
+ innerdiv.css("border-bottom-right-radius", "7px");
+ innerdiv.css("-moz-border-bottom-right-radius", "7px");
+ innerdiv.css("-webkit-border-bottom-right-radius", "7px");
+ }
+
div.find(".progressText").html(episodes + " / " + totalEpisodes);
}
);
@@ -28,11 +40,30 @@
.progressbar
{
border:1px solid grey;
+ -khtml-border-radius:8px;
+ border-radius:8px;
+ -moz-border-radius:8px;
+ -webkit-border-radius:8px;
width:125px;
height:20px;
position:relative;
- color:black;
+ color:black;
}
+
+/* apply curves to the progress bar */
+.progress
+{
+ -khtml-border-top-left-radius:7px;
+ border-top-left-radius:7px;
+ -moz-border-top-left-radius:7px;
+ -webkit-border-top-left-radius:7px;
+
+ -khtml-border-bottom-left-radius:7px;
+ border-bottom-left-radius:7px;
+ -moz-border-bottom-left-radius:7px;
+ -webkit-border-bottom-left-radius:7px;
+}
+
/* color bar */
.progressbar div.progress
{
diff --git a/NzbDrone.Web/Views/Settings/Test.cshtml b/NzbDrone.Web/Views/Settings/Test.cshtml
index e5d1073df..f6834b1a5 100644
--- a/NzbDrone.Web/Views/Settings/Test.cshtml
+++ b/NzbDrone.Web/Views/Settings/Test.cshtml
@@ -8,6 +8,19 @@
var width = Math.round(episodes / totalEpisodes * 100);
innerdiv.css("width", width + "%");
+
+ if (width > 97) {
+ innerdiv.css("-khtml-border-top-right-radius", "7px");
+ innerdiv.css("border-top-right-radius", "7px");
+ innerdiv.css("-moz-border-top-right-radius", "7px");
+ innerdiv.css("-webkit-border-top-right-radius", "7px");
+
+ innerdiv.css("-khtml-border-bottom-right-radius", "7px");
+ innerdiv.css("border-bottom-right-radius", "7px");
+ innerdiv.css("-moz-border-bottom-right-radius", "7px");
+ innerdiv.css("-webkit-border-bottom-right-radius", "7px");
+ }
+
div.find(".progressText").html(episodes + " / " + totalEpisodes);
}
);
@@ -19,7 +32,6 @@
/* progress bar container */
.progressbar
{
- z-index: 1;
border:1px solid grey;
-khtml-border-radius:8px;
border-radius:8px;
@@ -28,12 +40,21 @@
width:125px;
height:20px;
position:relative;
- color:black;
+ color:black;
}
+/* apply curves to the progress bar */
.progress
{
- z-index: 5;
+ -khtml-border-top-left-radius:7px;
+ border-top-left-radius:7px;
+ -moz-border-top-left-radius:7px;
+ -webkit-border-top-left-radius:7px;
+
+ -khtml-border-bottom-left-radius:7px;
+ border-bottom-left-radius:7px;
+ -moz-border-bottom-left-radius:7px;
+ -webkit-border-bottom-left-radius:7px;
}
/* color bar */
@@ -68,5 +89,5 @@
\ No newline at end of file