diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css
index dc5852615..259186655 100644
--- a/NzbDrone.Web/Content/Settings.css
+++ b/NzbDrone.Web/Content/Settings.css
@@ -43,6 +43,7 @@ p, h1, form, button{border:0; margin:0; padding:0;}
text-align:right;
width:340px;
float:left;
+ margin-bottom: -10px;
}
#stylized .small
@@ -70,6 +71,11 @@ p, h1, form, button{border:0; margin:0; padding:0;}
width: 206px;
}
+#stylized .checkClass
+{
+ margin:10px 0 10px 10px;
+}
+
#stylized button
{
clear:both;
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index e45cb7487..c5d627648 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -56,22 +56,14 @@ namespace NzbDrone.Web.Controllers
return View();
}
- public ActionResult Index(string viewName)
+ public ActionResult Index()
{
- if (viewName != null)
- ViewData["viewName"] = viewName;
-
- else
- return RedirectToAction("Indexers");
-
- return View("Index");
+ return RedirectToAction("Indexers");
}
public ActionResult Indexers()
{
- ViewData["viewName"] = "Indexers";
-
- return View("Index", new IndexerSettingsModel
+ return View(new IndexerSettingsModel
{
NzbMatrixUsername = _configProvider.NzbMatrixUsername,
NzbMatrixApiKey = _configProvider.NzbMatrixApiKey,
@@ -146,8 +138,6 @@ namespace NzbDrone.Web.Controllers
public ActionResult Notifications()
{
- ViewData["viewName"] = "Notifications";
-
var model = new NotificationSettingsModel
{
XbmcEnabled = Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false)),
@@ -166,13 +156,11 @@ namespace NzbDrone.Web.Controllers
XbmcPassword = _configProvider.GetValue("XbmcPassword", String.Empty)
};
- return View("Index", model);
+ return View(model);
}
public ActionResult EpisodeSorting()
{
- ViewData["viewName"] = "EpisodeSorting";
-
var model = new EpisodeSortingModel();
model.SeriesName = _configProvider.SeriesName;
@@ -189,7 +177,7 @@ namespace NzbDrone.Web.Controllers
model.NumberStyles = new SelectList(EpisodeSortingHelper.GetNumberStyles(), "Id", "Name");
model.MultiEpisodeStyles = new SelectList(EpisodeSortingHelper.GetMultiEpisodeStyles(), "Id", "Name");
- return View("Index", model);
+ return View(model);
}
public ViewResult AddProfile()
diff --git a/NzbDrone.Web/Models/IndexerSettingsModel.cs b/NzbDrone.Web/Models/IndexerSettingsModel.cs
index 4d5b70082..1f0e089e8 100644
--- a/NzbDrone.Web/Models/IndexerSettingsModel.cs
+++ b/NzbDrone.Web/Models/IndexerSettingsModel.cs
@@ -10,54 +10,66 @@ namespace NzbDrone.Web.Models
{
[DataType(DataType.Text)]
[DisplayName("Username")]
+ [Description("Username for NZB Matrix")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbMatrixUsername { get; set; }
[DataType(DataType.Text)]
[DisplayName("API Key")]
+ [Description("API Key for NZB Matrix")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbMatrixApiKey { get; set; }
[DataType(DataType.Text)]
[DisplayName("UID")]
+ [Description("User ID for Nzbs.org")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbsOrgUId { get; set; }
[DataType(DataType.Text)]
[DisplayName("Hash")]
+ [Description("Hash for Nzbs.org")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbsOrgHash { get; set; }
[DataType(DataType.Text)]
[DisplayName("UID")]
+ [Description("User ID for NZBsRus")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbsrusUId { get; set; }
[DataType(DataType.Text)]
[DisplayName("Hash")]
+ [Description("Hash for NZBsRus")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NzbsrusHash { get; set; }
[DataType(DataType.Text)]
[DisplayName("Username")]
+ [Description("Username for Newzbin")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NewzbinUsername { get; set; }
[DataType(DataType.Text)]
[DisplayName("Password")]
+ [Description("Password for Newzbin")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public String NewzbinPassword { get; set; }
[DisplayName("NZBs.org")]
+ [Description("Scan Nzbs.org for new epsiodes")]
public bool NzbsOrgEnabled { get; set; }
[DisplayName("NZB Matrix")]
+ [Description("Scan NZB Matrix for new epsiodes")]
public bool NzbMatrixEnabled { get; set; }
[DisplayName("NZBsRUs")]
+ [Description("Scan NZBsRus for new epsiodes")]
public bool NzbsRUsEnabled { get; set; }
[DisplayName("Newzbin")]
+ [Description("Scan Newzbin for new epsiodes")]
public bool NewzbinEnabled { get; set; }
}
}
\ No newline at end of file
diff --git a/NzbDrone.Web/Models/NotificationSettingsModel.cs b/NzbDrone.Web/Models/NotificationSettingsModel.cs
index e8f3abca3..f17c3e851 100644
--- a/NzbDrone.Web/Models/NotificationSettingsModel.cs
+++ b/NzbDrone.Web/Models/NotificationSettingsModel.cs
@@ -6,52 +6,66 @@ namespace NzbDrone.Web.Models
public class NotificationSettingsModel
{
[DisplayName("Enabled")]
+ [Description("Enable notifications for XBMC?")]
public bool XbmcEnabled { get; set; }
[DisplayName("Notify on Grab")]
+ [Description("Send notification when episode is sent to SABnzbd?")]
public bool XbmcNotifyOnGrab { get; set; }
[DisplayName("Notify on Download")]
+ [Description("Send notification when episode is downloaded?")]
public bool XbmcNotifyOnDownload { get; set; }
[DisplayName("Notify on Rename")]
+ [Description("Send notification when episode is renamed?")]
public bool XbmcNotifyOnRename { get; set; }
[DisplayName("Image with Notification")]
+ [Description("Display NzbDrone image on notifications?")]
public bool XbmcNotificationImage { get; set; }
[Required]
[Range(3, 10, ErrorMessage = "Must be between 3 and 10 seconds")]
[DisplayName("Display Time")]
+ [Description("How long the notification should be displayed")]
public int XbmcDisplayTime { get; set; }
[DisplayName("Update on Download")]
+ [Description("Update XBMC library after episode download?")]
public bool XbmcUpdateOnDownload { get; set; }
[DisplayName("Update on Rename")]
+ [Description("Update XBMC library after episode is renamed?")]
public bool XbmcUpdateOnRename { get; set; }
- [DisplayName("Update on ")]
+ [DisplayName("Full Update")]
+ [Description("Perform a full update is series update fails?")]
public bool XbmcFullUpdate { get; set; }
[DisplayName("Clean on Download")]
+ [Description("Clean XBMC library after episode download?")]
public bool XbmcCleanOnDownload { get; set; }
[DisplayName("Clean on Rename")]
+ [Description("Clean XBMC library after episode is renamed?")]
public bool XbmcCleanOnRename { get; set; }
[DataType(DataType.Text)]
[DisplayName("Hosts")]
+ [Description("XBMC hosts with port, comma separ")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string XbmcHosts { get; set; }
[DataType(DataType.Text)]
[DisplayName("Username")]
+ [Description("XBMC webserver username")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string XbmcUsername { get; set; }
[DataType(DataType.Text)]
[DisplayName("Password")]
+ [Description("XBMC webserver password")]
[DisplayFormat(ConvertEmptyStringToNull = false)]
public string XbmcPassword { get; set; }
}
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 173d159fc..45ab9b593 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -578,6 +578,7 @@