More validation for Settings.

NzbDrone.Web/Content/Settings.css

@@ -111,3 +111,17 @@
     color: #FFFFFF;
     font-weight: normal;
 }
+
+/* Common Validation Settings */
+.field-validation-error {
+    color: red;
+}
+        
+.input-validation-error {
+    background-color: #FFEEEE;
+    border: 1px solid #FF0000;
+}
+
+.settingsForm .validation-error {
+        background: url("../Content/jQueryUI/images/ui-bg_flat_30_b40404_40x100.png") repeat-x scroll 50% 50% #B40404;
+    }

NzbDrone.Web/Models/DownloadClientSettingsModel.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Model.Sabnzbd;
+using NzbDrone.Web.Helpers.Validation;
 
 namespace NzbDrone.Web.Models
 {
@@ -12,16 +13,16 @@ namespace NzbDrone.Web.Models
         public SelectList PrioritySelectList =
             new SelectList(new[] {"Default", "Paused", "Low", "Normal", "High", "Force"});
 
-        [Required(ErrorMessage = "Please enter a valid host")]
         [DataType(DataType.Text)]
         [DisplayName("SABnzbd Host")]
         [Description("Hostname or IP Address running SABnzbd")]
+        [RequiredIf("DownloadClient", (int)DownloadClientType.Sabnzbd, ErrorMessage = "Required when Download Client is SABnzbd")]
         public String SabHost { get; set; }
 
-        [Required(ErrorMessage = "Please enter a valid port")]
         [DataType(DataType.Text)]
         [DisplayName("SABnzbd Port")]
         [Description("Port for SABnzbd web interface")]
+        [RequiredIf("DownloadClient", (int)DownloadClientType.Sabnzbd, ErrorMessage = "Required when Download Client is SABnzbd")]
         public int SabPort { get; set; }
 
         [DataType(DataType.Text)]
@@ -53,14 +54,16 @@ namespace NzbDrone.Web.Models
         [Description("Priority to use when sending NZBs to SABnzbd")]
         public SabPriorityType SabTvPriority { get; set; }
 
+        [Required(ErrorMessage = "Required so NzbDrone can sort downloads")]
         [DisplayName("Download Client TV Directory")]
-        [Description("The directory where your download client downloads TV shows to (NzbDrone will sort them for you)")]
+        [Description("The directory where your download client downloads TV shows to")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public string DownloadClientDropDirectory { get; set; }
 
         [DisplayName("Blackhole Directory")]
         [Description("The directory where your download client will pickup NZB files")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("DownloadClient", (int)DownloadClientType.Blackhole, ErrorMessage = "Required when Download Client is Blackhole")]
         public string BlackholeDirectory { get; set; }
 
         [DisplayName("Download Client")]

NzbDrone.Web/Models/IndexerSettingsModel.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Web.Models
         [DisplayName("Username")]
         [Description("Username for NZB Matrix")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
-        [RequiredIf("NzbMatrixEnabled", true, ErrorMessage = "USername Required when NZBMatrix is enabled")]
+        [RequiredIf("NzbMatrixEnabled", true, ErrorMessage = "Username Required when NZBMatrix is enabled")]
         public String NzbMatrixUsername { get; set; }
 
         [DataType(DataType.Text)]

NzbDrone.Web/Models/NotificationSettingsModel.cs

@@ -1,6 +1,8 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Web.Mvc;
+using NzbDrone.Core.Model;
+using NzbDrone.Web.Helpers.Validation;
 
 namespace NzbDrone.Web.Models
 {
@@ -31,6 +33,7 @@ namespace NzbDrone.Web.Models
         [DisplayName("Hosts")]
         [Description("XBMC hosts with port, comma separated")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("XbmcEnabled", true, ErrorMessage = "Required when XBMC Notifications are enabled")]
         public string XbmcHosts { get; set; }
 
         [DataType(DataType.Text)]
@@ -62,12 +65,14 @@ namespace NzbDrone.Web.Models
         [DisplayName("Server")]
         [Description("SMTP Server Hostname")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("SmtpEnabled", true, ErrorMessage = "Required when SMTP Notifications are enabled")]
         public string SmtpServer{ get; set; }
 
         [DataType(DataType.Text)]
         [DisplayName("Port")]
         [Description("SMTP Server Port")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("SmtpEnabled", true, ErrorMessage = "Required when SMTP Notifications are enabled")]
         public int SmtpPort { get; set; }
 
         [DisplayName("SSL")]
@@ -91,12 +96,14 @@ namespace NzbDrone.Web.Models
         [DisplayName("Send From Address")]
         [Description("Sender Email address")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("SmtpEnabled", true, ErrorMessage = "Required when SMTP Notifications are enabled")]
         public string SmtpFromAddress { get; set; }
 
         [DataType(DataType.Text)]
         [DisplayName("Send To Addresses")]
         [Description("Comma separated list of addresses to email")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("SmtpEnabled", true, ErrorMessage = "Required when SMTP Notifications are enabled")]
         public string SmtpToAddresses { get; set; }
 
         //Twitter
@@ -129,6 +136,7 @@ namespace NzbDrone.Web.Models
         [DisplayName("Host running Growl")]
         [Description("Host or IP Address:Port")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("GrowlEnabled", true, ErrorMessage = "Required when Growl Notifications are enabled")]
         public string GrowlHost { get; set; }
 
         [DataType(DataType.Text)]
@@ -155,6 +163,7 @@ namespace NzbDrone.Web.Models
         [DisplayName("API Keys")]
         [Description("Comma-Separated list of API Keys")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("ProwlEnabled", true, ErrorMessage = "Required when Prowl Notifications are enabled")]
         public string ProwlApiKeys { get; set; }
 
         [DataType(DataType.Text)]
@@ -186,11 +195,13 @@ namespace NzbDrone.Web.Models
         [DisplayName("Server Host")]
         [Description("Plex Server host with port")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("PlexUpdateLibrary", true, ErrorMessage = "Required when Plex Library Update is Enabled")]
         public string PlexServerHost { get; set; }
 
         [DataType(DataType.Text)]
         [DisplayName("Client Hosts")]
         [Description("Plex client hosts with port, comma separated for multiple clients")]
+        [RequiredIf("PlexNotifyOnGrab", true, ErrorMessage = "Required when Plex Notifications are enabled")]
         [DisplayFormat(ConvertEmptyStringToNull = false)]
         public string PlexClientHosts { get; set; }
 

NzbDrone.Web/Models/SystemSettingsModel.cs

@@ -11,6 +11,7 @@ namespace NzbDrone.Web.Models
         [DisplayName("Port")]
         [Description("Port that NzbDrone runs on")]
         [Range(1, 65535, ErrorMessage = "Port must be between 1 and 65535")]
+        [Required(ErrorMessage = "Port must be between 1 and 65535")]
         public int Port { get; set; }
 
         [DisplayName("Launch Browser")]

NzbDrone.Web/Views/Settings/Blackhole.cshtml

@@ -8,6 +8,7 @@
 <div class="downloadClient">
     <label class="labelClass">@Html.LabelFor(m => m.BlackholeDirectory)
         <span class="small">@Html.DescriptionFor(m => m.BlackholeDirectory)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.BlackholeDirectory)</span>
     </label>
     @Html.TextBoxFor(m => m.BlackholeDirectory, new { @class = "inputClass folderLookup" })
 </div>

NzbDrone.Web/Views/Settings/DownloadClient.cshtml

@@ -35,6 +35,7 @@
             @Html.DropDownListFor(m => m.DownloadClient, Model.DownloadClientSelectList, new { @class = "inputClass selectClass" })
             <label class="labelClass">@Html.LabelFor(m => m.DownloadClientDropDirectory)
                 <span class="small">@Html.DescriptionFor(m => m.DownloadClientDropDirectory)</span>
+                <span class="small">@Html.ValidationMessageFor(m => m.DownloadClientDropDirectory)</span>
             </label>
             @Html.TextBoxFor(m => m.DownloadClientDropDirectory, new { @class = "inputClass folderLookup" })
         </div>
@@ -58,6 +59,38 @@
 <script type="text/javascript">
     $(document).ready(function () {
         $('#downloadClientAccordion').accordion("activate", false);
+
+        //Allow unobstrusive validation of the AJAX loaded form
+        $.validator.unobtrusive.parse('#DownloadClientForm');
+
+        //Validator Settings
+        var settings = $.data($('#DownloadClientForm')[0], 'validator').settings;
+        settings.ignore = [];
+        settings.focusInvalid = false;
+        settings.onfocusout = function (element) { $(element).valid(); };
+
+        var oldHighlight = settings.highlight;
+        var oldUnhighlight = settings.unhighlight;
+
+        settings.highlight = function (element, errorClass, validClass) {
+            oldHighlight(element, errorClass, validClass);
+            $(element).parents('div.ui-accordion-content').prev('h3.ui-accordion-header').addClass('validation-error');
+        };
+        settings.unhighlight = function (element, errorClass, validClass) {
+            oldUnhighlight(element, errorClass, validClass);
+
+            var container = $(element).parents('div.ui-accordion-content');
+            if ($(container).children('.' + errorClass).length == 0)
+                $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
+        };
+    });
+
+    $(document).on('change', '#DownloadClient', function () {
+        $("#DownloadClientForm").validate().form();
+
+        var container = $('div.ui-accordion-content');
+        if ($(container).children('.input-validation-error').length == 0)
+            $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
     });
 
     var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';

NzbDrone.Web/Views/Settings/Growl.cshtml

@@ -23,6 +23,7 @@
             
     <label class="labelClass">@Html.LabelFor(m => m.GrowlHost)
         <span class="small">@Html.DescriptionFor(m => m.GrowlHost)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.GrowlHost)</span>
     </label>
     @Html.TextBoxFor(m => m.GrowlHost, new { @class = "inputClass" })
 

NzbDrone.Web/Views/Settings/Indexers.cshtml

@@ -6,23 +6,6 @@
     .indexerStatusContainer {
         margin-left: 14px;
     }
-    
-    .field-validation-error {
-        color: red;
-    }
-        
-    .input-validation-error {
-        background-color: #FFEEEE;
-        border: 1px solid #FF0000;
-    }
-    
-    #IndexersForm .validation-error {
-        background: url("../../Content/jQueryUI/images/ui-bg_flat_30_b40404_40x100.png") repeat-x scroll 50% 50% #B40404;
-    }
-    #validation-error-summary {
-        display: none;
-        color: red;
-    }
 </style>
 <div class="infoBox">
     RSS feeds are checked every 25 minutes for new episodes.</div>
