Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

NzbDrone.Core/Providers/UpdateProvider.cs

@@ -45,14 +45,15 @@ namespace NzbDrone.Core.Providers
         private List<UpdatePackage> GetAvailablePackages()
         {
             var updateList = new List<UpdatePackage>();
-            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);
                 }

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
 {

NzbDrone.Web/Content/Settings.css

@@ -1,11 +1,19 @@
-body 
+body
 {
-    /*font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
+    /*font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;     font-size:12px;*/
-    font-size:12px;*/
 }
 
-p, h1, form, button{border:0; margin:0; padding:0;}
+p, h1, form, button
-.spacer{clear:both; height:1px;}
+{
+    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-size: 20px;
-    font-weight:bold;
+    font-weight: bold;
-    margin-bottom:8px;
+    margin-bottom: 8px;
 }
 
 #stylized p
 {
-    font-size:11px;
+    font-size: 11px;
-    color:#666666;
+    color: #666666;
-    margin-bottom:20px;
+    margin-bottom: 20px;
-    border-bottom:solid 1px #b7ddf2;
+    border-bottom: solid 1px #b7ddf2;
-    padding-bottom:10px;
+    padding-bottom: 10px;
 }
 
 #stylized .labelClass
 {
-    display:block;
+    display: block;
-    font-weight:bold;
+    font-weight: bold;
-    text-align:right;
+    text-align: right;
-    width:340px;
+    width: 340px;
-    float:left;
+    float: left;
     margin-bottom: -10px;
 }
 
 #stylized .small
 {
-    color:#666666;
+    color: #666666;
-    display:block;
+    display: block;
-    font-size:11px;
+    font-size: 11px;
-    font-weight:normal;
+    font-weight: normal;
-    text-align:right;
+    text-align: right;
-    width:340px;
+    width: 340px;
 }
 
 #stylized .inputClass
 {
-    float:left;
+    float: left;
-    padding:4px 2px;
+    padding: 4px 2px;
-    border:solid 1px #aacfe4;
+    border: solid 1px #aacfe4;
-    width:200px;
+    width: 200px;
-    margin:2px 0 20px 10px;
+    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;
+    clear: both;
-    margin-left:220px;
+    margin-left: 220px;
     margin-bottom: 10px;
-    width:125px;
+    width: 125px;
-    height:31px;
+    height: 31px;
-    background:#666666;
+    text-align: center;
-    text-align:center;
+    line-height: 31px;
-    line-height:31px;
+    font-size: 11px;
-    color:#FFFFFF;
+    font-weight: bold;
-    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;
-}
+}

NzbDrone.Web/NzbDrone.Web.csproj

@@ -372,6 +372,7 @@
     <Content Include="Scripts\jquery-1.7.1.js" />
     <Content Include="Scripts\jquery-1.7.1.min.js" />
     <Content Include="Scripts\jquery.hotkeys.js" />
+    <Content Include="Scripts\jquery.livequery.js" />
     <Content Include="Scripts\jquery.validate-vsdoc.js" />
     <Content Include="Scripts\jquery.validate.js" />
     <Content Include="Scripts\jquery.validate.min.js" />
@@ -383,7 +384,7 @@
     <Content Include="Scripts\NzbDrone\LocalSearch.js" />
     <Content Include="Scripts\NzbDrone\Notification.js" />
     <Content Include="Scripts\NzbDrone\seriesDetails.js" />
-    <Content Include="Scripts\NzbDrone\settingsForm.js" />
+    <Content Include="Scripts\NzbDrone\AutoBind.js" />
     <Content Include="Scripts\jquery-ui-1.8.16.js" />
     <Content Include="Scripts\jquery-ui-1.8.16.min.js" />
     <Content Include="Scripts\jquery.gritter.js" />
@@ -414,7 +415,6 @@
     <Content Include="Views\Settings\Notifications.cshtml" />
     <Content Include="Views\Settings\Quality.cshtml" />
     <Content Include="Views\AddSeries\RootDir.cshtml" />
-    <Content Include="Views\Settings\SubMenu.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Shared\Footer.cshtml" />
     <Content Include="Views\_ViewStart.cshtml" />
