From c6ef82842956fba5867b97d6fec6420252c60808 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 19 Apr 2011 16:46:21 -0700
Subject: [PATCH 1/3] New UI for Indexer Settings, RAZOR!

Renamed NzbMatrix and NzbsRUs Providers
---
 NzbDrone.Core/CentralDispatch.cs              |   3 +
 NzbDrone.Core/NzbDrone.Core.csproj            |   5 +-
 .../Providers/Core/ConfigProvider.cs          |  15 +-
 .../Providers/Indexer/NewzbinProvider.cs      |  36 +++
 ...ixFeedProvider.cs => NzbMatrixProvider.cs} |   4 +-
 ...sRUsFeedProvider.cs => NzbsRUsProvider.cs} |   4 +-
 NzbDrone.Core/Providers/IndexerProvider.cs    |   2 -
 .../Controllers/SettingsController.cs         |  43 ++--
 NzbDrone.Web/Models/IndexerSettingsModel.cs   |  34 ++-
 NzbDrone.Web/NzbDrone.Web.csproj              |  11 +-
 NzbDrone.Web/Views/Settings/Indexers.ascx     | 135 ------------
 NzbDrone.Web/Views/Settings/Indexers.cshtml   | 206 ++++++++++++++++++
 12 files changed, 324 insertions(+), 174 deletions(-)
 create mode 100644 NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs
 rename NzbDrone.Core/Providers/Indexer/{NzbMatrixFeedProvider.cs => NzbMatrixProvider.cs} (77%)
 rename NzbDrone.Core/Providers/Indexer/{NzbsRUsFeedProvider.cs => NzbsRUsProvider.cs} (76%)
 delete mode 100644 NzbDrone.Web/Views/Settings/Indexers.ascx
 create mode 100644 NzbDrone.Web/Views/Settings/Indexers.cshtml

diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs
index a8e78471f..404932d16 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -140,6 +140,9 @@ public static void BindKernel()
         private static void BindIndexers()
         {
             _kernel.Bind<IndexerProviderBase>().To<NzbsOrgProvider>().InSingletonScope();
+            _kernel.Bind<IndexerProviderBase>().To<NzbMatrixProvider>().InSingletonScope();
+            _kernel.Bind<IndexerProviderBase>().To<NzbsRUsProvider>().InSingletonScope();
+            _kernel.Bind<IndexerProviderBase>().To<NewzbinProvider>().InSingletonScope();
             var indexers = _kernel.GetAll<IndexerProviderBase>();
             _kernel.Get<IndexerProvider>().InitializeIndexers(indexers.ToList());
         }
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 7290c3408..b6455d6f3 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -169,8 +169,9 @@
     <Compile Include="Instrumentation\SubsonicTarget.cs" />
     <Compile Include="Instrumentation\ExceptioneerTarget.cs" />
     <Compile Include="Instrumentation\NlogWriter.cs" />
-    <Compile Include="Providers\Indexer\NzbMatrixFeedProvider.cs" />
-    <Compile Include="Providers\Indexer\NzbsRUsFeedProvider.cs" />
+    <Compile Include="Providers\Indexer\NzbMatrixProvider.cs" />
+    <Compile Include="Providers\Indexer\NewzbinProvider.cs" />
+    <Compile Include="Providers\Indexer\NzbsRUsProvider.cs" />
     <Compile Include="Repository\IndexerSetting.cs" />
     <Compile Include="Model\EpisodeParseResult.cs" />
     <Compile Include="Model\EpisodeRenameModel.cs" />
diff --git a/NzbDrone.Core/Providers/Core/ConfigProvider.cs b/NzbDrone.Core/Providers/Core/ConfigProvider.cs
index 6fdf61bde..be928d4aa 100644
--- a/NzbDrone.Core/Providers/Core/ConfigProvider.cs
+++ b/NzbDrone.Core/Providers/Core/ConfigProvider.cs
@@ -26,7 +26,6 @@ public virtual String ApiKey
             set { SetValue("ApiKey", value); }
         }
 
