diff --git a/NzbDrone.Web/Content/Grid.css b/NzbDrone.Web/Content/Grid.css index b30f86be1..26963de2c 100644 --- a/NzbDrone.Web/Content/Grid.css +++ b/NzbDrone.Web/Content/Grid.css @@ -68,10 +68,7 @@ opacity: 0.7; } - - -.episodeMissing -{ +.episodeMissing, table.dataTable tr.series-ended { background-color: #f5d6d6; } diff --git a/NzbDrone.Web/Content/SeriesEditor.css b/NzbDrone.Web/Content/SeriesEditor.css index 0bd01b82a..22366b2ce 100644 --- a/NzbDrone.Web/Content/SeriesEditor.css +++ b/NzbDrone.Web/Content/SeriesEditor.css @@ -18,7 +18,7 @@ table input[type="text"], table input[type="date"], table select { } td .path { - width: 300px; + width: 290px; } td .backlogSetting { diff --git a/NzbDrone.Web/Views/Series/Editor.cshtml b/NzbDrone.Web/Views/Series/Editor.cshtml index f1032b114..0db6ff1f6 100644 --- a/NzbDrone.Web/Views/Series/Editor.cshtml +++ b/NzbDrone.Web/Views/Series/Editor.cshtml @@ -28,7 +28,8 @@ Season Folder Backlog Status Start Date - Path + Path + @@ -62,10 +63,15 @@ + + - + + +@Html.CheckBox("highlightEnded", true) + } @section Scripts @@ -79,19 +85,70 @@ "bPaginate": false, "bLengthChange": false, "bFilter": false, - "bSort": false, + "bSort": true, "bInfo": false, - "bAutoWidth": false + "bAutoWidth": false, + "aaSorting": [[1, 'asc']], + "aoColumns": [ + { "bSortable": false }, + { "bSortable": true }, + { "bSortable": false }, + { "bSortable": false }, + { "bSortable": false }, + { "bSortable": false }, + { "bSortable": false }, + { "bSortable": false }, + { "bSortable": true } + ] }); new FixedHeader(oTable, { "top": true, "left": false, "right": false, "bottom": true }); $('.editToggle').enableCheckboxRangeSelection(); - //$('.master-quality option[value=-10]').text('Quality...'); - //$('.master-monitored option[value=-10]').text('Monitored...'); - //$('.master-season-folder option[value=-10]').text('Season Folder...'); - //$('.master-backlog-setting option[value=-10]').text('Backlog Setting...'); + $(document).ready(function () { + var cookieValue = $.cookie("highlightEnded"); + + if (cookieValue == "true") { + $('#highlightEnded').attr('checked', true); + toggleHighlightEnded(true); + } + + else { + $('#highlightEnded').attr('checked', false); + toggleHighlightEnded(false); + } + + $('#highlightEnded').button(); + }); + + $('#highlightEnded').on('change', function () { + var checked = $(this).attr('checked'); + toggleHighlightEnded(checked); + toggleHighlightEndedCookie(checked); + }); + + function toggleHighlightEnded(highlight) { + var ended = $('tr[data-status="Ended"]'); + + ended.each(function () { + if (highlight) { + $(this).addClass('series-ended'); + } + + else { + $(this).removeClass('series-ended'); + } + }); + } + + function toggleHighlightEndedCookie(highlight) { + if (highlight) + $.cookie("highlightEnded", true, { expires: 365 }); + + else + $.cookie("highlightEnded", false, { expires: 365 }); + } }); $(document).on('change', '.editToggleMaster', function () { diff --git a/NzbDrone.Web/Views/Series/EditorItem.cshtml b/NzbDrone.Web/Views/Series/EditorItem.cshtml index 6fa425195..0101f9424 100644 --- a/NzbDrone.Web/Views/Series/EditorItem.cshtml +++ b/NzbDrone.Web/Views/Series/EditorItem.cshtml @@ -9,7 +9,7 @@ @*SeriesId, Title, Quality, Monitored, Use Season Folder, Root Directory/Path*, Backlog Toggle*@ - + @using (Html.BeginCollectionItem("series")) { var idClean = ViewData.TemplateInfo.HtmlFieldPrefix.Replace('[', '_').Replace(']', '_'); @@ -23,5 +23,16 @@ @Html.DropDownListFor(m => m.BacklogSetting, new SelectList((List>)ViewData["BacklogSettingTypes"], "Key", "Value", (int)Model.BacklogSetting), new { @class = "backlogSetting" }) @Html.TextBoxFor(m => m.CustomStartDate, new { type = "date", @class = "start-date jQuery-datepicker" }) @Html.TextBoxFor(m => m.Path, new { @class = "path" }) + + @if (Model.Status == "Ended") + { + Ended + } + + else + { + Active + } + } \ No newline at end of file