Merge branch 'markus' into kay.one

NzbDrone.Core/Jobs/DiskScanJob.cs

@@ -34,7 +34,7 @@ public string Name
 
         public int DefaultInterval
         {
-            get { return 60; }
+            get { return 360; }
         }
 
         public virtual void Start(ProgressNotification notification, int targetId, int secondaryTargetId)

NzbDrone.Core/Providers/EpisodeProvider.cs

@@ -170,6 +170,9 @@ public virtual IList<Episode> GetEpisodesByParseResult(EpisodeParseResult parseR
             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);

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
 {

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;

NzbDrone.Web/Views/AddSeries/ExistingSeries.cshtml

@@ -9,6 +9,7 @@
 <style>
     .existingSeries
     {
+        width: 548px;
         border-color: #f2f2f2;
         border-width: 1px;
         border-style: solid;
@@ -16,7 +17,7 @@
         margin: 0px 10px 10px 0px;
         padding-left: 10px;
         padding-right: 10px;
-        display: inline-block;
+        display: block;
     }
     .masterQualitySelector
     {
@@ -28,6 +29,11 @@
     {
         display: block;
     }
+    
+    .existingSeriesContainer
+    {
+        position: relative;
+    }
 </style>
 
 @if (Model.ExistingSeries.Count == 0)
@@ -54,12 +60,12 @@ else
         <span class="seriesPathValue">
             @Html.Label(series.Item1)
         </span>
-        <div>
-            <input class="seriesLookup" type="text" style="width: 400px" value="@series.Item2" />
+        <div class="existingSeriesContainer">
+            <input class="seriesLookup" type="text" style="width: 400px;" value="@series.Item2" />
             @Html.Hidden("seriesId", series.Item3, new { @class = "seriesId" })
             @Html.DropDownList(Guid.NewGuid().ToString(), Model.Quality, new { @class = "qualitySelector" })
 
-            <button>Add</button>
+            <button class="addExistingButton">Add</button>
         </div>
     </div>
 }

NzbDrone.Web/Views/AddSeries/RootDir.cshtml

@@ -1,13 +1,4 @@
 <style>
-    #saveDir
-    {
-        padding-bottom: 1px;
-    }
-    
-    #saveDir span
-    {
-        margin-top: -2px;
-    }
 </style>
 
 <span>