From 859b68ed9ebb59999cf6391b72a06c3a88f37a52 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Fri, 1 Jul 2011 13:28:53 -0700 Subject: [PATCH] Removed 3rd parties from script registrar. --- NzbDrone.Web/Content/QualitySettings.css | 10 +--- NzbDrone.Web/NzbDrone.Web.csproj | 1 + NzbDrone.Web/Views/AddSeries/RootDir.cshtml | 31 ++++------ NzbDrone.Web/Views/AddSeries/Test.cshtml | 13 ++--- NzbDrone.Web/Views/Shared/_Layout.cshtml | 64 +++++++-------------- 5 files changed, 38 insertions(+), 81 deletions(-) diff --git a/NzbDrone.Web/Content/QualitySettings.css b/NzbDrone.Web/Content/QualitySettings.css index fc0679fa0..d4d2c96ee 100644 --- a/NzbDrone.Web/Content/QualitySettings.css +++ b/NzbDrone.Web/Content/QualitySettings.css @@ -44,12 +44,12 @@ .profileSection { float: left; - height: 157px; width: 270px; margin: 2px; border:solid 1px #CCCCCD; display: inline-block; overflow: hidden; + padding: 5px 5px 5px 5px; } .profileOptions label @@ -103,14 +103,6 @@ .qualityHeader { - background: #d7e6f2; /* Old browsers */ - background: -moz-linear-gradient(left, #d7e6f2 0%, #57a9c6 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, right top, color-stop(0%,#d7e6f2), color-stop(100%,#57a9c6)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(left, #d7e6f2 0%,#57a9c6 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(left, #d7e6f2 0%,#57a9c6 100%); /* Opera11.10+ */ - background: -ms-linear-gradient(left, #d7e6f2 0%,#57a9c6 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d7e6f2', endColorstr='#57a9c6',GradientType=1 ); /* IE6-9 */ - background: linear-gradient(left, #d7e6f2 0%,#57a9c6 100%); /* W3C */ min-height: 23px; position: relative; } \ No newline at end of file diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index 8bc3abd75..4e6f2ba3c 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -580,6 +580,7 @@ + diff --git a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml b/NzbDrone.Web/Views/AddSeries/RootDir.cshtml index 06e91658e..f577c9253 100644 --- a/NzbDrone.Web/Views/AddSeries/RootDir.cshtml +++ b/NzbDrone.Web/Views/AddSeries/RootDir.cshtml @@ -1,7 +1,4 @@ -@{ - Layout = null; -} -
+
@@ -9,27 +6,21 @@
@{Html.RenderAction("RootList");}
-@(Html.Telerik().ScriptRegistrar().DefaultGroup(c => c.Add("http://ajax.googleapis.com/ajax/libs/yui/3.3.0/build/yui/yui-min.js") - .Add("AutoComplete.js") - ).OnDocumentReady("bindFolderAutoComplete('#rootDirInput')")) - -@(Html.Telerik().ScriptRegistrar().OnDocumentReady("onRootReady()")) - diff --git a/NzbDrone.Web/Views/AddSeries/Test.cshtml b/NzbDrone.Web/Views/AddSeries/Test.cshtml index 7faf63ea7..4a15a4fc6 100644 --- a/NzbDrone.Web/Views/AddSeries/Test.cshtml +++ b/NzbDrone.Web/Views/AddSeries/Test.cshtml @@ -2,13 +2,8 @@ ViewBag.Title = "Test"; Layout = "~/Views/Shared/_Layout.cshtml"; } - +@section HeaderContent +{ + +} @{Html.RenderAction("RootDir");} - - -@(Html.Telerik().ScriptRegistrar().Scripts(c => c.AddGroup("TestGroup", group => group - .Add("telerik.common.js") - .Add("telerik.combobox.js") - .Add("telerik.list.js") - .Add("telerik.autocomplete.js") - ))) diff --git a/NzbDrone.Web/Views/Shared/_Layout.cshtml b/NzbDrone.Web/Views/Shared/_Layout.cshtml index dee6c1d88..57e9034b0 100644 --- a/NzbDrone.Web/Views/Shared/_Layout.cshtml +++ b/NzbDrone.Web/Views/Shared/_Layout.cshtml @@ -5,17 +5,25 @@ NZBDrone - - - - - - - - + + + + + + + + + + + + + + + + @RenderSection("HeaderContent", required: false) @@ -49,39 +57,9 @@
- Scanning Series Folder... + background notification
- @(Html.Telerik().ScriptRegistrar().Scripts( - c => c.AddGroup("CDN", group => group - .Add("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js") - //.Add("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js") - .Add("http://ajax.aspnetcdn.com/ajax/4.0/1/MicrosoftAjax.js")) - .AddGroup("3rdParty", group => group - .Add("jquery.form.js") - .Add("jquery.jgrowl.js") - .Add("jquery-tgc-countdown-1.0.js") - .Add("jquery.watermark.min.js") - .Add("MicrosoftMvcValidation.js")) - - .AddGroup("NzbDrone", group => group - .Add("Notification.js") - .Add("episodeSearch.js")) - - )) - + @(Html.Telerik().ScriptRegistrar().jQuery(false)) @RenderSection("Scripts", required: false)