@@ -148,13 +131,12 @@
             @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
             <label class="labelClass">@Html.LabelFor(m => m.Retention)
                 <span class="small">@Html.DescriptionFor(m => m.Retention)</span>
+                <span class="small">@Html.ValidationMessageFor(m => m.Retention)</span>
             </label>
             @Html.TextBoxFor(m => m.Retention, new { @class = "inputClass" })
         </div>
         
         <button type="submit" class="save_button" disabled="disabled">Save</button>
-        
-        <span id="validation-error-summary">Please check your settings and re-save</span>
     }
 </div>
 
@@ -177,18 +159,18 @@
 
         settings.highlight = function (element, errorClass, validClass) {
             oldHighlight(element, errorClass, validClass);
-            $(element).parents('div.indexerPanel').prev('h3.ui-accordion-header').addClass('validation-error');
+            $(element).parents('div.ui-accordion-content').prev('h3.ui-accordion-header').addClass('validation-error');
         };
         settings.unhighlight = function (element, errorClass, validClass) {
             oldUnhighlight(element, errorClass, validClass);
 
-            var container = $(element).parents('div.indexerPanel');
+            var container = $(element).parents('div.ui-accordion-content');
             if ($(container).children('.' + errorClass).length == 0)
                 $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
         };
     });
 
