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

Fixed: Settings tabs should load a lot faster.

This commit is contained in:
kay.one 2012-02-23 11:16:11 -08:00
parent ac58d84a78
commit eddafaca93
11 changed files with 402 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
NzbDrone.Web/Content/IndexerSettings.css
View File

@ -84,3 +84,38 @@ input[type="checkbox"]
margin-top: 5px; margin-top: 5px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.indexerPanel
{
overflow: auto;
}
.retentionContainer
{
padding-top: 20px;
overflow: hidden;
}
.indexerStatusContainer
{
margin-left: 12px;
margin-bottom: -4px;
}
.indexerStatus
{
padding: 6px 10px;
display: inline-block;
color: white;
margin: 3px;
}
.enabled
{
background-color: #065EFE;
}
.disabled
{
background-color: #616161;
}

11
NzbDrone.Web/Views/Settings/DownloadClient.cshtml
View File

@ -1,8 +1,6 @@
@using NzbDrone.Web.Helpers; @using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.DownloadClientSettingsModel @model NzbDrone.Web.Models.DownloadClientSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{ Layout = null; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
<style> <style>
.downloadClient .downloadClient
{ {
@ -27,7 +25,6 @@
overflow: auto; overflow: auto;
} }
</style> </style>
}
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveDownloadClient", "Settings", FormMethod.Post, new { id = "DownloadClientForm", name = "DownloadClientForm", @class = "settingsForm" })) @using (Html.BeginForm("SaveDownloadClient", "Settings", FormMethod.Post, new { id = "DownloadClientForm", name = "DownloadClientForm", @class = "settingsForm" }))
{ {
@ -36,7 +33,6 @@
<span class="small">@Html.DescriptionFor(m => m.DownloadClient)</span> <span class="small">@Html.DescriptionFor(m => m.DownloadClient)</span>
</label> </label>
@Html.DropDownListFor(m => m.DownloadClient, Model.DownloadClientSelectList, new { @class = "inputClass selectClass" }) @Html.DropDownListFor(m => m.DownloadClient, Model.DownloadClientSelectList, new { @class = "inputClass selectClass" })
<label class="labelClass">@Html.LabelFor(m => m.DownloadClientDropDirectory) <label class="labelClass">@Html.LabelFor(m => m.DownloadClientDropDirectory)
<span class="small">@Html.DescriptionFor(m => m.DownloadClientDropDirectory)</span> <span class="small">@Html.DescriptionFor(m => m.DownloadClientDropDirectory)</span>
</label> </label>
@ -58,14 +54,12 @@
</div> </div>
<div id="result" class="hiddenResult"> <div id="result" class="hiddenResult">
</div> </div>
@section Scripts{
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
$('#downloadClientAccordion').accordion("activate", false); $('#downloadClientAccordion').accordion("activate", false);
}); });
</script>
<script type="text/javascript">
var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")'; var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';
function autoConfigureSab() { function autoConfigureSab() {
@ -124,4 +118,3 @@
}); });
}); });
</script> </script>
}

9
NzbDrone.Web/Views/Settings/Index.cshtml
View File

