From 8c82133ab00dc0e7087e84dc45754ba3e7c7fcb7 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 4 Jun 2011 23:56:05 -0700 Subject: [PATCH] Season Editor loading is now obvious. Saving Series Grid Edit shows AJAX wheel now, so you know its actually working. --- .../Views/Series/EditorTemplates/SeriesModel.cshtml | 9 +++++++-- NzbDrone.Web/Views/Series/Index.cshtml | 8 ++++++-- NzbDrone.Web/Views/Series/SingleSeason.cshtml | 5 ++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/NzbDrone.Web/Views/Series/EditorTemplates/SeriesModel.cshtml b/NzbDrone.Web/Views/Series/EditorTemplates/SeriesModel.cshtml index e5259446c..fb592549b 100644 --- a/NzbDrone.Web/Views/Series/EditorTemplates/SeriesModel.cshtml +++ b/NzbDrone.Web/Views/Series/EditorTemplates/SeriesModel.cshtml @@ -31,7 +31,12 @@
-
@Html.LabelFor(m => m.SeasonEditor)
+
+ @Html.LabelFor(m => m.SeasonEditor) + +
- \ No newline at end of file + + + \ No newline at end of file diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml index 3493bab3e..4bb581d94 100644 --- a/NzbDrone.Web/Views/Series/Index.cshtml +++ b/NzbDrone.Web/Views/Series/Index.cshtml @@ -153,10 +153,14 @@ var seriesId = args.dataItem.SeriesId; var url = '@Url.Action("SeasonEditor", "Series")'; - $('#season-editor').load(url, { seriesId: seriesId }); + $('#season-editor').load(url, { seriesId: seriesId }, function (response, status, xhr) { + $('#seasonEditorLoader').hide(); + }); } - + function grid_save(e) { + $('#ajaxSaveWheel').show(); + var seasonEditor = e.form.SeasonEditor_collection; var saveSeasonEditUrl = '@Url.Action("SaveSeason", "Series")'; diff --git a/NzbDrone.Web/Views/Series/SingleSeason.cshtml b/NzbDrone.Web/Views/Series/SingleSeason.cshtml index 282a2bd2f..a40c08683 100644 --- a/NzbDrone.Web/Views/Series/SingleSeason.cshtml +++ b/NzbDrone.Web/Views/Series/SingleSeason.cshtml @@ -6,7 +6,7 @@ { var idClean = ViewData.TemplateInfo.HtmlFieldPrefix.Replace('[', '_').Replace(']', '_'); -
+
@Html.DisplayFor(m => m.SeasonString) @Html.CheckBoxFor(m => m.Monitored, new { @class = "chkbox" }) @@ -15,5 +15,4 @@ @Html.HiddenFor(m => m.SeasonNumber) @Html.Hidden(idClean, new { @class = "cleanId", })
-} - +} \ No newline at end of file