-    $('.enabledCheck').on('change', function () {
+    $(document).on('change', '.enabledCheck', function () {
         var id = $(this).prop('id');
         var checked = $(this).prop('checked');
 
@@ -211,7 +193,7 @@
         reValidate();
     });
 
-    $('.indexerStatusButton').on('change', function () {
+    $(document).on('change', '.indexerStatusButton', function () {
         var id = $(this).prop('id');
         var checked = $(this).prop('checked');
 
@@ -236,7 +218,7 @@
     function reValidate() {
         $("#IndexersForm").validate().form();
 
-        var container = $('div.indexerPanel');
+        var container = $('div.ui-accordion-content');
         if ($(container).children('.input-validation-error').length == 0)
             $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
     }

NzbDrone.Web/Views/Settings/Notifications.cshtml

@@ -55,6 +55,40 @@
     }
 </div>
 <script type="text/javascript">
+    $(document).ready(function () {
+        //Allow unobstrusive validation of the AJAX loaded form
+        $.validator.unobtrusive.parse('#NotificationForm');
+
+        //Validator Settings
+        var settings = $.data($('#NotificationForm')[0], 'validator').settings;
+        settings.ignore = [];
+        settings.focusInvalid = false;
+        settings.onfocusout = function (element) { $(element).valid(); };
+
+        var oldHighlight = settings.highlight;
+        var oldUnhighlight = settings.unhighlight;
+
+        settings.highlight = function (element, errorClass, validClass) {
+            oldHighlight(element, errorClass, validClass);
+            $(element).parents('div.ui-accordion-content').prev('h3.ui-accordion-header').addClass('validation-error');
+        };
+        settings.unhighlight = function (element, errorClass, validClass) {
+            oldUnhighlight(element, errorClass, validClass);
+
+            var container = $(element).parents('div.ui-accordion-content');
+            if ($(container).children('.' + errorClass).length == 0)
+                $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
+        };
+    });
+
+    $(document).on('change', '.checkClass', function () {
+        $("#NotificationForm").validate().form();
+
+        var container = $('div.ui-accordion-content');
+        if ($(container).children('.input-validation-error').length == 0)
+            $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
+    });
+
     //Twitter
     getAuthorizationUrl = '../Command/GetTwitterAuthorization';
     verifyAuthorizationUrl = '../Command/VerifyTwitterAuthorization';

NzbDrone.Web/Views/Settings/Plex.cshtml

@@ -28,11 +28,13 @@
     
     <label class="labelClass">@Html.LabelFor(m => m.PlexServerHost)
         <span class="small">@Html.DescriptionFor(m => m.PlexServerHost)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.PlexServerHost)</span>
     </label>
     @Html.TextBoxFor(m => m.PlexServerHost, new { @class = "inputClass" })
             
     <label class="labelClass">@Html.LabelFor(m => m.PlexClientHosts)
         <span class="small">@Html.DescriptionFor(m => m.PlexClientHosts)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.PlexClientHosts)</span>
     </label>
     @Html.TextBoxFor(m => m.PlexClientHosts, new { @class = "inputClass" })
 

NzbDrone.Web/Views/Settings/Prowl.cshtml

@@ -23,6 +23,7 @@
             
     <label class="labelClass">@Html.LabelFor(m => m.ProwlApiKeys)
         <span class="small">@Html.DescriptionFor(m => m.ProwlApiKeys)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.ProwlApiKeys)</span>
     </label>
     @Html.TextBoxFor(m => m.ProwlApiKeys, new { @class = "inputClass" })
 

NzbDrone.Web/Views/Settings/Sabnzbd.cshtml

@@ -15,11 +15,13 @@
 
     <label class="labelClass">@Html.LabelFor(m => m.SabHost)
         <span class="small">@Html.DescriptionFor(m => m.SabHost)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SabHost)</span>
     </label>
     @Html.TextBoxFor(m => m.SabHost, new { @class = "inputClass" })
 
     <label class="labelClass">@Html.LabelFor(m => m.SabPort)
         <span class="small">@Html.DescriptionFor(m => m.SabPort)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SabPort)</span>
     </label>
     @Html.TextBoxFor(m => m.SabPort, new { @class = "inputClass" })
 