@ -1,11 +1,18 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@{ViewBag.Title = "Settings";} @{ViewBag.Title = "Settings";}
@section HeaderContent
{
@Html.IncludeCss("Settings.css")
@Html.IncludeCss("IndexerSettings.css")
@Html.IncludeCss("QualitySettings.css")
}
<div class="jquery-tabs"> <div class="jquery-tabs">
<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("Quality", "Quality", "Settings")</li> <li>@Html.ActionLink("Quality", "Quality", "Settings")</li>
<li>@Html.ActionLink("Indexers", "Indexers", "Settings")</li>
<li>@Html.ActionLink("Download Client", "DownloadClient", "Settings")</li> <li>@Html.ActionLink("Download Client", "DownloadClient", "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>

80
NzbDrone.Web/Views/Settings/Indexers.cshtml
View File

@ -1,58 +1,26 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@model NzbDrone.Web.Models.IndexerSettingsModel @model NzbDrone.Web.Models.IndexerSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{ Layout = null; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
@Html.IncludeCss("IndexerSettings.css")
<style>
.indexerPanel
{
overflow: auto;
}
.retentionContainer
{
padding-top: 20px;
overflow: hidden;
}
.indexerStatusContainer {
margin-left: 12px;
margin-bottom: -4px;
}
.indexerStatus {
padding: 6px 10px;
display: inline-block;
color: white;
margin: 3px;
}
.enabled {
background-color: #065EFE;
}
.disabled {
background-color: #616161;
}
</style>
}
<div class="infoBox"> <div class="infoBox">
RSS feeds are checked every 25 minutes for new episodes.</div> RSS feeds are checked every 25 minutes for new episodes.</div>
<div class="indexerStatusContainer"> <div class="indexerStatusContainer">
<div class="indexerStatus disabled" id="nzbsOrgStatus" title="Enabled/Disabled">Nzbs.Org</div> <div class="indexerStatus disabled" id="nzbsOrgStatus" title="Enabled/Disabled">
<div class="indexerStatus disabled" id="nzbMatrixStatus" title="Enabled/Disabled">NZBMatrix</div> Nzbs.Org</div>
<div class="indexerStatus disabled" id="nzbsRusStatus" title="Enabled/Disabled">NZBsRus</div> <div class="indexerStatus disabled" id="nzbMatrixStatus" title="Enabled/Disabled">
<div class="indexerStatus disabled" id="newzbinStatus" title="Enabled/Disabled">Newzbin</div> NZBMatrix</div>
<div class="indexerStatus disabled" id="newznabStatus" title="Enabled/Disabled">Newznab</div> <div class="indexerStatus disabled" id="nzbsRusStatus" title="Enabled/Disabled">
NZBsRus</div>
<div class="indexerStatus disabled" id="newzbinStatus" title="Enabled/Disabled">
Newzbin</div>
<div class="indexerStatus disabled" id="newznabStatus" title="Enabled/Disabled">
Newznab</div>
</div> </div>
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" })) @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" }))
{ {
<div class="jquery-accordion"> <div class="jquery-accordion">
<h3><a href="#">NZBs.org</a></h3> <h3>
<a href="#">NZBs.org</a></h3>
<div class="indexerPanel"> <div class="indexerPanel">
<label class="labelClass"> <label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NzbsOrgEnabled)</span> Enable <span class="small">@Html.DescriptionFor(m => m.NzbsOrgEnabled)</span>
@ -67,8 +35,8 @@
</label> </label>
@Html.TextBoxFor(m => m.NzbsOrgHash, new { @class = "inputClass" }) @Html.TextBoxFor(m => m.NzbsOrgHash, new { @class = "inputClass" })
</div> </div>
<h3>
<h3><a href="#">NZBMatrix</a></h3> <a href="#">NZBMatrix</a></h3>
<div class="indexerPanel"> <div class="indexerPanel">
<label class="labelClass"> <label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NzbMatrixEnabled)</span> Enable <span class="small">@Html.DescriptionFor(m => m.NzbMatrixEnabled)</span>
@ -83,10 +51,11 @@
</label> </label>
@Html.TextBoxFor(m => m.NzbMatrixApiKey, new { @class = "inputClass" }) @Html.TextBoxFor(m => m.NzbMatrixApiKey, new { @class = "inputClass" })
</div> </div>
<h3>
<h3><a href="#">NZBsRus</a></h3> <a href="#">NZBsRus</a></h3>
<div class="indexerPanel"> <div class="indexerPanel">
<div class="warningBox">NZBsRus does not support backlog searching</div> <div class="warningBox">
NZBsRus does not support backlog searching</div>
<label class="labelClass"> <label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NzbsRUsEnabled)</span> Enable <span class="small">@Html.DescriptionFor(m => m.NzbsRUsEnabled)</span>
</label> </label>
@ -100,8 +69,8 @@
</label> </label>
@Html.TextBoxFor(m => m.NzbsrusHash, new { @class = "inputClass" }) @Html.TextBoxFor(m => m.NzbsrusHash, new { @class = "inputClass" })
</div> </div>
<h3>
<h3><a href="#">Newzbin</a></h3> <a href="#">Newzbin</a></h3>
<div class="indexerPanel"> <div class="indexerPanel">
<label class="labelClass"> <label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NewzbinEnabled)</span> Enable <span class="small">@Html.DescriptionFor(m => m.NewzbinEnabled)</span>
@ -116,8 +85,8 @@
</label> </label>
@Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass", type = "password" }) @Html.TextBoxFor(m => m.NewzbinPassword, new { @class = "inputClass", type = "password" })
</div> </div>
<h3>
<h3><a href="#">Newznab</a></h3> <a href="#">Newznab</a></h3>
<div class="indexerPanel"> <div class="indexerPanel">
<label class="labelClass"> <label class="labelClass">
Enable <span class="small">@Html.DescriptionFor(m => m.NewznabEnabled)</span> Enable <span class="small">@Html.DescriptionFor(m => m.NewznabEnabled)</span>
@ -142,7 +111,6 @@
<div class="retentionContainer"> <div class="retentionContainer">
@Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.") @Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.")
<label class="labelClass">@Html.LabelFor(m => m.Retention) <label class="labelClass">@Html.LabelFor(m => m.Retention)
<span class="small">@Html.DescriptionFor(m => m.Retention)</span> <span class="small">@Html.DescriptionFor(m => m.Retention)</span>
</label> </label>
@ -153,7 +121,6 @@
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
if ($('#NzbsOrgEnabled').attr('checked')) if ($('#NzbsOrgEnabled').attr('checked'))
@ -236,4 +203,3 @@
}).keyup(); }).keyup();
</script> </script>
}

