Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed grid loading overlays.

This commit is contained in:
Mark McDowall 2011-06-28 21:51:30 -07:00
parent a91339dd7e
commit 01425ac0da
8 changed files with 7 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -578,7 +578,6 @@
<Content Include="Scripts\2011.1.414\telerik.window.min.js" /> <Content Include="Scripts\2011.1.414\telerik.window.min.js" />
<Content Include="Scripts\doTimeout.js" /> <Content Include="Scripts\doTimeout.js" />
<Content Include="Scripts\episodeSearch.js" /> <Content Include="Scripts\episodeSearch.js" />
<Content Include="Scripts\gridLoad.js" />
<Content Include="Scripts\jquery-1.6.1-vsdoc.js" /> <Content Include="Scripts\jquery-1.6.1-vsdoc.js" />
<Content Include="Scripts\jquery-1.6.1.js" /> <Content Include="Scripts\jquery-1.6.1.js" />
<Content Include="Scripts\jquery-1.6.1.min.js" /> <Content Include="Scripts\jquery-1.6.1.min.js" />

11
NzbDrone.Web/Scripts/gridLoad.js
View File

@ -1,11 +0,0 @@
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');
}

6
NzbDrone.Web/Views/History/Index.cshtml
View File

@ -39,12 +39,6 @@ History
.Pageable( .Pageable(
c => c =>
c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.Render();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
} }

16
NzbDrone.Web/Views/Series/Details.cshtml
View File

@ -68,11 +68,6 @@
"<a href='#Rename' onClick=\"renameEpisode('<#= EpisodeFileId #>'); return false;\">Rename</a>"); "<a href='#Rename' onClick=\"renameEpisode('<#= EpisodeFileId #>'); return false;\">Rename</a>");
}) })
.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).Descending()).Enabled(true)) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(true))
.Footer(true) .Footer(true)
.DataBinding( .DataBinding(
@ -84,9 +79,6 @@
c.Custom().Text("Rename Season").Action("RenameSeason", "Series", new { seasonId = season }) c.Custom().Text("Rename Season").Action("RenameSeason", "Series", new { seasonId = season })
.ButtonType(GridButtonType.Text)) .ButtonType(GridButtonType.Text))
.Render();} .Render();}
<span class="grid-loader">
<img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
Loading...</span>
</div> </div>
} }
@if (Model.Seasons.Any(s => s == 0)) @if (Model.Seasons.Any(s => s == 0))
@ -114,11 +106,6 @@
columns.Bound(c => c.Status).Width(10); columns.Bound(c => c.Status).Width(10);
}) })
.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).Descending()).Enabled(true)) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(true))
.Footer(true) .Footer(true)
.DataBinding( .DataBinding(
@ -126,9 +113,6 @@
d.Ajax().Select("_AjaxSeasonGrid", "Series", d.Ajax().Select("_AjaxSeasonGrid", "Series",
new RouteValueDictionary { { "seriesId", Model.SeriesId }, { "seasonNumber", 0 } } new RouteValueDictionary { { "seriesId", Model.SeriesId }, { "seasonNumber", 0 } }
)).Render(); } )).Render(); }
<span class="grid-loader">
<img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
Loading...</span>
</div> </div>
} }
} }

18
NzbDrone.Web/Views/Series/Index.cshtml
View File