NzbDrone.Web/Views/Settings/Smtp.cshtml

@@ -23,11 +23,13 @@
 
     <label class="labelClass">@Html.LabelFor(m => m.SmtpServer)
         <span class="small">@Html.DescriptionFor(m => m.SmtpServer)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SmtpServer)</span>
     </label>
     @Html.TextBoxFor(m => m.SmtpServer, new { @class = "inputClass" })
 
     <label class="labelClass">@Html.LabelFor(m => m.SmtpPort)
         <span class="small">@Html.DescriptionFor(m => m.SmtpPort)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SmtpPort)</span>
     </label>
     @Html.TextBoxFor(m => m.SmtpPort, new { @class = "inputClass" })
 
@@ -48,11 +50,13 @@
 
     <label class="labelClass">@Html.LabelFor(m => m.SmtpFromAddress)
         <span class="small">@Html.DescriptionFor(m => m.SmtpFromAddress)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SmtpFromAddress)</span>
     </label>
     @Html.TextBoxFor(m => m.SmtpFromAddress, new { @class = "inputClass" })
 
     <label class="labelClass">@Html.LabelFor(m => m.SmtpToAddresses)
         <span class="small">@Html.DescriptionFor(m => m.SmtpToAddresses)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.SmtpToAddresses)</span>
     </label>
     @Html.TextBoxFor(m => m.SmtpToAddresses, new { @class = "inputClass" })
 