@@ -464,9 +464,6 @@
   <ItemGroup>
     <Content Include="Views\AddSeries\RootList.cshtml" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Views\Settings\Test.cshtml" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Misnamed\Index.cshtml" />
   </ItemGroup>

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();
+    });
+
+});

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({

NzbDrone.Web/Scripts/NzbDrone/settingsForm.js

@@ -1,8 +0,0 @@
-$(document).ready(function () {
-    var options = {
-        type: 'post',
-        resetForm: false
-    };
-    $('#form').ajaxForm(options);
-    $('#save_button').removeAttr('disabled');
-});

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);

NzbDrone.Web/Views/History/Index.cshtml

@@ -5,54 +5,50 @@ History
 }
 @section ActionMenu{
     <ul class="sub-menu">
-        <li>@Ajax.ActionLink("Trim History", "Trim", "History", new AjaxOptions{ OnSuccess = "reloadHistoryGrid" })</li>
+        <li>@Ajax.ActionLink("Trim History", "Trim", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid" })</li>
-        <li>@Ajax.ActionLink("Purge History", "Purge", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid"})</li>
+        <li>@Ajax.ActionLink("Purge History", "Purge", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid" })</li>
     </ul>
 }
-
 <link href="../../Content/Grid.css" rel="stylesheet" type="text/css" />
-
+<div class="grid-container">
-@section MainContent{
+    @{Html.Telerik().Grid<HistoryModel>().Name("history")
-    <div class="grid-container">
+              .TableHtmlAttributes(new { @class = "Grid" })
-        @{Html.Telerik().Grid<HistoryModel>().Name("history")
+              .Columns(columns =>
-               .TableHtmlAttributes(new { @class = "Grid" })
+                           {
-                .Columns(columns =>
+                               columns.Bound(c => c.Indexer)
-                             {
+                                       .ClientTemplate("<center><img alt='<#= Indexer #>' src='" + Url.Content("~/Content/Images/Indexers/") + "<#= Indexer #>.png' /></center>")
-                                 columns.Bound(c => c.Indexer)
+                                       .Title("")
-                                        .ClientTemplate("<center><img alt='<#= Indexer #>' src='" + Url.Content("~/Content/Images/Indexers/") + "<#= Indexer #>.png' /></center>")
+                                       .Width(20);
-                                        .Title("")
+                               columns.Bound(c => c.SeriesTitle)
-                                        .Width(20);
+                                       .ClientTemplate("<a href=" +
-                                 columns.Bound(c => c.SeriesTitle)
+                                                       Url.Action("Details", "Series", new { seriesId = "<#= SeriesId #>" }) +
-                                            .ClientTemplate("<a href=" +
+                                                       "><#= SeriesTitle #></a>")
-                                                            Url.Action("Details", "Series", new { seriesId = "<#= SeriesId #>" }) +
+                                       .Title("Series Title");
-                                                            "><#= SeriesTitle #></a>")
+                               columns.Bound(c => c.SeasonNumber).Title("Season").Width(1);
-                                            .Title("Series Title");
+                               columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1);
-                                 columns.Bound(c => c.SeasonNumber).Title("Season").Width(1);
+                               columns.Bound(c => c.EpisodeTitle).Title("Episode Title");
-                                 columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1);
+                               columns.Bound(c => c.Quality).Title("Quality").Width(50);
-                                 columns.Bound(c => c.EpisodeTitle).Title("Episode Title");
+                               columns.Bound(c => c.Date).Title("Grabbed on");
-                                 columns.Bound(c => c.Quality).Title("Quality").Width(50);
+                               columns.Bound(c => c.HistoryId)
-                                 columns.Bound(c => c.Date).Title("Grabbed on");
+                                       .Title("Actions")
-                                 columns.Bound(c => c.HistoryId)
+                                       .ClientTemplate("<a href=\"../History/Delete?historyId=<#= HistoryId #>\" onclick=\"deleteHistoryRow(<#= HistoryId #>); return false;\"><img src='../../Content/Images/X.png' alt='Delete' title='Delete from History' class='searchImage' /></a>" +
-                                     .Title("Actions")
+                                                       "<a href=\"../History/Redownload?historyId=<#= HistoryId #>&episodeId=<#= EpisodeId #>\" onclick=\"redownload(<#= HistoryId #>, <#= EpisodeId #>); return false;\"><img src='../../Content/Images/Downloading.png' alt='Redownload' title='Redownload Episode' class='searchImage' /></a>")
-                                     .ClientTemplate("<a href=\"../History/Delete?historyId=<#= HistoryId #>\" onclick=\"deleteHistoryRow(<#= HistoryId #>); return false;\"><img src='../../Content/Images/X.png' alt='Delete' title='Delete from History' class='searchImage' /></a>" +
+                                       .Width("40");
-                                                     "<a href=\"../History/Redownload?historyId=<#= HistoryId #>&episodeId=<#= EpisodeId #>\" onclick=\"redownload(<#= HistoryId #>, <#= EpisodeId #>); return false;\"><img src='../../Content/Images/Downloading.png' alt='Redownload' title='Redownload Episode' class='searchImage' /></a>")
+                           })
-                                     .Width("40");
+              .DetailView(detailView => detailView.ClientTemplate(
-                             })
+                                                                  "<fieldset>" +
-                .DetailView(detailView => detailView.ClientTemplate(
+                                                                  "<div><b>Overview: </b><#= EpisodeOverview #></div>" +
-                    "<fieldset>" +
+                                                                  "<div><b>NZB Title: </b><#= NzbTitle #></div>" +
-                    "<div><b>Overview: </b><#= EpisodeOverview #></div>" +
+                                                                  "<div><b>Proper: </b><#= IsProper #></div>" +
-                    "<div><b>NZB Title: </b><#= NzbTitle #></div>" +
+                                                                  "</fieldset>"
-                    "<div><b>Proper: </b><#= IsProper #></div>" +
+                                                ))
-                    "</fieldset>"
+              .DataBinding(data => data.Ajax().Select("_AjaxBinding", "History"))
-                                              ))
+              .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.Date).Descending()).Enabled(true))
-                .DataBinding(data => data.Ajax().Select("_AjaxBinding", "History"))
+              .Pageable(
-                .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.Date).Descending()).Enabled(true))
+                        c =>
-                .Pageable(
+                        c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
-                    c =>
+              .Render();}
-                    c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
+</div>
-                .Render();}
-    </div>
-}
 
 <script type="text/javascript">
     deleteHistoryRowUrl = '../History/Delete';