@ -55,12 +55,6 @@ Series
.Delete("_DeleteAjaxSeriesEditing", "Series")) .Delete("_DeleteAjaxSeriesEditing", "Series"))
.Columns(columns => .Columns(columns =>
{ {
columns.Command(commands =>
{
commands.Edit().ButtonType(GridButtonType.Image);
commands.Delete().ButtonType(GridButtonType.Image);
}).Title("Actions").Width(80);
columns.Bound(o => o.Title) columns.Bound(o => o.Title)
.ClientTemplate("<a href=" + .ClientTemplate("<a href=" +
Url.Action("Details", "Series", new { seriesId = "<#= SeriesId #>" }) + Url.Action("Details", "Series", new { seriesId = "<#= SeriesId #>" }) +
@ -76,6 +70,11 @@ Series
"<span class=\"progressText\" style=\"width: 125px;\"></span>" + "<span class=\"progressText\" style=\"width: 125px;\"></span>" +
"</div>" + "</div>" +
"</div>"); "</div>");
columns.Command(commands =>
{
commands.Edit().ButtonType(GridButtonType.Image);
commands.Delete().ButtonType(GridButtonType.Image);
}).Title("Actions").Width(80);
}) })
.Editable(editor => editor.Mode(GridEditMode.PopUp)) .Editable(editor => editor.Mode(GridEditMode.PopUp))
@ -85,14 +84,9 @@ Series
{ {
clientEvents.OnEdit("grid_edit"); clientEvents.OnEdit("grid_edit");
clientEvents.OnSave("grid_save"); clientEvents.OnSave("grid_save");
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
clientEvents.OnRowDataBound("grid_rowBound"); clientEvents.OnRowDataBound("grid_rowBound");
}) })
.Render();} .Render();}
<span class="grid-loader">
<img src="@Url.Content("~/Content/Images/Loading.gif")" alt="Loading"/>
Loading...</span>
</div> </div>
} }
@ -147,7 +141,7 @@ Series
$("#progressbar_" + seriesId).episodeProgress(episodeFileCount, episodeCount); $("#progressbar_" + seriesId).episodeProgress(episodeFileCount, episodeCount);
} }
</script> </script>
<script type="text/javascript" src="../../Scripts/doTimeout.js"></script> <script src="../../Scripts/doTimeout.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
(function ($) { (function ($) {
$.fn.episodeProgress = function (episodes, totalEpisodes) { $.fn.episodeProgress = function (episodes, totalEpisodes) {

1
NzbDrone.Web/Views/Shared/_Layout.cshtml
View File

@ -68,7 +68,6 @@
.AddGroup("NzbDrone", group => group .AddGroup("NzbDrone", group => group
.Add("Notification.js") .Add("Notification.js")
.Add("gridLoad.js")
.Add("episodeSearch.js")) .Add("episodeSearch.js"))
)) ))

6
NzbDrone.Web/Views/System/PendingProcessing.cshtml
View File

@ -29,13 +29,7 @@ Pending Processing
.Pageable( .Pageable(
c => c =>
c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious)) c.PageSize(20).Position(GridPagerPosition.Bottom).Style(GridPagerStyles.NextPrevious))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.Render();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
} }
<script type="text/javascript"> <script type="text/javascript">

25
NzbDrone.Web/Views/Upcoming/Index.cshtml
View File

@ -31,18 +31,12 @@ Upcoming
"<div><b>Overview: </b><#= Overview #></div>" + "<div><b>Overview: </b><#= Overview #></div>" +
"</fieldset>" "</fieldset>"
)) ))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming")) .DataBinding(data => data.Ajax().Select("_AjaxBindingYesterday", "Upcoming"))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true)) .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)) //.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();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
</div> </div>
<br /> <br />
@ -68,15 +62,9 @@ Upcoming
"<div><b>Overview: </b><#= Overview #></div>" + "<div><b>Overview: </b><#= Overview #></div>" +
"</fieldset>" "</fieldset>"
)) ))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming")) .DataBinding(data => data.Ajax().Select("_AjaxBindingToday", "Upcoming"))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true)) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
.Render();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
</div> </div>
<br /> <br />
@ -103,15 +91,10 @@ Upcoming
"<div><b>Overview: </b><#= Overview #></div>" + "<div><b>Overview: </b><#= Overview #></div>" +
"</fieldset>" "</fieldset>"
)) ))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming")) .DataBinding(data => data.Ajax().Select("_AjaxBindingTomorrow", "Upcoming"))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true)) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
.Render();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
</div> </div>
<br /> <br />
@ -138,15 +121,9 @@ Upcoming
"<div><b>Overview: </b><#= Overview #></div>" + "<div><b>Overview: </b><#= Overview #></div>" +
"</fieldset>" "</fieldset>"
)) ))
.ClientEvents(clientEvents =>
{
clientEvents.OnDataBinding("grid_bind");
clientEvents.OnDataBound("grid_bound");
})
.DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming")) .DataBinding(data => data.Ajax().Select("_AjaxBindingWeek", "Upcoming"))
.Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true)) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.AirDate).Ascending()).Enabled(true))
.Render();} .Render();}
<span class="grid-loader"><img src="@Url.Content( "~/Content/Images/Loading.gif" )" alt="Loading"/> Loading...</span>
</div> </div>
</div> </div>
} }