NzbDrone.Web/Views/Settings/System.cshtml

@@ -4,7 +4,7 @@
 
 
 <div class="infoBox">
-    You must manually restart NzbDrone for these changes to take effect. (Automatic restart comming soon!)
+    You must manually restart NzbDrone for these changes to take effect. (Automatic restart coming soon!)
 </div>
 
 <div id="stylized">
@@ -18,6 +18,7 @@
         
         <label class="labelClass">@Html.LabelFor(m => m.Port)
             <span class="small">@Html.DescriptionFor(m => m.Port)</span>
+            <span class="small">@Html.ValidationMessageFor(m => m.Port)</span>
         </label>
         @Html.TextBoxFor(m => m.Port, new { @class = "inputClass" })
 
@@ -35,3 +36,31 @@
             Save</button>
     }
 </div>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        //Allow unobstrusive validation of the AJAX loaded form
+        $.validator.unobtrusive.parse('#SystemForm');
+
+        //Validator Settings
+        var settings = $.data($('#SystemForm')[0], 'validator').settings;
+        settings.ignore = [];
+        settings.focusInvalid = false;
+        settings.onfocusout = function (element) { $(element).valid(); };
+
+        var oldHighlight = settings.highlight;
+        var oldUnhighlight = settings.unhighlight;
+
+        settings.highlight = function (element, errorClass, validClass) {
+            oldHighlight(element, errorClass, validClass);
+            $(element).parents('div.ui-accordion-content').prev('h3.ui-accordion-header').addClass('validation-error');
+        };
+        settings.unhighlight = function (element, errorClass, validClass) {
+            oldUnhighlight(element, errorClass, validClass);
+
+            var container = $(element).parents('div.ui-accordion-content');
+            if ($(container).children('.' + errorClass).length == 0)
+                $(container).prev('h3.ui-accordion-header').removeClass('validation-error');
+        };
+    });
+</script>

NzbDrone.Web/Views/Settings/Xbmc.cshtml

@@ -33,6 +33,7 @@
             
     <label class="labelClass">@Html.LabelFor(m => m.XbmcHosts)
         <span class="small">@Html.DescriptionFor(m => m.XbmcHosts)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.XbmcHosts)</span>
     </label>
     @Html.TextBoxFor(m => m.XbmcHosts, new { @class = "inputClass" })