-
         public virtual String EpisodeNameFormat
         {
             get { return GetValue("EpisodeNameFormat"); }
@@ -83,6 +82,20 @@ public virtual String NzbsrusHash
             set { SetValue("NzbsrusHash", value); }
         }
 
+        public virtual String NewzbinUsername
+        {
+            get { return GetValue("NewzbinUsername"); }
+
+            set { SetValue("NewzbinUsername", value); }
+        }
+
+        public virtual String NewzbinPassword
+        {
+            get { return GetValue("NewzbinPassword"); }
+
+            set { SetValue("NewzbinPassword", value); }
+        }
+
         public virtual String SyncFrequency
         {
             get { return GetValue("SyncFrequency"); }
diff --git a/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs b/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs
new file mode 100644
index 000000000..87c71cdd6
--- /dev/null
+++ b/NzbDrone.Core/Providers/Indexer/NewzbinProvider.cs
@@ -0,0 +1,36 @@
+using System.ServiceModel.Syndication;
+using NzbDrone.Core.Providers.Core;
+using SubSonic.Repository;
+
+namespace NzbDrone.Core.Providers.Indexer
+{
+    public class NewzbinProvider : IndexerProviderBase
+    {
+        public NewzbinProvider(SeriesProvider seriesProvider, SeasonProvider seasonProvider, EpisodeProvider episodeProvider, ConfigProvider configProvider, HttpProvider httpProvider, IRepository repository, IndexerProvider indexerProvider)
+            : base(seriesProvider, seasonProvider, episodeProvider, configProvider, httpProvider, repository, indexerProvider)
+        {
+        }
+
+        protected override string[] Url
+        {
+            get
+            {
+                return new[]
+                                   {
+                                       string.Format("http://www.newzbin.com", _configProvider.NewzbinUsername, _configProvider.NewzbinPassword)
+                                   };
+            }
+        }
+
+        public override string Name
+        {
+            get { return "Newzbin"; }
+        }
+
+
+        protected override string NzbDownloadUrl(SyndicationItem item)
+        {
+            return item.Id;
+        }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Providers/Indexer/NzbMatrixFeedProvider.cs b/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs
similarity index 77%
rename from NzbDrone.Core/Providers/Indexer/NzbMatrixFeedProvider.cs
rename to NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs
index 54a9cde94..09d6e9050 100644
--- a/NzbDrone.Core/Providers/Indexer/NzbMatrixFeedProvider.cs
+++ b/NzbDrone.Core/Providers/Indexer/NzbMatrixProvider.cs
@@ -4,9 +4,9 @@
 
 namespace NzbDrone.Core.Providers.Indexer
 {
-    internal class NzbMatrixFeedProvider : IndexerProviderBase
+    public class NzbMatrixProvider : IndexerProviderBase
     {
-        public NzbMatrixFeedProvider(SeriesProvider seriesProvider, SeasonProvider seasonProvider, EpisodeProvider episodeProvider, ConfigProvider configProvider, HttpProvider httpProvider, IRepository repository, IndexerProvider indexerProvider)
+        public NzbMatrixProvider(SeriesProvider seriesProvider, SeasonProvider seasonProvider, EpisodeProvider episodeProvider, ConfigProvider configProvider, HttpProvider httpProvider, IRepository repository, IndexerProvider indexerProvider)
             : base(seriesProvider, seasonProvider, episodeProvider, configProvider, httpProvider, repository, indexerProvider)
         {
         }
diff --git a/NzbDrone.Core/Providers/Indexer/NzbsRUsFeedProvider.cs b/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs
similarity index 76%
rename from NzbDrone.Core/Providers/Indexer/NzbsRUsFeedProvider.cs
rename to NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs
index c04388ac1..d75721147 100644
--- a/NzbDrone.Core/Providers/Indexer/NzbsRUsFeedProvider.cs
+++ b/NzbDrone.Core/Providers/Indexer/NzbsRUsProvider.cs
@@ -4,9 +4,9 @@
 
 namespace NzbDrone.Core.Providers.Indexer
 {
-    internal class NzbsRUsFeedProvider : IndexerProviderBase
+    public class NzbsRUsProvider : IndexerProviderBase
     {
-        public NzbsRUsFeedProvider(SeriesProvider seriesProvider, SeasonProvider seasonProvider, EpisodeProvider episodeProvider, ConfigProvider configProvider, HttpProvider httpProvider, IRepository repository, IndexerProvider indexerProvider)
+        public NzbsRUsProvider(SeriesProvider seriesProvider, SeasonProvider seasonProvider, EpisodeProvider episodeProvider, ConfigProvider configProvider, HttpProvider httpProvider, IRepository repository, IndexerProvider indexerProvider)
             : base(seriesProvider, seasonProvider, episodeProvider, configProvider, httpProvider, repository, indexerProvider)
         {
         }
diff --git a/NzbDrone.Core/Providers/IndexerProvider.cs b/NzbDrone.Core/Providers/IndexerProvider.cs
index 6359e7dcc..cc6be013c 100644
--- a/NzbDrone.Core/Providers/IndexerProvider.cs
+++ b/NzbDrone.Core/Providers/IndexerProvider.cs
@@ -75,7 +75,5 @@ public virtual void InitializeIndexers(IList<IndexerProviderBase> indexers)
                 }
             }
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 34ba16973..15c4a13a4 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -58,6 +58,7 @@ public ActionResult General()
         public ActionResult Indexers()
         {
             ViewData["viewName"] = "Indexers";
+
             return View("Index", new IndexerSettingsModel
                                      {
                                          NzbMatrixUsername =
@@ -71,8 +72,13 @@ public ActionResult Indexers()
                                          NzbsOrgHash = _configProvider.NzbsrusHash,
                                          NzbsOrgUId = _configProvider.NzbsrusUId,
 
-                                         Indexers = _indexerProvider.AllIndexers()
+                                         NewzbinUsername = _configProvider.NewzbinUsername,
+                                         NewzbinPassword = _configProvider.NewzbinPassword,
 
+                                         NzbsOrgEnabled = _indexerProvider.GetSettings(typeof(NzbsOrgProvider)).Enable,
+                                         NzbMatrixEnabled = _indexerProvider.GetSettings(typeof(NzbMatrixProvider)).Enable,
+                                         NzbsRUsEnabled = _indexerProvider.GetSettings(typeof(NzbsRUsProvider)).Enable,
+                                         NewzbinEnabled = _indexerProvider.GetSettings(typeof(NewzbinProvider)).Enable
                                      });
         }
 
@@ -268,22 +274,33 @@ public ActionResult SaveIndexers(IndexerSettingsModel data)
         {
             if (ModelState.IsValid)
             {
-                foreach (var indexer in data.Indexers)
-                {
-                    var setting =_indexerProvider.GetSettings(indexer.Id);
-                    setting.Enable = indexer.Enable;
-                    _indexerProvider.SaveSettings(setting);
-                }
-
-                _configProvider.NzbMatrixUsername = data.NzbMatrixUsername;
-                _configProvider.NzbMatrixApiKey = data.NzbMatrixApiKey;
-                _configProvider.NzbsrusUId = data.NzbsrusUId;
-                _configProvider.NzbsrusHash = data.NzbsrusHash;
-
                 var nzbsOrgSettings = _indexerProvider.GetSettings(typeof(NzbsOrgProvider));
+                nzbsOrgSettings.Enable = data.NzbsOrgEnabled;
+                _indexerProvider.SaveSettings(nzbsOrgSettings);
+
+                var nzbMatrixSettings = _indexerProvider.GetSettings(typeof(NzbMatrixProvider));
+                nzbMatrixSettings.Enable = data.NzbMatrixEnabled;
+                _indexerProvider.SaveSettings(nzbMatrixSettings);
+
+                var nzbsRUsSettings = _indexerProvider.GetSettings(typeof(NzbsRUsProvider));
+                nzbsRUsSettings.Enable = data.NzbsRUsEnabled;
+                _indexerProvider.SaveSettings(nzbsRUsSettings);
+
+                var newzbinSettings = _indexerProvider.GetSettings(typeof(NewzbinProvider));
+                newzbinSettings.Enable = data.NewzbinEnabled;
+                _indexerProvider.SaveSettings(newzbinSettings);
+
                 _configProvider.NzbsrusHash = data.NzbsOrgHash;
                 _configProvider.NzbsOrgUId = data.NzbsOrgUId;
 
+                _configProvider.NzbMatrixUsername = data.NzbMatrixUsername;
+                _configProvider.NzbMatrixApiKey = data.NzbMatrixApiKey;
+
+                _configProvider.NzbsrusUId = data.NzbsrusUId;
+                _configProvider.NzbsOrgUId = data.NzbsrusHash;
+
+                _configProvider.NewzbinUsername = data.NewzbinUsername;
+                _configProvider.NewzbinPassword = data.NewzbinPassword;
 
                 return Content(SETTINGS_SAVED);
             }
diff --git a/NzbDrone.Web/Models/IndexerSettingsModel.cs b/NzbDrone.Web/Models/IndexerSettingsModel.cs
index 54e434c67..4d5b70082 100644
--- a/NzbDrone.Web/Models/IndexerSettingsModel.cs
+++ b/NzbDrone.Web/Models/IndexerSettingsModel.cs
@@ -9,35 +9,55 @@ namespace NzbDrone.Web.Models
     public class IndexerSettingsModel
     {
         [DataType(DataType.Text)]
-        [DisplayName("NZBMatrix Username")]
+        [DisplayName("Username")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbMatrixUsername { get; set; }
 
         [DataType(DataType.Text)]
-        [DisplayName("NZBMatrix API Key")]
+        [DisplayName("API Key")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbMatrixApiKey { get; set; }
 
         [DataType(DataType.Text)]
-        [DisplayName("NZBs.Org UID")]
+        [DisplayName("UID")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbsOrgUId { get; set; }
 
         [DataType(DataType.Text)]
-        [DisplayName("NZBs.Org Hash")]
+        [DisplayName("Hash")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbsOrgHash { get; set; }
 
         [DataType(DataType.Text)]
-        [DisplayName("NZBsRus UID")]
+        [DisplayName("UID")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbsrusUId { get; set; }
 
         [DataType(DataType.Text)]
-        [DisplayName("NZBsRus Hash")]
+        [DisplayName("Hash")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public String NzbsrusHash { get; set; }
 
-        public List<IndexerSetting> Indexers { get; set; }
+        [DataType(DataType.Text)]
+        [DisplayName("Username")]
+        [DisplayFormat(ConvertEmptyStringToNull = false)]
+        public String NewzbinUsername { get; set; }
+
+        [DataType(DataType.Text)]
+        [DisplayName("Password")]
+        [DisplayFormat(ConvertEmptyStringToNull = false)]
+        public String NewzbinPassword { get; set; }
+
+        [DisplayName("NZBs.org")]
+        public bool NzbsOrgEnabled { get; set; }
+
+        [DisplayName("NZB Matrix")]
+        public bool NzbMatrixEnabled { get; set; }
+
+        [DisplayName("NZBsRUs")]
+        public bool NzbsRUsEnabled { get; set; }
+
+        [DisplayName("Newzbin")]
+        public bool NewzbinEnabled { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 192136459..cb8eb1d32 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -628,7 +628,6 @@
     <Content Include="Views\Settings\EpisodeSorting.ascx" />
     <Content Include="Views\Settings\General.ascx" />
     <Content Include="Views\Settings\Index.aspx" />
-    <Content Include="Views\Settings\Indexers.ascx" />
     <Content Include="Views\Settings\Quality.ascx" />
     <Content Include="Views\Settings\SubMenu.ascx" />
     <Content Include="Views\Settings\UserProfileSection.ascx" />
@@ -661,6 +660,7 @@
     <Content Include="Scripts\jquery.validate.unobtrusive.js" />
     <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
     <Content Include="Views\Web.config" />
+    <Content Include="Views\Settings\Indexers.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
@@ -812,15 +812,6 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>21704</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost/NzbDrone</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>http://localhost:8989</CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <SaveServerSettingsInUserFile>True</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/NzbDrone.Web/Views/Settings/Indexers.ascx b/NzbDrone.Web/Views/Settings/Indexers.ascx
deleted file mode 100644
index 0cc8469d3..000000000
--- a/NzbDrone.Web/Views/Settings/Indexers.ascx
+++ /dev/null
@@ -1,135 +0,0 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<NzbDrone.Web.Models.IndexerSettingsModel>" %>
-<script type="text/javascript">
-    $(document).ready(function () {
-        var options = {
-            target: '#result',
-            beforeSubmit: showRequest,
-            success: showResponse,
-            type: 'post',
-            resetForm: false
-        };
-        $('#form').ajaxForm(options);
-        $('#save_button').attr('disabled', '');
-    });
-
-    function showRequest(formData, jqForm, options) {
-        $("#result").empty().html('Saving...');
-        $("#form :input").attr("disabled", true);
-    }
-
-    function showResponse(responseText, statusText, xhr, $form) {
-        $("#result").empty().html(responseText);
-        $("#form :input").attr("disabled", false);
-    }
-    
-
-</script>
-<style type="text/css">
-    #sortable
-    {
-        list-style-type: none;
-        margin: 0;
-        padding: 0;
-        width: 30%;
-    }
-    #sortable li
-    {
-        margin: 0 5px 5px 5px;
-        padding: 5px;
-        font-size: 1.2em;
-        height: 1.5em;
-    }
-    #sortable li
-    {
-        height: 1.5em;
-        line-height: 1.2em;
-    }
-    .ui-state-highlight
-    {
-        height: 1.5em;
-        line-height: 1.2em;
-    }
-</style>
-<script type="text/javascript">
-    $(function () {
-        $("#sortable").sortable({
-            placeholder: "ui-state-highlight"
-        });
-        $("#sortable").disableSelection();
-    });
-</script>
-<%
-    using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
-    {%>
-<%:Html.ValidationSummary(true,
-                                                 "Unable to save your settings. Please correct the errors and try again.")%>
-<fieldset>
-    <legend>Indexers</legend>
-    <ul id="sortable">
-        <%
-        for (int i = 0; i < Model.Indexers.Count(); i++)
-        {%>
-        <li class="ui-state-default" id="<%=Model.Indexers[i].Id%>">
-            <%=Html.CheckBoxFor(c => c.Indexers[i].Enable)%><%=Html.DisplayTextFor(c => c.Indexers[i].Name)%></li>
-        <%
-        }%>
-    </ul>
-    <%
-        for (int i = 0; i < Model.Indexers.Count(); i++)
-        {%>
-    <%
-        }%>
-    <%--NZBMatrix--%>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbMatrixUsername)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbMatrixUsername)%>
-        <%=Html.ValidationMessageFor(m => m.NzbMatrixUsername)%>
-    </div>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbMatrixApiKey)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbMatrixApiKey)%>
-        <%=Html.ValidationMessageFor(m => m.NzbMatrixApiKey)%>
-    </div>
-    <br />
-    <%--NZBs.Org--%>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbsOrgUId)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbsOrgUId)%>
-        <%=Html.ValidationMessageFor(m => m.NzbsOrgUId)%>
-    </div>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbsOrgHash)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbsOrgHash)%>
-        <%=Html.ValidationMessageFor(m => m.NzbsOrgHash)%>
-    </div>
-    <br />
-    <%--NZBsrus--%>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbsrusUId)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbsrusUId)%>
-        <%=Html.ValidationMessageFor(m => m.NzbsrusUId)%>
-    </div>
-    <div class="editor-label">
-        <%=Html.LabelFor(m => m.NzbsrusHash)%>
-    </div>
-    <div class="editor-field">
-        <%=Html.TextBoxFor(m => m.NzbsrusHash)%>
-        <%=Html.ValidationMessageFor(m => m.NzbsrusHash)%>
-    </div>
-    <br />
-    <input type="submit" id="save_button" value="Save" disabled="disabled" />
-</fieldset>
-<%
-    }%>
-<div id="result">
-</div>
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
new file mode 100644
index 000000000..f13443057
--- /dev/null
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -0,0 +1,206 @@
+@model NzbDrone.Web.Models.IndexerSettingsModel
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        var options = {
+            target: '#result',
+            beforeSubmit: showRequest,
+            success: showResponse,
+            type: 'post',
+            resetForm: false
+        };
+        $('#form').ajaxForm(options);
+        $('#save_button').attr('disabled', '');
+    });
+    
+    function showRequest(formData, jqForm, options) {
+        $("#result").empty().html('Saving...');
+        $("#form :input").attr("disabled", true);
+    }
+
+    function showResponse(responseText, statusText, xhr, $form) {
+        $("#result").empty().html(responseText);
+        $("#form :input").attr("disabled", false);
+    }
+</script>
+
+<style>
+    .section_content
+    {
+        padding-left: 15px;
+    }
+    
+    .indexer_group
+    {
+        width: 220px;
+    }
+    
+    .indexer_left
+    {
+        display: inline;
+    }
+    
+    .indexer_right
+    {
+        display:inline;
+        float: right;
+    }
+    
+    .indexer_checkbox
+    {
+        margin-right: 135px;
+    }
+</style>
+
+@using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "form", name = "form" })) {
+    @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
+
+        <fieldset>
+            <legend>Indexers</legend>
+            <div>
+                    @{ Html.Telerik().PanelBar()
+                    .Name("PanelBar")
+                    .HtmlAttributes(new { style = "width: 300px; float: left; margin-bottom: 30px;" })
+                    .ExpandMode(PanelBarExpandMode.Single)
+                    .SelectedIndex(0)
+                    .Items(item =>
+                    {
+                        item.Add()
+                            .Text("NZBs.org")
+                            .Content(
+                                "<div class=\"section_content\">" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            "Enabled" +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.CheckBoxFor(m => m.NzbsOrgEnabled, new { @class = "indexer_checkbox" }) +
+                                        "</div>" +
+                                    "</div>" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbsOrgUId) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbsOrgUId) +
+                                        "</div>" +
+                                    "</div>" +
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbsOrgHash) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbsOrgHash) +
+                                        "</div>" +
+                                    "</div>" +
+                                "</div>"
+                            );
+                        item.Add()
+                            .Text("NZB Matrix")
+                            .Content(
+                                "<div class=\"section_content\">" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            "Enabled" +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.CheckBoxFor(m => m.NzbMatrixEnabled, new { @class = "indexer_checkbox" }) +
+                                        "</div>" +
+                                    "</div>" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbMatrixUsername) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbMatrixUsername) +
+                                        "</div>" +
+                                    "</div>" +
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbMatrixApiKey) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbMatrixApiKey) +
+                                        "</div>" +
+                                    "</div>" +
+                                "</div>"
+                            );
+                        item.Add()
+                            .Text("NZBsRUs")
+                            .Content(
+                                "<div class=\"section_content\">" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            "Enabled" +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.CheckBoxFor(m => m.NzbsRUsEnabled, new { @class = "indexer_checkbox" }) +
+                                        "</div>" +
+                                    "</div>" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbsrusUId) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbsrusUId) +
+                                        "</div>" +
+                                    "</div>" +
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NzbsrusHash) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NzbsrusHash) +
+                                        "</div>" +
+                                    "</div>" +
+                                "</div>"
+                            );
+                        item.Add()
+                            .Text("Newzbin")
+                            .Content(
+                                "<div class=\"section_content\">" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            "Enabled" +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.CheckBoxFor(m => m.NewzbinEnabled, new { @class = "indexer_checkbox" }) +
+                                        "</div>" +
+                                    "</div>" +
+
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NewzbinUsername) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NewzbinUsername) +
+                                        "</div>" +
+                                    "</div>" +
+                                    "<div class=\"indexer_group\">" +
+                                        "<div class=\"indexer_left\">" +
+                                            Html.LabelFor(m => m.NewzbinPassword) +
+                                        "</div>" +
+                                        "<div class=\"indexer_right\">" +
+                                            Html.TextBoxFor(m => m.NewzbinPassword) +
+                                        "</div>" +
+                                    "</div>" +
+                                "</div>"
+                            );
+                    }).Render(); 
+                }
+        </div>
+        
+        <br/>
+        <div id="save_button_div">
+            <input type="submit" id="save_button" value="Save" disabled="disabled" />
+        </div>
+    </fieldset>
+}
+<div id="result"></div>
\ No newline at end of file

