diff --git a/CodePlay/App_Data/PublishProfiles/codeplay.pubxml b/CodePlay/App_Data/PublishProfiles/codeplay.pubxml new file mode 100644 index 0000000..eb193b8 --- /dev/null +++ b/CodePlay/App_Data/PublishProfiles/codeplay.pubxml @@ -0,0 +1,17 @@ + + + + + FileSystem + Debug + Any CPU + + True + False + C:\Users\Seth\Desktop + False + + \ No newline at end of file diff --git a/CodePlay/Catalog.aspx b/CodePlay/Catalog.aspx index c12bee3..f33e10c 100644 --- a/CodePlay/Catalog.aspx +++ b/CodePlay/Catalog.aspx @@ -1,16 +1,23 @@ -<%@ Page Language="C#" MasterPageFile="~/BalloonShop.master" +<%@ Page Language="C#" MasterPageFile="~/Codeplay_MasterPage.master" AutoEventWireup="true" CodeFile="Catalog.aspx.cs" Inherits="Catalog" Title="BalloonShop - The Product Catalog" %> <%@ Register Src="UserControls/ProductsList.ascx" TagName="ProductsList" TagPrefix="uc1" %> - +

- -
- + +
+ +
+ + + +
+ +
diff --git a/CodePlay/CodePlay.sln (2).sln b/CodePlay/CodePlay.sln (2).sln index f589021..2ce7688 100644 --- a/CodePlay/CodePlay.sln (2).sln +++ b/CodePlay/CodePlay.sln (2).sln @@ -1,8 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "CodePlay", ".", "{F06B9C36-63FE-475E-A3EE-3B96394673A3}" +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "CodePlay(1)", "http://localhost:63658", "{F06B9C36-63FE-475E-A3EE-3B96394673A3}" ProjectSection(WebsiteProperties) = preProject + UseIISExpress = "true" TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5" Debug.AspNetCompiler.VirtualPath = "/CodePlay" Debug.AspNetCompiler.PhysicalPath = "..\CodePlay\" @@ -18,7 +19,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "CodePlay", ".", "{F06B9C36- Release.AspNetCompiler.ForceOverwrite = "true" Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" - VWDPort = "63658" + SlnRelativePath = "..\CodePlay\" EndProjectSection EndProject Global diff --git a/CodePlay/CodePlay.sln (2).v11.suo b/CodePlay/CodePlay.sln (2).v11.suo index 9994155..2c5e599 100644 Binary files a/CodePlay/CodePlay.sln (2).v11.suo and b/CodePlay/CodePlay.sln (2).v11.suo differ diff --git a/CodePlay/CodePlay_Default.aspx b/CodePlay/CodePlay_Default.aspx deleted file mode 100644 index 91e7679..0000000 --- a/CodePlay/CodePlay_Default.aspx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Codeplay_MasterPage.master" AutoEventWireup="true" CodeFile="CodePlay_Default.aspx.cs" Inherits="DefaultCodePlay" %> - - - - - - - - - diff --git a/CodePlay/Codeplay_MasterPage.master b/CodePlay/Codeplay_MasterPage.master index b19f63f..2d7600f 100644 --- a/CodePlay/Codeplay_MasterPage.master +++ b/CodePlay/Codeplay_MasterPage.master @@ -2,6 +2,7 @@ <%@ Register Src="UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="uc4" %> <%@ Register Src="UserControls/DepartmentsList.ascx" TagName="DepartmentsList" TagPrefix="uc2" %> +<%@ Register Src="UserControls/CategoriesList.ascx" TagName="CategoriesList" TagPrefix="uc3" %> @@ -55,21 +56,21 @@