Merge branch 'markus101'

IISExpress/AppServer/applicationhost.config

@@ -145,7 +145,7 @@
           <virtualDirectory path="/" physicalPath="%NZBDRONE_PATH%\NZBDrone.Web" />
         </application>
         <bindings>
-          <binding protocol="http" bindingInformation="*:8980:" />
+          <binding protocol="http" bindingInformation="*:8989:" />
         </bindings>
       </site>
       <siteDefaults>

NzbDrone.Core/Providers/Indexer/NzbsOrg.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Providers.Indexer
             {
                 return new[]
                                    {
-                                       string.Format("http://nzbs.org/rss.php?catid=1,14&i={0}&h={1}&num=50&dl=1", _configProvider.NzbsOrgUId, _configProvider.NzbsOrgHash)
+                                       string.Format("http://nzbs.org/rss.php?type=1&i={0}&h={1}&num=50&dl=1", _configProvider.NzbsOrgUId, _configProvider.NzbsOrgHash)
                                    };
             }
         }

NzbDrone.Web/Views/Series/Details.cshtml

@@ -106,22 +106,35 @@
         <br />
         <h3>Specials</h3>
         <div class="grid-container">
-            @{Html.Telerik().Grid(specialSeasons.Episodes).Name("seasons_specials")
+            @{Html.Telerik().Grid<EpisodeModel>().Name("seasons_specials")
                     .TableHtmlAttributes(new {@class = "Grid"})
                     .Columns(columns =>
                              {
-                                     columns.Bound(c => c.EpisodeNumber).Width(0).Title("Episode");
-                                     columns.Bound(c => c.Title);
-                                     columns.Bound(c => c.AirDate).Format("{0:d}").Width(0);
+                                 columns.Bound(o => o.EpisodeId)
+                                     .ClientTemplate(
+                                         "<input type='checkbox' name='checkedEpisodes' value='<#= EpisodeId #>' />")
+                                     .Title("")
+                                     .Width(1)
+                                     .HtmlAttributes(new { style = "text-align:center" });
+
+                                 columns.Bound(c => c.EpisodeNumber).Width(10).Title("Episode");
+                                 columns.Bound(c => c.Title).Title("Title").Width(300);
+                                 columns.Bound(c => c.AirDate).Format("{0:d}").Width(10);
+                                 columns.Bound(c => c.Quality).Width(10);
+                                 columns.Bound(c => c.Path);
                              })
-                    //.DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>"))
+                    .DetailView(detailView => detailView.ClientTemplate("<div><#= Overview #> </br><#= Path #> </div>"))
                     .ClientEvents(clientEvents =>
                     {
                         clientEvents.OnDataBinding("grid_bind");
                         clientEvents.OnDataBound("grid_bound");
                     })
-                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber)).Enabled(false))
-                    .Footer(false)
+                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(true))
+                    .Footer(true)
+                    .DataBinding(
+                        d =>
+                        d.Ajax().Select("_AjaxSeasonGrid", "Series",
+                                        new RouteValueDictionary { { "seasonId", specialSeasons.SeasonId.ToString() } }))
                     .Render(); }
             <span class="grid-loader"><img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/> Loading...</span>
         </div>

NzbDrone/app.config

@@ -4,6 +4,6 @@
     <supportedRuntime version="v4.0" />
   </startup>
   <appSettings>
-    <add key="port" value="8980" />
+    <add key="port" value="8989" />
   </appSettings>
 </configuration>