Merge branch 'markus101'

14 years ago · 7d7b37be5b
parent 9cad9bbbd7 26b7bc5c53
commit 7d7b37be5b
7 changed files with 236 additions and 188 deletions
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@ -588,6 +588,7 @@
    <Content Include="Content\Images\Indexers\Unknown.png">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
+    <Content Include="Content\Images\Loading.gif" />
    <Content Include="Content\Images\Plus.png" />
    <Content Include="Content\Images\spin.gif" />
    <Content Include="Content\Images\ui-bg_diagonals-small_0_aaaaaa_40x40.png" />
--- a/NzbDrone.Web/Scripts/gridLoad.js
+++ b/NzbDrone.Web/Scripts/gridLoad.js
@ -0,0 +1,11 @@
+function grid_bind(args) {
+    var id = this.attributes[0].textContent;
+    var parent = $('#' + id).parent();
+    parent.children('.grid-loader').stop().css("top", "0px").fadeIn('slow');
+}
+
+function grid_bound(args) {
+    var id = this.attributes[0].textContent;
+    var parent = $('#' + id).parent();
+    $('.grid-container').children('.grid-loader').stop().fadeOut('slow');
+}
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@ -11,6 +11,7 @@ History
            }).Render();}
 }
@section MainContent{
+    <div class="grid-container">
        @{Html.Telerik().Grid<HistoryModel>().Name("history")
               .TableHtmlAttributes(new { @class = "Grid" })
                .Columns(columns =>
@ -41,4 +42,6 @@ History
              //.Filterable()
              //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
                .Render();}
+        <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
+    </div>
 }
--- a/NzbDrone.Web/Views/Series/Details.cshtml
+++ b/NzbDrone.Web/Views/Series/Details.cshtml
@ -58,9 +58,9 @@
    {

        <br />
-        <h3>
-            Season @season.SeasonNumber</h3>
-        Season season1 = season;
+        <h3>Season @season.SeasonNumber</h3>
+        <div class="grid-container">
+            @{Season season1 = season;
            Html.Telerik().Grid<EpisodeModel>().Name("seasons_" + season.SeasonNumber)
                .TableHtmlAttributes(new { @class = "Grid" })
                .Columns(columns =>
@ -78,40 +78,52 @@
                                 columns.Bound(c => c.Quality).Width(10);
                                 columns.Bound(c => c.Path);
                             })
-            //.DetailView(detailView => detailView.Template(e => Html.RenderPartial("EpisodeDetail", e)))
                .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).Descending()).Enabled(true))
-            .Footer(false)
+                .Footer(true)
                .DataBinding(
                    d =>
                    d.Ajax().Select("_AjaxSeasonGrid", "Series",
                                    new RouteValueDictionary { { "seasonId", season1.SeasonId.ToString() } }))
-            //.EnableCustomBinding(true)
-            //.ClientEvents(e => e.OnDetailViewExpand("episodeDetailExpanded")) //Causes issues displaying the episode detail multiple times...
                .ToolBar(
                    c =>
                    c.Custom().Text("Rename Season").Action("RenameSeason", "Series", new { seasonId = season1.SeasonId })
                        .ButtonType(GridButtonType.Text))
-            .Render();
+                .Render();}
+                <span class="grid-loader"><img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/> Loading...</span>
+        </div>
    }
    @{var specialSeasons = Model.Seasons.Where(s => s.SeasonNumber == 0).FirstOrDefault();}
    @if (specialSeasons != null)
    {

        <br />
-        <h3>
-            Specials</h3>
-        Html.Telerik().Grid(specialSeasons.Episodes).Name("seasons_specials")
-            .TableHtmlAttributes(new { @class = "Grid" })
+        <h3>Specials</h3>
+        <div class="grid-container">
+            @{Html.Telerik().Grid(specialSeasons.Episodes).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);
                                 })
+                    //.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)
-            .Render();
+                    .Render(); }
+            <span class="grid-loader"><img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/> Loading...</span>
+        </div>
    }
 }
@section Scripts{
--- a/NzbDrone.Web/Views/Series/Index.cshtml
+++ b/NzbDrone.Web/Views/Series/Index.cshtml
@ -60,14 +60,6 @@
                .center();
        }