From ebc560d985740227207c05840aa8c234a553257e Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 19 Apr 2011 17:45:46 -0700
Subject: [PATCH 2/3] Fixed save button on Indexer Settings, changed margins
 for a cleaner look.

---
 NzbDrone.5.1.ReSharper | 70 ------------------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 NzbDrone.5.1.ReSharper

diff --git a/NzbDrone.5.1.ReSharper b/NzbDrone.5.1.ReSharper
deleted file mode 100644
index 5792be25b..000000000
--- a/NzbDrone.5.1.ReSharper
+++ /dev/null
@@ -1,70 +0,0 @@
-<Configuration>
-  <CodeStyleSettings>
-    <ExternalPath IsNull="False">
-    </ExternalPath>
-    <Sharing>SOLUTION</Sharing>
-    <CSharp>
-      <FormatSettings>
-        <MODIFIERS_ORDER IsNull="False">
-          <Item>public</Item>
-          <Item>protected</Item>
-          <Item>internal</Item>
-          <Item>private</Item>
-          <Item>new</Item>
-          <Item>abstract</Item>
-          <Item>virtual</Item>
-          <Item>override</Item>
-          <Item>sealed</Item>
-          <Item>static</Item>
-          <Item>readonly</Item>
-          <Item>extern</Item>
-          <Item>unsafe</Item>
-          <Item>volatile</Item>
-        </MODIFIERS_ORDER>
-      </FormatSettings>
-      <UsingsSettings />
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      </Naming2>
-    </CSharp>
-    <VB>
-      <FormatSettings />
-      <ImportsSettings />
-      <Naming2>
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      </Naming2>
-    </VB>
-    <Web>
-      <Naming2 />
-    </Web>
-    <Xaml>
-      <Naming2 />
-    </Xaml>
-    <XML>
-      <FormatSettings />
-    </XML>
-    <GenerateMemberBody />
-    <Naming2>
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />
-      <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />
-      <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AA_BB" ElementKind="PrivateConstants" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />
-    </Naming2>
-  </CodeStyleSettings>
-</Configuration>
\ No newline at end of file

From c149060a2445e0c7202d4846b9ffda2fe7bd4a6e Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 19 Apr 2011 17:46:19 -0700
Subject: [PATCH 3/3] Fixed save button on Indexer Settings, changed margins
 for a cleaner look.

---
 NzbDrone.Web/Views/Settings/Indexers.cshtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index f13443057..b469b1d46 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -60,7 +60,7 @@
             <div>
                     @{ Html.Telerik().PanelBar()
                     .Name("PanelBar")
-                    .HtmlAttributes(new { style = "width: 300px; float: left; margin-bottom: 30px;" })
+                    .HtmlAttributes(new { style = "width: 300px; margin: 10px;" })
                     .ExpandMode(PanelBarExpandMode.Single)
                     .SelectedIndex(0)
                     .Items(item =>
@@ -197,7 +197,6 @@
                 }
         </div>
         
-        <br/>
         <div id="save_button_div">
             <input type="submit" id="save_button" value="Save" disabled="disabled" />
         </div>