From 522b0377710a0c82f9ecad2467a22550762db729 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Fri, 9 May 2014 12:42:46 -0700 Subject: [PATCH] #14 - Update welcome page text and links. --- .../Resources.Designer.cs | 23 ++--- .../Resources.resx | 13 ++- .../Views/WelcomePage.cs | 83 +++---------------- .../Views/WelcomePage.cshtml | 7 +- 4 files changed, 24 insertions(+), 102 deletions(-) diff --git a/src/Microsoft.AspNet.Diagnostics/Resources.Designer.cs b/src/Microsoft.AspNet.Diagnostics/Resources.Designer.cs index c0b4db6534..77fd275948 100644 --- a/src/Microsoft.AspNet.Diagnostics/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Diagnostics/Resources.Designer.cs @@ -239,22 +239,13 @@ namespace Microsoft.AspNet.Diagnostics { return ResourceManager.GetString("WelcomeHeader", resourceCulture); } } - + /// - /// Looks up a localized string similar to Learn more about the Microsoft OWIN components. + /// Looks up a localized string similar to Learn more about the Microsoft Asp.Net vNext components. /// - internal static string WelcomeLearnMicrosoftOwin { + internal static string WelcomeLearnMicrosoftAspNet { get { - return ResourceManager.GetString("WelcomeLearnMicrosoftOwin", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Learn more about OWIN. - /// - internal static string WelcomeLearnOwin { - get { - return ResourceManager.GetString("WelcomeLearnOwin", resourceCulture); + return ResourceManager.GetString("WelcomeLearnMicrosoftAspNet", resourceCulture); } } @@ -295,16 +286,16 @@ namespace Microsoft.AspNet.Diagnostics { } /// - /// Looks up a localized string similar to Your OWIN application has been successfully started. + /// Looks up a localized string similar to Your Asp.Net vNext application has been successfully started. /// internal static string WelcomeStarted { get { return ResourceManager.GetString("WelcomeStarted", resourceCulture); } } - + /// - /// Looks up a localized string similar to Your OWIN application has been successfully started.. + /// Looks up a localized string similar to Your Asp.Net vNext application has been successfully started.. /// internal static string WelcomeTitle { get { diff --git a/src/Microsoft.AspNet.Diagnostics/Resources.resx b/src/Microsoft.AspNet.Diagnostics/Resources.resx index b58d66477f..27ef3b78fb 100644 --- a/src/Microsoft.AspNet.Diagnostics/Resources.resx +++ b/src/Microsoft.AspNet.Diagnostics/Resources.resx @@ -138,7 +138,7 @@ Environment - as in OWIN environment dictionary + as in environment dictionary Headers @@ -185,11 +185,8 @@ Welcome - - Learn more about the Microsoft OWIN components - - - Learn more about OWIN + + Learn more about the Microsoft Asp.Net vNext components Browser @@ -204,9 +201,9 @@ Skyline - Your OWIN application has been successfully started + Your Asp.Net vNext application has been successfully started - Your OWIN application has been successfully started. + Your Asp.Net vNext application has been successfully started. \ No newline at end of file diff --git a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs index 901b843b9b..cc74d69229 100644 --- a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs +++ b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cs @@ -1,6 +1,3 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - namespace Microsoft.AspNet.Diagnostics.Views { #line 1 "WelcomePage.cshtml" @@ -3688,69 +3685,11 @@ using System #line hidden ); - WriteLiteral("\r\n "); + WriteLiteral("\r\n "); Write( #line 311 "WelcomePage.cshtml" - Resources.WelcomeLearnOwin - -#line default -#line hidden - ); - - WriteLiteral("\r\n
\r\n \"",( -#line 314 "WelcomePage.cshtml" - Resources.WelcomePageImageText_LearnMore - -#line default -#line hidden - , 287037), false)); - WriteAttribute("title", Tuple.Create(" title=\"", 287079), Tuple.Create("\"", 287128), - Tuple.Create(Tuple.Create("", 287087), Tuple.Create( -#line 314 "WelcomePage.cshtml" - Resources.WelcomePageImageText_LearnMore - -#line default -#line hidden - , 287087), false)); - WriteLiteral(" width=\"58\" height=\"29\" />
\r\n \r\n "); - Write( -#line 316 "WelcomePage.cshtml" - Resources.WelcomeLearnMicrosoftOwin + Resources.WelcomeLearnMicrosoftAspNet #line default #line hidden @@ -3787,22 +3726,22 @@ using System "Nc0+XYlr18RA5ZRt7/btjSnqsFwXE51mK68k3L/W+DqR8HRcAViFq5Xm1pGBP4wAyu751Crjs1z9ZM1w" + "U1BLaYptsK4VktN9pRq0R9Y5/NMZL8slmC1ioSIu51ezNtkSACQ3HJckjXAX1v8nzsTxLwVBTT99OEiF" + "xkMsNIVpu/J6yjhBpEG5mhv7vI8l+AAQB7WiwH/DuungAAAABJRU5ErkJggg==\""); - WriteAttribute("alt", Tuple.Create("\r\n alt=\"", 289780), Tuple.Create("\"", 289844), - Tuple.Create(Tuple.Create("", 289803), Tuple.Create( -#line 318 "WelcomePage.cshtml" + WriteAttribute("alt", Tuple.Create("\r\n alt=\"", 287010), Tuple.Create("\"", 287074), + Tuple.Create(Tuple.Create("", 287033), Tuple.Create( +#line 313 "WelcomePage.cshtml" Resources.WelcomePageImageText_LearnMore #line default #line hidden - , 289803), false)); - WriteAttribute("title", Tuple.Create(" title=\"", 289845), Tuple.Create("\"", 289894), - Tuple.Create(Tuple.Create("", 289853), Tuple.Create( -#line 318 "WelcomePage.cshtml" + , 287033), false)); + WriteAttribute("title", Tuple.Create(" title=\"", 287075), Tuple.Create("\"", 287124), + Tuple.Create(Tuple.Create("", 287083), Tuple.Create( +#line 313 "WelcomePage.cshtml" Resources.WelcomePageImageText_LearnMore #line default #line hidden - , 289853), false)); + , 287083), false)); WriteLiteral(" width=\"58\" height=\"29\" />\r\n \r\n \r\n\r\n\r\n\r\n"); } } diff --git a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cshtml b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cshtml index aad90f6533..958e5ff1bb 100644 --- a/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cshtml +++ b/src/Microsoft.AspNet.Diagnostics/Views/WelcomePage.cshtml @@ -308,12 +308,7 @@
@Resources.WelcomeHeader
@Resources.WelcomeStarted
- @Resources.WelcomeLearnOwin -
- @Resources.WelcomePageImageText_LearnMore
- - @Resources.WelcomeLearnMicrosoftOwin
+ @Resources.WelcomeLearnMicrosoftAspNet
@Resources.WelcomePageImageText_LearnMore