12
NzbDrone.Web/Views/Settings/Misc.cshtml
View File

@ -1,10 +1,6 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@model NzbDrone.Web.Models.MiscSettingsModel @model NzbDrone.Web.Models.MiscSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{ Layout = null; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
}
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveMisc", "Settings", FormMethod.Post, new { id = "MiscForm", name = "MiscForm", @class = "settingsForm" })) @using (Html.BeginForm("SaveMisc", "Settings", FormMethod.Post, new { id = "MiscForm", name = "MiscForm", @class = "settingsForm" }))
{ {
@ -13,12 +9,10 @@
</label> </label>
@Html.CheckBoxFor(m => m.EnableBacklogSearching, new { @class = "inputClass checkClass" }) @Html.CheckBoxFor(m => m.EnableBacklogSearching, new { @class = "inputClass checkClass" })
<div style="overflow: hidden; height: 50px;"></div> <div style="overflow: hidden; height: 50px;">
</div>
<button type="submit" class="save_button" disabled="disabled"> <button type="submit" class="save_button" disabled="disabled">
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
}

10
NzbDrone.Web/Views/Settings/Naming.cshtml
View File

@ -1,8 +1,8 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@model NzbDrone.Web.Models.EpisodeNamingModel @model NzbDrone.Web.Models.EpisodeNamingModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{
@section HeaderContent{ Layout = null;
@Html.IncludeCss("Settings.css") }
<style> <style>
#examples #examples
{ {
@ -16,7 +16,7 @@
overflow: auto; overflow: auto;
} }
</style> </style>
}
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveNaming", "Settings", FormMethod.Post, new { id = "NamingForm", name = "NamingForm", @class = "settingsForm" })) @using (Html.BeginForm("SaveNaming", "Settings", FormMethod.Post, new { id = "NamingForm", name = "NamingForm", @class = "settingsForm" }))
{ {
@ -72,10 +72,8 @@
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
createExamples(); createExamples();
}); });
</script> </script>
}

33
NzbDrone.Web/Views/Settings/Notifications.cshtml
View File

@ -1,8 +1,5 @@
@using NzbDrone.Web.Helpers @model NzbDrone.Web.Models.NotificationSettingsModel
@model NzbDrone.Web.Models.NotificationSettingsModel @{ Layout = null; }
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
<style> <style>
.notifier .notifier
{ {
@ -29,27 +26,27 @@
margin-left: 220px; margin-left: 220px;
} }
</style> </style>
}
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "NotificationForm", name = "NotificationForm", @class = "settingsForm" })) @using (Html.BeginForm("SaveNotifications", "Settings", FormMethod.Post, new { id = "NotificationForm", name = "NotificationForm", @class = "settingsForm" }))
{ {
<div class="jquery-accordion"> <div class="jquery-accordion">
<h3><a href="#">XBMC</a></h3> <h3>
<a href="#">XBMC</a></h3>
@{Html.RenderPartial("Xbmc", Model);} @{Html.RenderPartial("Xbmc", Model);}
<h3>
<h3><a href="#">SMTP</a></h3> <a href="#">SMTP</a></h3>
@{Html.RenderPartial("Smtp", Model);} @{Html.RenderPartial("Smtp", Model);}
<h3>
<h3><a href="#">Twitter</a></h3> <a href="#">Twitter</a></h3>
@{Html.RenderPartial("Twitter", Model);} @{Html.RenderPartial("Twitter", Model);}
<h3>
<h3><a href="#">Growl</a></h3> <a href="#">Growl</a></h3>
@{Html.RenderPartial("Growl", Model);} @{Html.RenderPartial("Growl", Model);}
<h3>
<h3><a href="#">Prowl</a></h3> <a href="#">Prowl</a></h3>
@{Html.RenderPartial("Prowl", Model);} @{Html.RenderPartial("Prowl", Model);}
<h3>
<h3><a href="#">Plex</a></h3> <a href="#">Plex</a></h3>
@{Html.RenderPartial("Plex", Model);} @{Html.RenderPartial("Plex", Model);}
</div> </div>
@ -57,7 +54,6 @@
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
<script type="text/javascript"> <script type="text/javascript">
//Twitter //Twitter
getAuthorizationUrl = '../Command/GetTwitterAuthorization'; getAuthorizationUrl = '../Command/GetTwitterAuthorization';
@ -148,4 +144,3 @@
return false; return false;
} }
</script> </script>
}

44
NzbDrone.Web/Views/Settings/Quality.cshtml
View File