-    function grid_bind(args) {
-        $('.grid-container').children('.grid-loader').stop().css("top", "0px").fadeIn('slow');
-    }
-
-    function grid_bound(args) {
-        $('.grid-container').children('.grid-loader').stop().fadeOut('slow');
-    }
-
    function openSeasonEditor(seriesId, seriesName) {
        windowElement = null;
        windowElement = $.telerik.window.create({
--- a/NzbDrone.Web/Views/Shared/SiteLayout.cshtml
+++ b/NzbDrone.Web/Views/Shared/SiteLayout.cshtml
@ -49,6 +49,7 @@
                    .Add("Notification.js")
                    .Add("jquery-tgc-countdown-1.0.js")
                    .Add("MicrosoftAjax.js")
-                    .Add("MicrosoftMvcValidation.js"))
+                    .Add("MicrosoftMvcValidation.js")
+                    .Add("gridLoad.js"))
        .Render();}
 </html>
--- a/NzbDrone.Web/Views/Upcoming/Index.cshtml
+++ b/NzbDrone.Web/Views/Upcoming/Index.cshtml
@ -9,8 +9,8 @@ Upcoming
 }
@section MainContent{
    <div id="yesterday">
-        <h2>
-            Yesterday</h2>
+        <h2>Yesterday</h2>
+        <div class="grid-container">
            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Yesterday").NoRecordsTemplate(
                    "No watched shows aired yesterday")
                    .TableHtmlAttributes(new { @class = "Grid" })
@ -31,17 +31,24 @@ Upcoming
                        "<div><b>Overview: </b><#= Overview #></div>" +
                        "</fieldset>"
                                                    ))
+                    .ClientEvents(clientEvents =>
+                    {
+                        clientEvents.OnDataBinding("grid_bind");
+                        clientEvents.OnDataBound("grid_bound");
+                    })
                    .DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming"))
                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                    //.Pageable(c => c.PageSize(20).Position(GridPagerPosition.Both).Style(GridPagerStyles.PageInput | GridPagerStyles.NextPreviousAndNumeric))
                    //.Filterable()
                    //.ClientEvents(c => c.OnRowDataBound("onRowDataBound"))
                    .Render();}
+            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
+        </div>
    </div>
    <br />
    <div id="today">
-        <h2>
-            Today</h2>
+        <h2>Today</h2>
+        <div class="grid-container">
            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Today").NoRecordsTemplate("No watched shows airing today.")
                    .TableHtmlAttributes(new { @class = "Grid" })
                    .Columns(columns =>
@ -61,14 +68,21 @@ Upcoming
                        "<div><b>Overview: </b><#= Overview #></div>" +
                        "</fieldset>"
                                                    ))
+                    .ClientEvents(clientEvents =>
+                    {
+                        clientEvents.OnDataBinding("grid_bind");
+                        clientEvents.OnDataBound("grid_bound");
+                    })
                    .DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming"))
                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                    .Render();}
+            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
+        </div>
    </div>
    <br />
    <div id="tomorrow">
-        <h2>
-            Tomorrow</h2>
+        <h2>Tomorrow</h2>
+        <div class="grid-container">
            @{Html.Telerik().Grid<UpcomingEpisodeModel>().Name("Tomorrow").NoRecordsTemplate(
                    "No watched shows airing tomorrow")
                    .TableHtmlAttributes(new { @class = "Grid" })
@ -89,14 +103,21 @@ Upcoming
                        "<div><b>Overview: </b><#= Overview #></div>" +
                        "</fieldset>"
                                                  ))
+                    .ClientEvents(clientEvents =>
+                    {
+                        clientEvents.OnDataBinding("grid_bind");
+                        clientEvents.OnDataBound("grid_bound");
+                    })
                    .DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming"))
                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                    .Render();}
+            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
+        </div>
    </div>
    <br />
    <div id="week">
-        <h2>
-            Future Forecast</h2>
+        <h2>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" })
@ -117,8 +138,15 @@ Upcoming
                        "<div><b>Overview: </b><#= Overview #></div>" +
                        "</fieldset>"
                                                  ))
+                    .ClientEvents(clientEvents =>
+                    {
+                        clientEvents.OnDataBinding("grid_bind");
+                        clientEvents.OnDataBound("grid_bound");
+                    })
                    .DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming"))
                    .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
                    .Render();}
+            <span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
+        </div>
    </div>
 }