From 30d7fecff52d929dbdd036b86b7bb599e169ae47 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 13 May 2011 21:13:21 -0700 Subject: [PATCH] Added examples to EpisodeSorting Settings. Added new Multi-Episode Naming (Scene). --- NzbDrone.Core/Helpers/EpisodeSortingHelper.cs | 12 +- NzbDrone.Web/Content/style.css | 2 + .../Views/Settings/EpisodeSorting.cshtml | 119 +++++++++++++++++- NzbDrone.Web/Views/Settings/General.cshtml | 2 - 4 files changed, 128 insertions(+), 7 deletions(-) diff --git a/NzbDrone.Core/Helpers/EpisodeSortingHelper.cs b/NzbDrone.Core/Helpers/EpisodeSortingHelper.cs index ded4882bb..97881eeaf 100644 --- a/NzbDrone.Core/Helpers/EpisodeSortingHelper.cs +++ b/NzbDrone.Core/Helpers/EpisodeSortingHelper.cs @@ -56,19 +56,25 @@ namespace NzbDrone.Core.Helpers { Id = 0, Name = "Extend", - Pattern = "" + Pattern = "S01E05-06" }, new EpisodeSortingType { Id = 1, Name = "Duplicate", - Pattern = "" + Pattern = "S01E05 - S01E06" }, new EpisodeSortingType { Id = 2, Name = "Repeat", - Pattern = "" + Pattern = "S01E05E06" + }, + new EpisodeSortingType + { + Id = 3, + Name = "Scene", + Pattern = "S01E05-E06" } }; diff --git a/NzbDrone.Web/Content/style.css b/NzbDrone.Web/Content/style.css index 57a13989e..35eb2eab2 100644 --- a/NzbDrone.Web/Content/style.css +++ b/NzbDrone.Web/Content/style.css @@ -276,6 +276,8 @@ button, input[type="button"], input[type="submit"], input[type="reset"] border-bottom-style: solid; border-bottom-width: 5px; border-bottom-color: #3C3C3C; + /* Set padding to prevent fieldset border from moving when button is highlighted... WINNING! */ + padding-bottom: 2px; } .hiddenResult diff --git a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml index 7c78391b7..2e323027d 100644 --- a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml +++ b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml @@ -11,6 +11,7 @@ }; $('#form').ajaxForm(options); $('#save_button').attr('disabled', ''); + createExamples(); }); function showRequest(formData, jqForm, options) { @@ -26,7 +27,6 @@ @using (Html.BeginForm("SaveEpisodeSorting", "Settings", FormMethod.Post, new { id = "form", name = "form" })) { @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.") - ;
Episode Sorting @@ -117,8 +117,123 @@
@Html.ValidationMessageFor(m => m.MultiEpisodeStyle)
+
+
+
} -
\ No newline at end of file +
+ + \ No newline at end of file diff --git a/NzbDrone.Web/Views/Settings/General.cshtml b/NzbDrone.Web/Views/Settings/General.cshtml index d368e60db..226c60317 100644 --- a/NzbDrone.Web/Views/Settings/General.cshtml +++ b/NzbDrone.Web/Views/Settings/General.cshtml @@ -45,9 +45,7 @@ -

-

}