@@ -84,4 +80,4 @@ History
             }
         });
     }
-</script>
+</script>

NzbDrone.Web/Views/Log/Index.cshtml

@@ -30,10 +30,9 @@ Logs
     <div style="margin-bottom: 10px">
     </div>
 }
-@section MainContent{
+<div class="infoBox">
-    <div class="infoBox">
+    Log entries older than 30 days are automatically deleted.</div>
-        Log entries older than 30 days are automatically deleted.</div>
+@{Html.Telerik().Grid<Log>().Name("logsGrid")
-    @{Html.Telerik().Grid<Log>().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();}
-}
 <script type="text/javascript">
     function reloadGrid() {
         var grid = $('#logsGrid').data('tGrid');

NzbDrone.Web/Views/Misnamed/Index.cshtml

@@ -4,11 +4,10 @@ Misnamed
 }
 @section ActionMenu{
     <ul class="sub-menu">
-        <li>@Ajax.ActionLink("Trim History", "Trim", "History", new AjaxOptions{ OnSuccess = "reloadHistoryGrid" })</li>
+        <li>@Ajax.ActionLink("Trim History", "Trim", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid" })</li>
-        <li>@Ajax.ActionLink("Purge History", "Purge", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid"})</li>
+        <li>@Ajax.ActionLink("Purge History", "Purge", "History", new AjaxOptions { OnSuccess = "reloadHistoryGrid" })</li>
     </ul>
 }
-
 <style>
     .searchImage
     {
@@ -26,10 +25,8 @@ Misnamed
         background-color: #065EFE;
     }
 </style>
-
+<div class="grid-container">
-@section MainContent{
+    @{Html.Telerik().Grid<MisnamedEpisodeModel>().Name("misnamed")
-    <div class="grid-container">
-        @{Html.Telerik().Grid<MisnamedEpisodeModel>().Name("misnamed")
                .TableHtmlAttributes(new { @class = "Grid" })
                 .Columns(columns =>
                              {
@@ -54,9 +51,7 @@ Misnamed
                     clientEvents.OnDataBound("grid_dataBound");
                 })
                 .Render();}
-    </div>
+</div>
-}
-
 <script type="text/javascript">
     deleteHistoryRowUrl = '../History/Delete';
     redownloadUrl = '../History/Redownload';
@@ -94,4 +89,4 @@ Misnamed
         var lastButton = $('#' + id + ' .t-arrow-last');
         lastButton.hide();
     }
-</script>
+</script>

NzbDrone.Web/Views/Missing/Index.cshtml

@@ -1,21 +1,16 @@
 @model List<MissingEpisodeModel>
 @using NzbDrone.Web.Models;
-
 @section TitleContent{
 Missing
 }
-
 <link href="../../Content/Grid.css" rel="stylesheet" type="text/css" />
-
 @section ActionMenu{
     <ul class="sub-menu">
         <li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)</li>
         <li>@Ajax.ActionLink("Start Backlog Search", "BacklogSearch", "Command", null, null)</li>
     </ul>
 }
-
+@{Html.Telerik().Grid<MissingEpisodeModel>().Name("missing")
-@section MainContent{
-    @{Html.Telerik().Grid<MissingEpisodeModel>().Name("missing")
            .TableHtmlAttributes(new { @class = "Grid" })
             .Columns(columns =>
                          {
@@ -51,4 +46,3 @@ Missing
                 c =>
                 c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
             .Render();}
-}

NzbDrone.Web/Views/Series/Details.cshtml

@@ -71,7 +71,7 @@
         <li>@Ajax.ActionLink("Rename Episodes", "RenameEpisodes", "Episode", new { seriesId = Model.SeriesId }, null)</li>
     </ul>
 }
-@section MainContent{
+
     <div id="banner-container">
         @{
             var bannerUrl = "../../Content/Images/img03.jpg";
@@ -146,7 +146,7 @@
             .Render();}
         </div>
     }
-}
+
 @section Scripts{
     <script type="text/javascript">
         seriesId = @Model.SeriesId;

NzbDrone.Web/Views/Series/Index.cshtml

@@ -1,10 +1,8 @@
-@using NzbDrone.Core.Helpers;
 @using NzbDrone.Web.Models;
 @model IEnumerable<NzbDrone.Core.Repository.Series>
 @section TitleContent{
 NzbDrone
 }
-
 <style>
     /* progress bar container */
     .progressbar
@@ -47,16 +45,14 @@ NzbDrone
         background: #E5ECF9;
     }
 </style>
-
 @section ActionMenu{
     <ul class="sub-menu">
         <li>@Html.ActionLink("Add Series", "Index", "AddSeries")</li>
         <li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null)</li>
     </ul>
 }
-@section MainContent{
+<div class="grid-container">
-    <div class="grid-container">
+    @{Html.Telerik().Grid<SeriesModel>().Name("Grid")
-        @{Html.Telerik().Grid<SeriesModel>().Name("Grid")
                 .TableHtmlAttributes(new { @class = "Grid" })
                 .DataKeys(keys => keys.Add(p => p.SeriesId))
                 .DataBinding(data => data.Ajax()
@@ -89,7 +85,7 @@ NzbDrone
 
                              })
                 .Editable(editor => editor.Mode(GridEditMode.PopUp))
-                //.Sortable(sort => sort.OrderBy(order => order.Add(o => o.Title).Ascending()).Enabled(true))
+          //.Sortable(sort => sort.OrderBy(order => order.Add(o => o.Title).Ascending()).Enabled(true))
                 .DetailView(detailView => detailView.ClientTemplate(
                                                                         "<b>Airs Day of Week:</b> " + "<#= AirsDayOfWeek #>" +
                                                                         "<br />" +
@@ -103,8 +99,7 @@ NzbDrone
                     clientEvents.OnRowDataBound("grid_rowBound");
                 })
                 .Render();}
-    </div>
+</div>
-}
 @section Scripts{
     <script type="text/javascript">
         var windowElement;
@@ -128,7 +123,7 @@ NzbDrone
 
             $("#progressbar_" + seriesId).episodeProgress(episodeFileCount, episodeCount);
         }
-        
+
         (function ($) {
             $.fn.episodeProgress = function (episodes, totalEpisodes) {
                 return this.each(

NzbDrone.Web/Views/Settings/Index.cshtml

@@ -10,15 +10,13 @@ Settings
         });
     </script>
 }
-@section MainContent{
+<div id="tabs222">
-    <div id="tabs222">
+    <ul>
-        <ul>
+        <li>@Html.ActionLink("Naming", "Naming", "Settings")</li>
-            <li>@Html.ActionLink("Naming", "Naming", "Settings")</li>
+        <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
-            <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
+        <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
-            <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
+        <li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
-            <li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
+        <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
-            <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
+        <li>@Html.ActionLink("System", "System", "Settings")</li>
-            <li>@Html.ActionLink("System", "System", "Settings")</li>
+    </ul>
-        </ul>
+</div>
-    </div>
-}

NzbDrone.Web/Views/Settings/Indexers.cshtml

@@ -14,7 +14,7 @@
 <div class="infoBox">
     RSS feeds are checked every 15 minutes for new episodes.</div>
 <div id="stylized">
-    @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.")
         <div id="accordion">
@@ -106,12 +106,12 @@
             </div>
         </div>
         <br />
-        <button type="submit" id="save_button" disabled="disabled">
+        <button type="submit" class="save_button" disabled="disabled">
             Save</button>
     }
 </div>
 @section Scripts{
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         $("#addItem").live('click', function () {
             $.ajax({

NzbDrone.Web/Views/Settings/Naming.cshtml

@@ -18,7 +18,7 @@
     </style>
 }
 <div id="stylized">
-    @using (Html.BeginForm("SaveNaming", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
+    @using (Html.BeginForm("SaveNaming", "Settings", FormMethod.Post, new { id = "NamingForm", name = "NamingForm", @class = "settingsForm" }))
     {
         <div class="settingsContainer">
             @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
@@ -68,12 +68,12 @@
             </div>
         </div>
         
-        <button type="submit" id="save_button" disabled="disabled">
+        <button type="submit" class="save_button" disabled="disabled">
             Save</button>
     }
 </div>
 @section Scripts{
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         $(document).ready(function () {
             createExamples();

NzbDrone.Web/Views/Settings/Notifications.cshtml

@@ -30,7 +30,7 @@
     </style>
 }
 <div id="stylized">
-    @using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
+    @using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "NotificationForm", name = "NotificationForm", @class = "settingsForm" }))
     {
         <div id="accordion2">
             <h3>
@@ -50,12 +50,12 @@
             @{Html.RenderPartial("Prowl", Model);}
         </div>
             
-        <button type="submit" id="save_button" disabled="disabled">
+        <button type="submit" class="save_button" disabled="disabled">
             Save</button>
     }
 </div>
 @section Scripts{
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         $(function () {
             $("#accordion2").accordion({

NzbDrone.Web/Views/Settings/Quality.cshtml

@@ -7,7 +7,7 @@
     <link href="../../Content/QualitySettings.css" rel="stylesheet" type="text/css" />
 }
 <div id="stylized">
-    @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
+    @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "QualityForm", name = "QualityForm" }))
     {
         <div id="top" class="settingsForm">
             <label class="labelClass">@Html.LabelFor(m => m.DefaultQualityProfileId)
@@ -81,14 +81,14 @@
                 </div>
             </div>
             <br />
-            <button type="submit" id="save_button" disabled="disabled">
+            <button type="submit" class="save_button" disabled="disabled">
                 Save</button>
         </div>
     }
 </div>
 @section Scripts{
     <script src="../../Scripts/MicrosoftAjax.js" type="text/javascript"></script>
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         var deleteQualityProfileUrl = '@Url.Action("DeleteQualityProfile", "Settings")';
 

NzbDrone.Web/Views/Settings/Sabnzbd.cshtml

@@ -5,7 +5,7 @@
     <link rel="stylesheet" type="text/css" href="../../Content/Settings.css" />
 }
 <div id="stylized">
-    @using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
+    @using (Html.BeginForm("SaveSabnzbd", "Settings", FormMethod.Post, new { id = "SabForm", name = "SabForm", @class = "settingsForm" }))
     {
         <label class="labelClass">
             Auto-Configure <span class="small">If access to SABnzbd doesn't require a username +
@@ -54,14 +54,14 @@
         </label>
         @Html.TextBoxFor(m => m.SabDropDirectory, new { @class = "inputClass folderLookup" })
 
-        <button type="submit" id="save_button" disabled="disabled">
+        <button type="submit" class="save_button" disabled="disabled">
             Save</button>
     }
 </div>
 <div id="result" class="hiddenResult">
 </div>
 @section Scripts{
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';
 

NzbDrone.Web/Views/Settings/SubMenu.cshtml

@@ -1,10 +0,0 @@
-<ul class="sub-menu">
-    <li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
-    <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
-    <li>@Html.ActionLink("Naming", "Naming", "Settings")</li>
-    <li>@Html.ActionLink("Notifications", "Notifications", "Settings")</li>
-    <li>@Html.ActionLink("SABnzbd", "Sabnzbd", "Settings")</li>
-    <li>@Html.ActionLink("System", "System", "Settings")</li>
-</ul>
-<div style="margin-bottom: 10px">
-</div>

NzbDrone.Web/Views/Settings/System.cshtml

@@ -6,7 +6,7 @@
     <link rel="stylesheet" type="text/css" href="../../Content/Settings.css" />
 }
 <div id="stylized">
-    @using (Html.BeginForm("SaveSystem", "Settings", FormMethod.Post, new { id = "form", name = "form", @class = "settingsForm" }))
+    @using (Html.BeginForm("SaveSystem", "Settings", FormMethod.Post, new { id = "SystemForm", name = "SystemForm", @class = "settingsForm" }))
     {
         @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
         <label class="labelClass">@Html.LabelFor(m => m.LaunchBrowser)
@@ -24,10 +24,10 @@
         </label>
         @Html.DropDownListFor(m => m.AuthenticationType, Model.AuthTypeSelectList, new { @class = "inputClass" })
         
-        <button type="submit" id="save_button" disabled="disabled">
+        <button type="submit" class="save_button" disabled="disabled">
             Save</button>
     }
 </div>
 @section Scripts{
-    <script src="../../Scripts/NzbDrone/settingsForm.js" type="text/javascript"></script>
+
 }

NzbDrone.Web/Views/Settings/Test.cshtml

@@ -1,12 +0,0 @@
-<script>
-    $(function () {
-//        $(".quality-selectee").each(function() {
-//            $(this).button();
-//        });
-        $('#test').button();
-    });
-</script>
-
-<input type="checkbox" id="test" class="quality-selectee" /><label for="shuffle">SDTV</label>
-<input type="checkbox" class="quality-selectee" /><label for="shuffle">DVD</label>
-<input type="checkbox" class="quality-selectee" /><label for="shuffle">HDTV</label>

NzbDrone.Web/Views/Shared/Error.cshtml

@@ -1,15 +1,11 @@
 @model HandleErrorInfo
-
 @section TitleContent
 {
-    EPIC FAIL!!!
+EPIC FAIL!!!
 }
 
-@section MainContent
+<h2>
-{
+    @Model.Exception.Message
-    <h2>
+</h2>
-        @Model.Exception.Message
+<br />
-    </h2>
+@Model.Exception.ToString()
-    <br />
-    @Model.Exception.ToString()
-}

NzbDrone.Web/Views/Shared/_RefrenceLayout.cshtml

@@ -20,6 +20,7 @@
     @RenderBody()
     @(Html.Telerik().ScriptRegistrar().jQuery(true))
     <script type="text/javascript" src="../../Scripts/jquery-ui-1.8.16.min.js"></script>
+    <script type="text/javascript" src="../../Scripts/jquery.livequery.js"></script>
     <script type="text/javascript" src="../../Scripts/MicrosoftAjax.js"></script>
     <script type="text/javascript" src="../../Scripts/MicrosoftMvcAjax.js"></script>
     <script type="text/javascript" src="../../Scripts/jquery.gritter.js"></script>
@@ -32,6 +33,7 @@
     <script type="text/javascript" src="../../Scripts/NzbDrone/AutoComplete.js"></script>
     <script type="text/javascript" src="../../Scripts/NzbDrone/LocalSearch.js"></script>
     <script type="text/javascript" src="../../Scripts/NzbDrone/Notification.js"></script>
+    <script type="text/javascript" src="../../Scripts/NzbDrone/AutoBind.js"></script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>

NzbDrone.Web/Views/System/Config.cshtml

@@ -2,8 +2,7 @@
 @section TitleContent{
 Configuration
 }
-@section MainContent{
+@(Html.Telerik().Grid<NzbDrone.Core.Repository.Config>()
-    @(Html.Telerik().Grid<NzbDrone.Core.Repository.Config>()
         .Name("Grid")
          .TableHtmlAttributes(new { @class = "Grid" })
         .DataKeys(keys =>
@@ -30,4 +29,3 @@ Configuration
         .Editable(editing => editing.Mode(GridEditMode.InLine))
         .Sortable()
 )
-}

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();}
-}

NzbDrone.Web/Views/System/Jobs.cshtml

@@ -1,10 +1,9 @@
-@using System.Collections
+@using NzbDrone.Web.Models
-@using NzbDrone.Web.Models
 @model IEnumerable<NzbDrone.Core.Repository.JobDefinition>
 @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();}
-}
+

NzbDrone.Web/Views/System/PendingProcessing.cshtml

@@ -10,9 +10,8 @@ Pending Processing
                 items.Add().Text("Purge History").Action("Purge", "History");
             }).Render();}
 }
-@section MainContent{
+<div class="grid-container">
-    <div class="grid-container">
+    @{Html.Telerik().Grid<PendingProcessingModel>().Name("PendingProcessingGrid")
-        @{Html.Telerik().Grid<PendingProcessingModel>().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();}
-    </div>
+</div>
-}
 <script type="text/javascript">
     var renamePendingUrl = '@Url.Action("RenamePendingProcessing", "System")';
 
@@ -51,4 +49,4 @@ Pending Processing
             }
         });
     }
