diff --git a/src/MusicStore/LKG.json b/src/MusicStore/LKG.json index 7500966fde..190eae2287 100644 --- a/src/MusicStore/LKG.json +++ b/src/MusicStore/LKG.json @@ -1,32 +1,32 @@ { "version": "0.1-alpha-*", "dependencies": { - "Helios": "0.1-alpha-191", - "Microsoft.AspNet.Abstractions": "0.1-alpha-220", - "Microsoft.AspNet.Mvc": "0.1-alpha-490", + "Helios": "0.1-alpha-226", + "Microsoft.AspNet.Abstractions": "0.1-alpha-233", + "Microsoft.AspNet.Mvc": "0.1-alpha-544", "Microsoft.AspNet.Razor": "0.1-alpha-181", - "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-167", - "Microsoft.AspNet.DependencyInjection": "0.1-alpha-234", - "Microsoft.AspNet.RequestContainer": "0.1-alpha-213", - "Microsoft.AspNet.Routing": "0.1-alpha-195", - "Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-490", - "Microsoft.AspNet.Mvc.Core": "0.1-alpha-490", - "Microsoft.AspNet.Mvc.Razor": "0.1-alpha-490", - "Microsoft.AspNet.Mvc.Rendering": "0.1-alpha-490", - "Microsoft.AspNet.StaticFiles": "0.1-alpha-158", - "System.Security.Claims": "0.1-alpha-103", + "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-172", + "Microsoft.AspNet.DependencyInjection": "0.1-alpha-240", + "Microsoft.AspNet.RequestContainer": "0.1-alpha-231", + "Microsoft.AspNet.Routing": "0.1-alpha-212", + "Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-544", + "Microsoft.AspNet.Mvc.Core": "0.1-alpha-544", + "Microsoft.AspNet.Mvc.Razor": "0.1-alpha-544", + "Microsoft.AspNet.StaticFiles": "0.1-alpha-174", + "System.Security.Claims": "0.1-alpha-114", "System.Security.Principal": "4.0.0.0", - "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-141", - "Microsoft.AspNet.Identity": "0.1-alpha-264", - "Microsoft.AspNet.Identity.Entity": "0.1-alpha-264", - "Microsoft.AspNet.Identity.InMemory": "0.1-alpha-264", - "Microsoft.Data.Entity": "0.1-alpha-390", - "Microsoft.Data.Relational": "0.1-alpha-390", - "Microsoft.Data.SqlServer": "0.1-pre-390", - "Microsoft.Data.InMemory": "0.1-alpha-390", - "Microsoft.AspNet.Diagnostics": "0.1-alpha-094", - "Microsoft.AspNet.Hosting": "0.1-alpha-213", - "Microsoft.AspNet.Server.WebListener": "0.1-alpha-128" + "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-142", + "Microsoft.AspNet.Identity": "0.1-alpha-308", + "Microsoft.AspNet.Identity.Entity": "0.1-alpha-308", + "Microsoft.AspNet.Identity.InMemory": "0.1-alpha-308", + "Microsoft.Data.Entity": "0.1-alpha-411", + "Microsoft.Data.Relational": "0.1-alpha-411", + "Microsoft.Data.SqlServer": "0.1-pre-411", + "Microsoft.Data.InMemory": "0.1-alpha-411", + "Microsoft.AspNet.Diagnostics": "0.1-alpha-116", + "Microsoft.AspNet.Hosting": "0.1-alpha-231", + "Microsoft.AspNet.Server.WebListener": "0.1-alpha-163", + "Microsoft.AspNet.Configuration.Json": "0.1-alpha-172" }, "configurations": { "net45": { diff --git a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml index 8f51a751d4..97a946f5e3 100644 --- a/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml +++ b/src/MusicStore/Views/Checkout/AddressAndPayment.cshtml @@ -13,26 +13,25 @@ } -@*@using (Html.BeginForm())*@ -@*{*@ +@using (Html.BeginForm()) +{ +

Address And Payment

+
+ Shipping Information -

Address And Payment

-
- Shipping Information + @*@Html.EditorForModel()*@ +
+
+ Payment +

We're running a promotion: all music is free with the promo code: "FREE"

- @*@Html.EditorForModel()*@ -
-
- Payment -

We're running a promotion: all music is free with the promo code: "FREE"

+
+ @*@Html.Label("Promo Code")*@ +
+
+ @Html.TextBox("PromoCode") +
+
-
- @*@Html.Label("Promo Code")*@ -
-
- @Html.TextBox("PromoCode") -
-
- - -@*}*@ \ No newline at end of file + +} \ No newline at end of file diff --git a/src/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/Views/Shared/_LoginPartial.cshtml index 244c3ed7c2..b4c16d42e4 100644 --- a/src/MusicStore/Views/Shared/_LoginPartial.cshtml +++ b/src/MusicStore/Views/Shared/_LoginPartial.cshtml @@ -2,17 +2,17 @@ @if (Context.HttpContext.User != null && Context.HttpContext.User.Identity.IsAuthenticated) { - @*using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" })) + using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" })) { - @Html.AntiForgeryToken() + @*@Html.AntiForgeryToken()*@ - }*@ + } } else {