diff --git a/NzbDrone.Core/Jobs/DiskScanJob.cs b/NzbDrone.Core/Jobs/DiskScanJob.cs index fb1333ea5..b82accc84 100644 --- a/NzbDrone.Core/Jobs/DiskScanJob.cs +++ b/NzbDrone.Core/Jobs/DiskScanJob.cs @@ -34,7 +34,7 @@ namespace NzbDrone.Core.Jobs public int DefaultInterval { - get { return 60; } + get { return 360; } } public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId) diff --git a/NzbDrone.Core/Providers/EpisodeProvider.cs b/NzbDrone.Core/Providers/EpisodeProvider.cs index e99437667..923cf9695 100644 --- a/NzbDrone.Core/Providers/EpisodeProvider.cs +++ b/NzbDrone.Core/Providers/EpisodeProvider.cs @@ -170,6 +170,9 @@ namespace NzbDrone.Core.Providers if (parseResult.EpisodeNumbers == null) return result; + //Set it to empty before looping through the episode numbers + parseResult.EpisodeTitle = String.Empty; + foreach (var episodeNumber in parseResult.EpisodeNumbers) { var episodeInfo = GetEpisode(parseResult.Series.SeriesId, parseResult.SeasonNumber, episodeNumber); diff --git a/NzbDrone.Web/Content/NzbDrone.css b/NzbDrone.Web/Content/NzbDrone.css index e1b6da29a..34ec4e397 100644 --- a/NzbDrone.Web/Content/NzbDrone.css +++ b/NzbDrone.Web/Content/NzbDrone.css @@ -75,15 +75,15 @@ hr { display: block; float: left; - height: 28px; + height: 26px; padding: 5px 20px 8px 15px; text-decoration: none; text-align: center; text-transform: lowercase; - font-size: 23px; - font-weight: 300; + font-size: 21px; + font-weight: normal; vertical-align: middle; - font-family: "Segoe UI Light" , "Segoe UI" , Tahoma, Geneva, sans-serif; + font-family: "Segoe UI", "Segoe UI Light" , Tahoma, Geneva, sans-serif; } #menu a:hover @@ -180,18 +180,30 @@ input[type=text], select height: 20px; } -select, button, input[type="button"], input[type="submit"], input[type="reset"] +select { height: 26px; min-width: 50px; margin-left: 10px; } -/*This allows us to override center the text on the jQuery UI Buttons when we set the height above*/ +button, input[type="button"], input[type="submit"], input[type="reset"] +{ + margin-left: 10px; +} + +/*select, button, input[type="button"], input[type="submit"], input[type="reset"] +{ + height: 26px; + min-width: 50px; + margin-left: 10px; +} + +/*This allows us to override center the text on the jQuery UI Buttons when we set the height above* button span, input[type="button"] span, input[type="submit"] span, input[type="reset"] span { margin-top: -3px; -} +}*/ .listButton { diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css index c6cd1d799..aca633220 100644 --- a/NzbDrone.Web/Content/Settings.css +++ b/NzbDrone.Web/Content/Settings.css @@ -54,7 +54,7 @@ p, h1, form, button #stylized .inputClass { float: left; - padding: 4px 2px; + padding: 2px 2px; border: solid 1px #aacfe4; width: 200px; margin: 2px 0 20px 10px; diff --git a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml b/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml index e23039595..bea0ec078 100644 --- a/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml +++ b/NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml @@ -9,6 +9,7 @@ @if (Model.ExistingSeries.Count == 0) @@ -54,12 +60,12 @@ else @Html.Label(series.Item1) -
- +
+ @Html.Hidden("seriesId", series.Item3, new { @class = "seriesId" }) @Html.DropDownList(Guid.NewGuid().ToString(), Model.Quality, new { @class = "qualitySelector" }) - +
} diff --git a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml b/NzbDrone.Web/Views/AddSeries/RootDir.cshtml index 18fad1f0e..2bacaf919 100644 --- a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml +++ b/NzbDrone.Web/Views/AddSeries/RootDir.cshtml @@ -1,13 +1,4 @@