CDN Updates. packaging updates

14 years ago · df0637d3d1
parent e2c7371b4f
commit df0637d3d1
4 changed files with 20 additions and 19 deletions
--- 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();
        }
    }
 }
--- a/NzbDrone.Web/Views/Shared/_Layout.cshtml
+++ b/NzbDrone.Web/Views/Shared/_Layout.cshtml
@ -2,6 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head runat="server">
+    @MvcMiniProfiler.MiniProfiler.RenderIncludes()
    <link rel="SHORTCUT ICON" href="../../favicon.ico" />
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
    <title>NZBDrone</title>
@ -13,9 +14,9 @@
    <link href="../../Content/jquery-ui.css" rel="stylesheet" type="text/css" />
    <link href="../../Content/jquery-ui.custom.css" rel="stylesheet" type="text/css" />
    @RenderSection("HeaderContent", required: false)
-    @MvcMiniProfiler.MiniProfiler.RenderIncludes()
-</head>
+ </head>
 <body>
+
    <div id="centered">
        <div id="menu">
            <ul>
@ -43,16 +44,21 @@
    </div>
 </body>
@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();}
 </html>
--- 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\
--- a/tests.bat
+++ b/tests.bat
@ -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
				`@ -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`