From df0637d3d1c365e5e2dea02a6ed55bd53229d68c Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Thu, 23 Jun 2011 18:30:35 -0700 Subject: [PATCH] CDN Updates. packaging updates --- .../Providers/Jobs/UpdateSceneMappingsJob.cs | 9 ++---- NzbDrone.Web/Views/Shared/_Layout.cshtml | 28 +++++++++++-------- package.bat | 1 + tests.bat | 1 - 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 tests.bat diff --git a/NzbDrone.Core/Providers/Jobs/UpdateSceneMappingsJob.cs b/NzbDrone.Core/Providers/Jobs/UpdateSceneMappingsJob.cs index a1aebe8d2..189a81458 100644 --- a/NzbDrone.Core/Providers/Jobs/UpdateSceneMappingsJob.cs +++ b/NzbDrone.Core/Providers/Jobs/UpdateSceneMappingsJob.cs @@ -13,7 +13,7 @@ namespace NzbDrone.Core.Providers.Jobs public UpdateSceneMappingsJob() { - + } public string Name @@ -28,12 +28,7 @@ namespace NzbDrone.Core.Providers.Jobs public virtual void Start(ProgressNotification notification, int targetId) { - notification.CurrentMessage = "Updating Scene Mappings"; - if (_sceneNameMappingProvider.UpdateMappings()) - notification.CurrentMessage = "Scene Mappings Completed"; - - else - notification.CurrentMessage = "Scene Mappings Failed"; + _sceneNameMappingProvider.UpdateMappings(); } } } \ No newline at end of file diff --git a/NzbDrone.Web/Views/Shared/_Layout.cshtml b/NzbDrone.Web/Views/Shared/_Layout.cshtml index d828fa269..bbd4077b7 100644 --- a/NzbDrone.Web/Views/Shared/_Layout.cshtml +++ b/NzbDrone.Web/Views/Shared/_Layout.cshtml @@ -2,6 +2,7 @@ + @MvcMiniProfiler.MiniProfiler.RenderIncludes() NZBDrone @@ -13,9 +14,9 @@ @RenderSection("HeaderContent", required: false) - @MvcMiniProfiler.MiniProfiler.RenderIncludes() - + +
@RenderSection("Scripts", required: false) -@{Html.Telerik().ScriptRegistrar().Scripts( - c => //c.Add("jquery-1.6.1.min.js") - c.Add("jquery-ui-1.8.8.min.js") +@{Html.Telerik().ScriptRegistrar().jQuery(true).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.aspnetcdn.com/ajax/4.0/1/MicrosoftAjax.js")) + + .AddGroup("3rdParty", group => group .Add("jquery.form.js") .Add("jquery.jgrowl.js") - .Add("Notification.js") .Add("jquery-tgc-countdown-1.0.js") - .Add("MicrosoftAjax.js") - .Add("MicrosoftMvcValidation.js") - .Add("gridLoad.js") - .Add("episodeSearch.js")) - .Render();} + .Add("MicrosoftMvcValidation.js").Combined(true).Compress(true)) + + .AddGroup("NzbDrone", group => group + .Add("Notification.js") + .Add("gridLoad.js") + .Add("episodeSearch.js")) + + ).Render();} diff --git a/package.bat b/package.bat index 202d75bc8..d2dab1729 100644 --- a/package.bat +++ b/package.bat @@ -15,6 +15,7 @@ xcopy NzbDrone.Web\Views\*.* %TARGET%\NzbDrone.Web\Views\ /E /V /I /Y del %TARGET%\NzbDrone.Web\bin\*.xml /q del %TARGET%\NzbDrone.Web\bin\ninject*.pdb /q +del %TARGET%\NzbDrone.Web\bin\Mvc*.pdb /q xcopy NzbDrone.Web\log.config %TARGET%\NzbDrone.Web\ xcopy NzbDrone.Web\Global.asax %TARGET%\NzbDrone.Web\ diff --git a/tests.bat b/tests.bat deleted file mode 100644 index 5d0fda3c9..000000000 --- a/tests.bat +++ /dev/null @@ -1 +0,0 @@ -"C:\Program Files\Gallio\bin\Gallio.Echo.exe" /rt:XHTML /sr /rfp:AttachmentContentDisposition=Inline /rnf:mtest-report /rd:c:\report\ /v:Quiet /np NzbDrone.Core.Test\bin\Release\NzbDrone.Core.Test.dll \ No newline at end of file