@ -1,11 +1,7 @@
@using NzbDrone.Core.Repository.Quality @using NzbDrone.Core.Repository.Quality
@using NzbDrone.Web.Helpers; @using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.QualityModel @model NzbDrone.Web.Models.QualityModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{ Layout = null; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
@Html.IncludeCss("QualitySettings.css")
}
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "QualityForm", name = "QualityForm" })) @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "QualityForm", name = "QualityForm" }))
{ {
@ -18,7 +14,22 @@
<div class="jquery-accordion"> <div class="jquery-accordion">
<h3> <h3>
<a href="#">Sizes</a></h3> <a href="#">Profiles</a></h3>
<div id="profileContainer">
<div id="profileHeader">
<a id="addItem" href="@Url.Action("AddProfile", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" />
Add New Profile</a>
</div>
<div id="profiles">
@foreach (var item in (List<QualityProfile>)ViewData["Profiles"])
{
Html.RenderAction("GetQualityProfileView", item);
}
</div>
</div>
<h3>
<a href="#">Size Limits</a></h3>
<div class="sliders"> <div class="sliders">
<div class="slider-container"> <div class="slider-container">
<b>SDTV</b> <b>SDTV</b>
@ -69,32 +80,12 @@
</span> </span>
</div> </div>
</div> </div>
<h3>
<a href="#">Profiles</a></h3>
<div id="profileContainer">
<div id="profileHeader">
<a id="addItem" href="@Url.Action("AddProfile", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" />
Add New Profile</a>
</div> </div>
<div id="profiles">
@foreach (var item in (List<QualityProfile>)ViewData["Profiles"])
{
Html.RenderAction("GetQualityProfileView", item);
}
</div>
</div>
</div>
<br /> <br />
<button type="submit" class="save_button" disabled="disabled"> <button type="submit" class="save_button" disabled="disabled">
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
@Html.IncludeScript("MicrosoftAjax.js")
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
setupSliders(); setupSliders();
@ -104,4 +95,3 @@
$(this).button(); $(this).button();
}); });
</script> </script>
}

8
NzbDrone.Web/Views/Settings/System.cshtml
View File

@ -1,10 +1,7 @@
@using NzbDrone.Web.Helpers @using NzbDrone.Web.Helpers
@model NzbDrone.Web.Models.SystemSettingsModel @model NzbDrone.Web.Models.SystemSettingsModel
@{ Layout = "~/Views/Shared/_ReferenceLayout.cshtml"; } @{ Layout = null; }
@section HeaderContent{
@Html.IncludeCss("Settings.css")
}
<div class="infoBox"> <div class="infoBox">
You must manually restart NzbDrone for these changes to take effect. (Automatic restart comming soon!) You must manually restart NzbDrone for these changes to take effect. (Automatic restart comming soon!)
@ -38,6 +35,3 @@
Save</button> Save</button>
} }
</div> </div>
@section Scripts{
}

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

@ -48,6 +48,8 @@
@section Scripts @section Scripts
{ {
@RenderSection("Scripts", required: false) @RenderSection("Scripts", required: false)
@Html.IncludeScript("jquery.signalR.min.js")
<script src="@Url.Content("~/signalr/hubs")" type="text/javascript"></script>
@if (EnviromentProvider.IsProduction) @if (EnviromentProvider.IsProduction)
{ {
<script type="text/javascript"> <script type="text/javascript">

2
NzbDrone.Web/Views/Shared/_ReferenceLayout.cshtml
View File

@ -28,11 +28,9 @@
@Html.IncludeScript("jquery-tgc-countdown-1.0.js") @Html.IncludeScript("jquery-tgc-countdown-1.0.js")
@Html.IncludeScript("jquery.watermark.min.js") @Html.IncludeScript("jquery.watermark.min.js")
@Html.IncludeScript("jquery.hotkeys.js") @Html.IncludeScript("jquery.hotkeys.js")
@Html.IncludeScript("jquery.signalR.min.js")
@Html.IncludeScript("jquery.validate.min.js") @Html.IncludeScript("jquery.validate.min.js")
@Html.IncludeScript("jquery.cookie.js") @Html.IncludeScript("jquery.cookie.js")
@Html.IncludeScript("doTimeout.js") @Html.IncludeScript("doTimeout.js")
<script src="@Url.Content("~/signalr/hubs")" type="text/javascript"></script>
@Html.IncludeScript("NzbDrone/localSearch.js") @Html.IncludeScript("NzbDrone/localSearch.js")
@Html.IncludeScript("NzbDrone/AutoComplete.js") @Html.IncludeScript("NzbDrone/AutoComplete.js")
@Html.IncludeScript("NzbDrone/Notification.js") @Html.IncludeScript("NzbDrone/Notification.js")