-</script>
+</script>

NzbDrone.Web/Views/Upcoming/Index.cshtml

@@ -3,19 +3,17 @@
 @section TitleContent{
 Upcoming
 }
-
 <link href="../../Content/Grid.css" rel="stylesheet" type="text/css" />
-
 @section ActionMenu{
-        <ul class="sub-menu">
+    <ul class="sub-menu">
         <li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)</li>
     </ul>
 }
-@section MainContent{
+<div id="yesterday">
-    <div id="yesterday">
+    <h2>
-        <h2>Yesterday</h2>
+        Yesterday</h2>
-        <div class="grid-container">
+    <div class="grid-container">
-            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Yesterday").NoRecordsTemplate(
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().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))
+              //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
-                    //.Filterable()
+              //.Filterable()
-                    //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
+              //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
                     .Render();}
-        </div>
     </div>
-    <br />
+</div>
-    <div id="today">
+<br />
-        <h2>Today</h2>
+<div id="today">
-        <div class="grid-container">
+    <h2>
-            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Today").NoRecordsTemplate("No watched shows airing today.")
+        Today</h2>
+    <div class="grid-container">
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().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();}
-        </div>
     </div>
-    <br />
+</div>
-    <div id="tomorrow">
+<br />
-        <h2>Tomorrow</h2>
+<div id="tomorrow">
-        <div class="grid-container">
+    <h2>
-            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Tomorrow").NoRecordsTemplate(
+        Tomorrow</h2>
+    <div class="grid-container">
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().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();}
-        </div>
     </div>
-    <br />
+</div>
-    <div id="week">
+<br />
-        <h2>Future Forecast</h2>
+<div id="week">
-        <div class="grid-container">
+    <h2>
-            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Week").NoRecordsTemplate(
+        Future Forecast</h2>
+    <div class="grid-container">
+        @{Html.Telerik().Grid<UpcomingEpisodeModel>().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();}
-        </div>
     </div>
-}
+</div>