From 1cfc2f3fe4c99a9ed6464f5d8106b3e96e5447b1 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Wed, 30 Nov 2011 21:25:01 -0800 Subject: [PATCH 1/3] Removed MainContent Section --- NzbDrone.Web/Views/History/Index.cshtml | 88 +++++++++---------- NzbDrone.Web/Views/Log/Index.cshtml | 10 +-- NzbDrone.Web/Views/Misnamed/Index.cshtml | 17 ++-- NzbDrone.Web/Views/Missing/Index.cshtml | 8 +- NzbDrone.Web/Views/Series/Details.cshtml | 4 +- NzbDrone.Web/Views/Series/Index.cshtml | 15 ++-- NzbDrone.Web/Views/Settings/Index.cshtml | 22 +++-- NzbDrone.Web/Views/Shared/Error.cshtml | 16 ++-- NzbDrone.Web/Views/System/Config.cshtml | 4 +- NzbDrone.Web/Views/System/Indexers.cshtml | 4 +- NzbDrone.Web/Views/System/Jobs.cshtml | 7 +- .../Views/System/PendingProcessing.cshtml | 10 +-- NzbDrone.Web/Views/Upcoming/Index.cshtml | 62 ++++++------- 13 files changed, 116 insertions(+), 151 deletions(-) diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml index 9a6069baa..0639db171 100644 --- a/NzbDrone.Web/Views/History/Index.cshtml +++ b/NzbDrone.Web/Views/History/Index.cshtml @@ -5,54 +5,50 @@ History } @section ActionMenu{ } - - -@section MainContent{ -
- @{Html.Telerik().Grid().Name("history") - .TableHtmlAttributes(new { @class = "Grid" }) - .Columns(columns => - { - columns.Bound(c => c.Indexer) - .ClientTemplate("
<#= Indexer #>
") - .Title("") - .Width(20); - columns.Bound(c => c.SeriesTitle) - .ClientTemplate("<#= SeriesTitle #>") - .Title("Series Title"); - columns.Bound(c => c.SeasonNumber).Title("Season").Width(1); - columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1); - columns.Bound(c => c.EpisodeTitle).Title("Episode Title"); - columns.Bound(c => c.Quality).Title("Quality").Width(50); - columns.Bound(c => c.Date).Title("Grabbed on"); - columns.Bound(c => c.HistoryId) - .Title("Actions") - .ClientTemplate("\" onclick=\"deleteHistoryRow(<#= HistoryId #>); return false;\">Delete" + - "&episodeId=<#= EpisodeId #>\" onclick=\"redownload(<#= HistoryId #>, <#= EpisodeId #>); return false;\">Redownload") - .Width("40"); - }) - .DetailView(detailView => detailView.ClientTemplate( - "
" + - "
Overview: <#= EpisodeOverview #>
" + - "
NZB Title: <#= NzbTitle #>
" + - "
Proper: <#= IsProper #>
" + - "
" - )) - .DataBinding(data => data.Ajax().Select("_AjaxBinding", "History")) - .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.Date).Descending()).Enabled(true)) - .Pageable( - c => - c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) - .Render();} -
-} +
+ @{Html.Telerik().Grid().Name("history") + .TableHtmlAttributes(new { @class = "Grid" }) + .Columns(columns => + { + columns.Bound(c => c.Indexer) + .ClientTemplate("
<#= Indexer #>
") + .Title("") + .Width(20); + columns.Bound(c => c.SeriesTitle) + .ClientTemplate("<#= SeriesTitle #>") + .Title("Series Title"); + columns.Bound(c => c.SeasonNumber).Title("Season").Width(1); + columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1); + columns.Bound(c => c.EpisodeTitle).Title("Episode Title"); + columns.Bound(c => c.Quality).Title("Quality").Width(50); + columns.Bound(c => c.Date).Title("Grabbed on"); + columns.Bound(c => c.HistoryId) + .Title("Actions") + .ClientTemplate("\" onclick=\"deleteHistoryRow(<#= HistoryId #>); return false;\">Delete" + + "&episodeId=<#= EpisodeId #>\" onclick=\"redownload(<#= HistoryId #>, <#= EpisodeId #>); return false;\">Redownload") + .Width("40"); + }) + .DetailView(detailView => detailView.ClientTemplate( + "
" + + "
Overview: <#= EpisodeOverview #>
" + + "
NZB Title: <#= NzbTitle #>
" + + "
Proper: <#= IsProper #>
" + + "
" + )) + .DataBinding(data => data.Ajax().Select("_AjaxBinding", "History")) + .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.Date).Descending()).Enabled(true)) + .Pageable( + c => + c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) + .Render();} +
\ No newline at end of file + diff --git a/NzbDrone.Web/Views/Log/Index.cshtml b/NzbDrone.Web/Views/Log/Index.cshtml index c39c3bad6..001e5315c 100644 --- a/NzbDrone.Web/Views/Log/Index.cshtml +++ b/NzbDrone.Web/Views/Log/Index.cshtml @@ -30,10 +30,9 @@ Logs
} -@section MainContent{ -
- Log entries older than 30 days are automatically deleted.
- @{Html.Telerik().Grid().Name("logsGrid") +
+ Log entries older than 30 days are automatically deleted.
+@{Html.Telerik().Grid().Name("logsGrid") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { @@ -52,9 +51,8 @@ Logs .Pageable(paging => paging.Style(GridPagerStyles.Status).PageOnScroll(true).PageSize(100)) .Filterable() .ClientEvents(c => c.OnRowDataBound("onRowDataBound")) - .Scrollable(c=>c.Height(500)) + .Scrollable(c => c.Height(500)) .Render();} -} \ No newline at end of file + diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml index dc7925543..8bdd18da2 100644 --- a/NzbDrone.Web/Views/Missing/Index.cshtml +++ b/NzbDrone.Web/Views/Missing/Index.cshtml @@ -1,21 +1,16 @@ @model List @using NzbDrone.Web.Models; - @section TitleContent{ Missing } - - @section ActionMenu{
  • @Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)
  • @Ajax.ActionLink("Start Backlog Search", "BacklogSearch", "Command", null, null)
} - -@section MainContent{ - @{Html.Telerik().Grid().Name("missing") +@{Html.Telerik().Grid().Name("missing") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { @@ -51,4 +46,3 @@ Missing c => c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) .Render();} -} \ No newline at end of file diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index bb01376e1..2d88ea812 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -71,7 +71,7 @@
  • @Ajax.ActionLink("Rename Episodes", "RenameEpisodes", "Episode", new { seriesId = Model.SeriesId }, null)
    • } -@section MainContent{ + } -} + @section Scripts{ } -@section MainContent{ -
    -
      -
    • @Html.ActionLink("Naming", "Naming", "Settings")
      • -
    • @Html.ActionLink("Indexers", "Indexers", "Settings")
      • -
    • @Html.ActionLink("Quality", "Quality", "Settings")
      • -
    • @Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")
      • -
    • @Html.ActionLink("Notifications", "Notifications", "Settings")
      • -
    • @Html.ActionLink("System", "System", "Settings")
      • -
    -
    -} +
    +
      +
    • @Html.ActionLink("Naming", "Naming", "Settings")
      • +
    • @Html.ActionLink("Indexers", "Indexers", "Settings")
      • +
    • @Html.ActionLink("Quality", "Quality", "Settings")
      • +
    • @Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")
      • +
    • @Html.ActionLink("Notifications", "Notifications", "Settings")
      • +
    • @Html.ActionLink("System", "System", "Settings")
      • +
    +
    diff --git a/NzbDrone.Web/Views/Shared/Error.cshtml b/NzbDrone.Web/Views/Shared/Error.cshtml index 388f25e37..208445879 100644 --- a/NzbDrone.Web/Views/Shared/Error.cshtml +++ b/NzbDrone.Web/Views/Shared/Error.cshtml @@ -1,15 +1,11 @@ @model HandleErrorInfo - @section TitleContent { - EPIC FAIL!!! +EPIC FAIL!!! } -@section MainContent -{ -

    - @Model.Exception.Message -

    -
    - @Model.Exception.ToString() -} \ No newline at end of file +

    + @Model.Exception.Message +

    +
    +@Model.Exception.ToString() diff --git a/NzbDrone.Web/Views/System/Config.cshtml b/NzbDrone.Web/Views/System/Config.cshtml index 79ebacdd0..88d2770de 100644 --- a/NzbDrone.Web/Views/System/Config.cshtml +++ b/NzbDrone.Web/Views/System/Config.cshtml @@ -2,8 +2,7 @@ @section TitleContent{ Configuration } -@section MainContent{ - @(Html.Telerik().Grid() +@(Html.Telerik().Grid() .Name("Grid") .TableHtmlAttributes(new { @class = "Grid" }) .DataKeys(keys => @@ -30,4 +29,3 @@ Configuration .Editable(editing => editing.Mode(GridEditMode.InLine)) .Sortable() ) -} diff --git a/NzbDrone.Web/Views/System/Indexers.cshtml b/NzbDrone.Web/Views/System/Indexers.cshtml index 03cd11007..3bc26ace9 100644 --- a/NzbDrone.Web/Views/System/Indexers.cshtml +++ b/NzbDrone.Web/Views/System/Indexers.cshtml @@ -2,8 +2,6 @@ @section TitleContent{ Indexers } -@section MainContent{ - @{Html.Telerik().Grid(Model).Name("Grid") +@{Html.Telerik().Grid(Model).Name("Grid") .TableHtmlAttributes(new { @class = "Grid" }) .Render();} -} diff --git a/NzbDrone.Web/Views/System/Jobs.cshtml b/NzbDrone.Web/Views/System/Jobs.cshtml index 61194f6bd..36b33a308 100644 --- a/NzbDrone.Web/Views/System/Jobs.cshtml +++ b/NzbDrone.Web/Views/System/Jobs.cshtml @@ -1,10 +1,9 @@ -@using System.Collections -@using NzbDrone.Web.Models +@using NzbDrone.Web.Models @model IEnumerable @section TitleContent{ Jobs } -@section MainContent{ + @{Html.Telerik().Grid(Model).Name("Grid") .Render();} @@ -15,4 +14,4 @@ Jobs .Columns(c => c.Bound(g => g.TargetId).Title("Target")) .Columns(c => c.Bound(g => g.SecondaryTargetId).Title("Secondary Target")) .Render();} -} + diff --git a/NzbDrone.Web/Views/System/PendingProcessing.cshtml b/NzbDrone.Web/Views/System/PendingProcessing.cshtml index ae3836c78..95d0f59b5 100644 --- a/NzbDrone.Web/Views/System/PendingProcessing.cshtml +++ b/NzbDrone.Web/Views/System/PendingProcessing.cshtml @@ -10,9 +10,8 @@ Pending Processing items.Add().Text("Purge History").Action("Purge", "History"); }).Render();} } -@section MainContent{ -
    - @{Html.Telerik().Grid().Name("PendingProcessingGrid") +
    + @{Html.Telerik().Grid().Name("PendingProcessingGrid") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { @@ -30,8 +29,7 @@ Pending Processing c => c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) .Render();} -
    -} +
    \ No newline at end of file + diff --git a/NzbDrone.Web/Views/Upcoming/Index.cshtml b/NzbDrone.Web/Views/Upcoming/Index.cshtml index 6b5b85e0d..3ce90519f 100644 --- a/NzbDrone.Web/Views/Upcoming/Index.cshtml +++ b/NzbDrone.Web/Views/Upcoming/Index.cshtml @@ -3,19 +3,17 @@ @section TitleContent{ Upcoming } - - @section ActionMenu{ -
      +
      • @Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)
      } -@section MainContent{ -
      -

      Yesterday

      -
      - @{Html.Telerik().Grid().Name("Yesterday").NoRecordsTemplate( +
      +

      + Yesterday

      +
      + @{Html.Telerik().Grid().Name("Yesterday").NoRecordsTemplate( "No watched shows aired yesterday") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => @@ -43,17 +41,18 @@ Upcoming )) .DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming")) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true)) - //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric)) - //.Filterable() - //.ClientEvents(c => c.OnRowDataBound("onRowDataBound")) + //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric)) + //.Filterable() + //.ClientEvents(c => c.OnRowDataBound("onRowDataBound")) .Render();} -
      -
      -
      -

      Today

      -
      - @{Html.Telerik().Grid().Name("Today").NoRecordsTemplate("No watched shows airing today.") +
      +
      +
      +

      + Today

      +
      + @{Html.Telerik().Grid().Name("Today").NoRecordsTemplate("No watched shows airing today.") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { @@ -81,13 +80,14 @@ Upcoming .DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming")) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true)) .Render();} -
      -
      -
      -

      Tomorrow

      -
      - @{Html.Telerik().Grid().Name("Tomorrow").NoRecordsTemplate( +
      +
      +
      +

      + Tomorrow

      +
      + @{Html.Telerik().Grid().Name("Tomorrow").NoRecordsTemplate( "No watched shows airing tomorrow") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => @@ -117,13 +117,14 @@ Upcoming .DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming")) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true)) .Render();} -
      -
      -
      -

      Future Forecast

      -
      - @{Html.Telerik().Grid().Name("Week").NoRecordsTemplate( +
      +
      +
      +

      + Future Forecast

      +
      + @{Html.Telerik().Grid().Name("Week").NoRecordsTemplate( "No watched shows airing in the next week...") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => @@ -152,6 +153,5 @@ Upcoming .DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming")) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDateTime).Ascending()).Enabled(true)) .Render();} -
      -} +
      From 82e2cb2d1e71e0c44ecd32a9b088faeaabc3af90 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Wed, 30 Nov 2011 22:39:11 -0800 Subject: [PATCH 2/3] Settings forms are fixed. --- NzbDrone.Web/Content/NzbDrone.css | 12 - NzbDrone.Web/Content/Settings.css | 97 ++++---- NzbDrone.Web/NzbDrone.Web.csproj | 7 +- NzbDrone.Web/Scripts/NzbDrone/AutoBind.js | 25 ++ NzbDrone.Web/Scripts/NzbDrone/Notification.js | 2 - NzbDrone.Web/Scripts/NzbDrone/settingsForm.js | 8 - NzbDrone.Web/Scripts/jquery.livequery.js | 226 ++++++++++++++++++ NzbDrone.Web/Views/Settings/Indexers.cshtml | 6 +- NzbDrone.Web/Views/Settings/Naming.cshtml | 6 +- .../Views/Settings/Notifications.cshtml | 6 +- NzbDrone.Web/Views/Settings/Quality.cshtml | 6 +- NzbDrone.Web/Views/Settings/Sabnzbd.cshtml | 6 +- NzbDrone.Web/Views/Settings/SubMenu.cshtml | 10 - NzbDrone.Web/Views/Settings/System.cshtml | 6 +- NzbDrone.Web/Views/Settings/Test.cshtml | 12 - .../Views/Shared/_RefrenceLayout.cshtml | 2 + 16 files changed, 321 insertions(+), 116 deletions(-) create mode 100644 NzbDrone.Web/Scripts/NzbDrone/AutoBind.js delete mode 100644 NzbDrone.Web/Scripts/NzbDrone/settingsForm.js create mode 100644 NzbDrone.Web/Scripts/jquery.livequery.js delete mode 100644 NzbDrone.Web/Views/Settings/SubMenu.cshtml delete mode 100644 NzbDrone.Web/Views/Settings/Test.cshtml diff --git a/NzbDrone.Web/Content/NzbDrone.css b/NzbDrone.Web/Content/NzbDrone.css index ae45746a6..2f399ed9f 100644 --- a/NzbDrone.Web/Content/NzbDrone.css +++ b/NzbDrone.Web/Content/NzbDrone.css @@ -169,18 +169,6 @@ hr margin-right: 135px; } -button, input[type="button"], input[type="submit"], input[type="reset"] -{ - color: white; - background-color: #065EFE; - border-style: solid; - border-color: #065EFE; -} - -button:active, input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active -{ - border-color: #0C48B6; -} input[type=text], select { diff --git a/NzbDrone.Web/Content/Settings.css b/NzbDrone.Web/Content/Settings.css index f42128c96..6e25b39f2 100644 --- a/NzbDrone.Web/Content/Settings.css +++ b/NzbDrone.Web/Content/Settings.css @@ -1,11 +1,19 @@ -body +body { - /*font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif; - font-size:12px;*/ + /*font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif; font-size:12px;*/ } -p, h1, form, button{border:0; margin:0; padding:0;} -.spacer{clear:both; height:1px;} +p, h1, form, button +{ + border: 0; + margin: 0; + padding: 0; +} +.spacer +{ + clear: both; + height: 1px; +} .settingsForm { @@ -15,47 +23,47 @@ p, h1, form, button{border:0; margin:0; padding:0;} #stylized h1 { - font-size:20px; - font-weight:bold; - margin-bottom:8px; + font-size: 20px; + font-weight: bold; + margin-bottom: 8px; } #stylized p { - font-size:11px; - color:#666666; - margin-bottom:20px; - border-bottom:solid 1px #b7ddf2; - padding-bottom:10px; + font-size: 11px; + color: #666666; + margin-bottom: 20px; + border-bottom: solid 1px #b7ddf2; + padding-bottom: 10px; } #stylized .labelClass { - display:block; - font-weight:bold; - text-align:right; - width:340px; - float:left; + display: block; + font-weight: bold; + text-align: right; + width: 340px; + float: left; margin-bottom: -10px; } #stylized .small { - color:#666666; - display:block; - font-size:11px; - font-weight:normal; - text-align:right; - width:340px; + color: #666666; + display: block; + font-size: 11px; + font-weight: normal; + text-align: right; + width: 340px; } #stylized .inputClass { - float:left; - padding:4px 2px; - border:solid 1px #aacfe4; - width:200px; - margin:2px 0 20px 10px; + float: left; + padding: 4px 2px; + border: solid 1px #aacfe4; + width: 200px; + margin: 2px 0 20px 10px; } #stylized .selectClass @@ -65,31 +73,22 @@ p, h1, form, button{border:0; margin:0; padding:0;} #stylized .checkClass { - margin:10px 0 10px 10px; + margin: 10px 0 10px 10px; } #stylized button { - clear:both; - margin-left:220px; + clear: both; + margin-left: 220px; margin-bottom: 10px; - width:125px; - height:31px; - background:#666666; - text-align:center; - line-height:31px; - color:#FFFFFF; - font-size:11px; - font-weight:bold; + width: 125px; + height: 31px; + text-align: center; + line-height: 31px; + font-size: 11px; + font-weight: bold; } -#save_button:hover -{ - border-bottom-style: solid; - border-bottom-width: 4px; - border-color: #3C3C3C; - padding-bottom: 2px; -} #saveAjax { @@ -101,9 +100,9 @@ p, h1, form, button{border:0; margin:0; padding:0;} } #save_button[disabled="disabled"] -{ +{ padding: 0px 6px 0px 6px; border: 2px outset ButtonFace; color: lightgrey; cursor: progress; -} \ No newline at end of file +} diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 3f9a9223d..a702f568a 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -372,6 +372,7 @@ + @@ -383,7 +384,7 @@ - + @@ -414,7 +415,6 @@ - @@ -464,9 +464,6 @@ - - - diff --git a/NzbDrone.Web/Scripts/NzbDrone/AutoBind.js b/NzbDrone.Web/Scripts/NzbDrone/AutoBind.js new file mode 100644 index 000000000..1a4a08377 --- /dev/null +++ b/NzbDrone.Web/Scripts/NzbDrone/AutoBind.js @@ -0,0 +1,25 @@ +$(document).ready(function () { + + //All forms are ajax forms + $("form").livequery(function () { + + var options = { + type: 'post', + resetForm: false + }; + + $(this).ajaxForm(options); + + }); + + $('Form button').livequery(function () { + $(this).removeAttr('disabled'); + }); + + + //All buttons are jQueryUI buttons + $('button, input[type="button"], input[type="submit"], input[type="reset"]').livequery(function () { + $(this).button(); + }); + +}); \ No newline at end of file diff --git a/NzbDrone.Web/Scripts/NzbDrone/Notification.js b/NzbDrone.Web/Scripts/NzbDrone/Notification.js index cb526ea95..d87b28e47 100644 --- a/NzbDrone.Web/Scripts/NzbDrone/Notification.js +++ b/NzbDrone.Web/Scripts/NzbDrone/Notification.js @@ -13,8 +13,6 @@ jqXHR.success(function (data) { //Check if the response is a message type, - - console.log(this.url); if (data.IsMessage) { if (data.NotificationType === 0) { $.gritter.add({ diff --git a/NzbDrone.Web/Scripts/NzbDrone/settingsForm.js b/NzbDrone.Web/Scripts/NzbDrone/settingsForm.js deleted file mode 100644 index be2488a1b..000000000 --- a/NzbDrone.Web/Scripts/NzbDrone/settingsForm.js +++ /dev/null @@ -1,8 +0,0 @@ -$(document).ready(function () { - var options = { - type: 'post', - resetForm: false - }; - $('#form').ajaxForm(options); - $('#save_button').removeAttr('disabled'); -}); \ No newline at end of file diff --git a/NzbDrone.Web/Scripts/jquery.livequery.js b/NzbDrone.Web/Scripts/jquery.livequery.js new file mode 100644 index 000000000..55a458a73 --- /dev/null +++ b/NzbDrone.Web/Scripts/jquery.livequery.js @@ -0,0 +1,226 @@ +/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net) +* Dual licensed under the MIT (MIT_LICENSE.txt) +* and GPL Version 2 (GPL_LICENSE.txt) licenses. +* +* Version: 1.1.1 +* Requires jQuery 1.3+ +* Docs: http://docs.jquery.com/Plugins/livequery +*/ + +(function ($) { + + $.extend($.fn, { + livequery: function (type, fn, fn2) { + var self = this, q; + + // Handle different call patterns + if ($.isFunction(type)) + fn2 = fn, fn = type, type = undefined; + + // See if Live Query already exists + $.each($.livequery.queries, function (i, query) { + if (self.selector == query.selector && self.context == query.context && + type == query.type && (!fn || fn.$lqguid == query.fn.$lqguid) && (!fn2 || fn2.$lqguid == query.fn2.$lqguid)) + // Found the query, exit the each loop + return (q = query) && false; + }); + + // Create new Live Query if it wasn't found + q = q || new $.livequery(this.selector, this.context, type, fn, fn2); + + // Make sure it is running + q.stopped = false; + + // Run it immediately for the first time + q.run(); + + // Contnue the chain + return this; + }, + + expire: function (type, fn, fn2) { + var self = this; + + // Handle different call patterns + if ($.isFunction(type)) + fn2 = fn, fn = type, type = undefined; + + // Find the Live Query based on arguments and stop it + $.each($.livequery.queries, function (i, query) { + if (self.selector == query.selector && self.context == query.context && + (!type || type == query.type) && (!fn || fn.$lqguid == query.fn.$lqguid) && (!fn2 || fn2.$lqguid == query.fn2.$lqguid) && !this.stopped) + $.livequery.stop(query.id); + }); + + // Continue the chain + return this; + } + }); + + $.livequery = function (selector, context, type, fn, fn2) { + this.selector = selector; + this.context = context; + this.type = type; + this.fn = fn; + this.fn2 = fn2; + this.elements = []; + this.stopped = false; + + // The id is the index of the Live Query in $.livequery.queries + this.id = $.livequery.queries.push(this) - 1; + + // Mark the functions for matching later on + fn.$lqguid = fn.$lqguid || $.livequery.guid++; + if (fn2) fn2.$lqguid = fn2.$lqguid || $.livequery.guid++; + + // Return the Live Query + return this; + }; + + $.livequery.prototype = { + stop: function () { + var query = this; + + if (this.type) + // Unbind all bound events + this.elements.unbind(this.type, this.fn); + else if (this.fn2) + // Call the second function for all matched elements + this.elements.each(function (i, el) { + query.fn2.apply(el); + }); + + // Clear out matched elements + this.elements = []; + + // Stop the Live Query from running until restarted + this.stopped = true; + }, + + run: function () { + // Short-circuit if stopped + if (this.stopped) return; + var query = this; + + var oEls = this.elements, + els = $(this.selector, this.context), + nEls = els.not(oEls); + + // Set elements to the latest set of matched elements + this.elements = els; + + if (this.type) { + // Bind events to newly matched elements + nEls.bind(this.type, this.fn); + + // Unbind events to elements no longer matched + if (oEls.length > 0) + $.each(oEls, function (i, el) { + if ($.inArray(el, els) < 0) + $.event.remove(el, query.type, query.fn); + }); + } + else { + // Call the first function for newly matched elements + nEls.each(function () { + query.fn.apply(this); + }); + + // Call the second function for elements no longer matched + if (this.fn2 && oEls.length > 0) + $.each(oEls, function (i, el) { + if ($.inArray(el, els) < 0) + query.fn2.apply(el); + }); + } + } + }; + + $.extend($.livequery, { + guid: 0, + queries: [], + queue: [], + running: false, + timeout: null, + + checkQueue: function () { + if ($.livequery.running && $.livequery.queue.length) { + var length = $.livequery.queue.length; + // Run each Live Query currently in the queue + while (length--) + $.livequery.queries[$.livequery.queue.shift()].run(); + } + }, + + pause: function () { + // Don't run anymore Live Queries until restarted + $.livequery.running = false; + }, + + play: function () { + // Restart Live Queries + $.livequery.running = true; + // Request a run of the Live Queries + $.livequery.run(); + }, + + registerPlugin: function () { + $.each(arguments, function (i, n) { + // Short-circuit if the method doesn't exist + if (!$.fn[n]) return; + + // Save a reference to the original method + var old = $.fn[n]; + + // Create a new method + $.fn[n] = function () { + // Call the original method + var r = old.apply(this, arguments); + + // Request a run of the Live Queries + $.livequery.run(); + + // Return the original methods result + return r; + } + }); + }, + + run: function (id) { + if (id != undefined) { + // Put the particular Live Query in the queue if it doesn't already exist + if ($.inArray(id, $.livequery.queue) < 0) + $.livequery.queue.push(id); + } + else + // Put each Live Query in the queue if it doesn't already exist + $.each($.livequery.queries, function (id) { + if ($.inArray(id, $.livequery.queue) < 0) + $.livequery.queue.push(id); + }); + + // Clear timeout if it already exists + if ($.livequery.timeout) clearTimeout($.livequery.timeout); + // Create a timeout to check the queue and actually run the Live Queries + $.livequery.timeout = setTimeout($.livequery.checkQueue, 20); + }, + + stop: function (id) { + if (id != undefined) + // Stop are particular Live Query + $.livequery.queries[id].stop(); + else + // Stop all Live Queries + $.each($.livequery.queries, function (id) { + $.livequery.queries[id].stop(); + }); + } + }); + + // Register core DOM manipulation methods + $.livequery.registerPlugin('append', 'prepend', 'after', 'before', 'wrap', 'attr', 'removeAttr', 'addClass', 'removeClass', 'toggleClass', 'empty', 'remove', 'html'); + + // Run Live Queries when the Document is ready + $(function () { $.livequery.play(); }); + +})(jQuery); \ No newline at end of file diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml index 35cd5fe36..64cb3e195 100644 --- a/NzbDrone.Web/Views/Settings/Indexers.cshtml +++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml @@ -14,7 +14,7 @@
      RSS feeds are checked every 15 minutes for new episodes.
      - @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" })) + @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" })) { @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
      @@ -106,12 +106,12 @@

      - }
      @section Scripts{ - + + + - + + + } diff --git a/NzbDrone.Web/Views/Settings/Test.cshtml b/NzbDrone.Web/Views/Settings/Test.cshtml deleted file mode 100644 index 12100aa1e..000000000 --- a/NzbDrone.Web/Views/Settings/Test.cshtml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/NzbDrone.Web/Views/Shared/_RefrenceLayout.cshtml b/NzbDrone.Web/Views/Shared/_RefrenceLayout.cshtml index 238c04d30..a339d4eee 100644 --- a/NzbDrone.Web/Views/Shared/_RefrenceLayout.cshtml +++ b/NzbDrone.Web/Views/Shared/_RefrenceLayout.cshtml @@ -20,6 +20,7 @@ @RenderBody() @(Html.Telerik().ScriptRegistrar().jQuery(true)) + @@ -32,6 +33,7 @@ + @RenderSection("Scripts", required: false) From 85736029c837227946e094d0c8b954df3f37e482 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Wed, 30 Nov 2011 23:10:50 -0800 Subject: [PATCH 3/3] Fixed issue where update provider called db in a loop. --- NzbDrone.Core/Providers/UpdateProvider.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NzbDrone.Core/Providers/UpdateProvider.cs b/NzbDrone.Core/Providers/UpdateProvider.cs index 20aab14b6..2bb7c3a1c 100644 --- a/NzbDrone.Core/Providers/UpdateProvider.cs +++ b/NzbDrone.Core/Providers/UpdateProvider.cs @@ -45,14 +45,15 @@ namespace NzbDrone.Core.Providers private List GetAvailablePackages() { var updateList = new List(); - var rawUpdateList = _httpProvider.DownloadString(_configProvider.UpdateUrl); + var updateUrl = _configProvider.UpdateUrl; + var rawUpdateList = _httpProvider.DownloadString(updateUrl); var matches = parseRegex.Matches(rawUpdateList); foreach (Match match in matches) { var updatePackage = new UpdatePackage(); updatePackage.FileName = match.Groups["filename"].Value; - updatePackage.Url = _configProvider.UpdateUrl + updatePackage.FileName; + updatePackage.Url = updateUrl + updatePackage.FileName; updatePackage.Version = new Version(match.Groups["version"].Value); updateList.Add(updatePackage); } @@ -83,7 +84,7 @@ namespace NzbDrone.Core.Providers { var files = _diskProvider.GetFiles(_enviromentProvider.GetUpdateLogFolder(), SearchOption.TopDirectoryOnly).ToList(); - foreach (var file in files.Select(c => new FileInfo(c)).OrderByDescending(c=>c.Name)) + foreach (var file in files.Select(c => new FileInfo(c)).OrderByDescending(c => c.Name)) { list.Add(DateTime.ParseExact(file.Name.Replace(file.Extension, string.Empty), "yyyy.MM.dd-H-mm", provider), file.FullName); }