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