diff --git a/Action.html b/Action.html index 427eead..cc2acd1 100644 --- a/Action.html +++ b/Action.html @@ -45,7 +45,7 @@ - + @@ -87,39 +87,20 @@ -
+
+
+
+ ... +
+

Thumbnail label

+

...

+

+ Button + Button +

+
+
+
- - - - - - - - - - - diff --git a/CodePlay/Catalog.aspx b/CodePlay/Catalog.aspx index 7973249..5d4e10b 100644 --- a/CodePlay/Catalog.aspx +++ b/CodePlay/Catalog.aspx @@ -3,6 +3,7 @@ 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).v11.suo b/CodePlay/CodePlay.sln (2).v11.suo index 1a7d469..98c7d9f 100644 Binary files a/CodePlay/CodePlay.sln (2).v11.suo and b/CodePlay/CodePlay.sln (2).v11.suo differ diff --git a/CodePlay/CodePlay_AboutUs.aspx b/CodePlay/CodePlay_AboutUs.aspx new file mode 100644 index 0000000..c7e6a38 --- /dev/null +++ b/CodePlay/CodePlay_AboutUs.aspx @@ -0,0 +1,27 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Codeplay_MasterPage.master" AutoEventWireup="true" CodeFile="CodePlay_AboutUs.aspx.cs" Inherits="AboutUsCodePlay" %> + + + + +
+

CODEPLAYERS

+

We love GAMES!

+

AND THATS JUST WHAT WE ARE!!!

+
+
+
+

JASON


+ JASON'S PICTURE +
+
+

SETH


+ SETH'S IMAGE +
+
+

SHIVAM


+ SHIVAM'S PHOTO +
+
+
+ + diff --git a/CodePlay/CodePlay_AboutUs.aspx.cs b/CodePlay/CodePlay_AboutUs.aspx.cs new file mode 100644 index 0000000..7f5be1b --- /dev/null +++ b/CodePlay/CodePlay_AboutUs.aspx.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class AboutUsCodePlay : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} \ No newline at end of file diff --git a/CodePlay/CodePlay_Default.aspx b/CodePlay/CodePlay_Default.aspx new file mode 100644 index 0000000..4a9b576 --- /dev/null +++ b/CodePlay/CodePlay_Default.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Codeplay_MasterPage.master" AutoEventWireup="true" CodeFile="CodePlay_Default.aspx.cs" Inherits="DefaultCodePlay" %> + + + + + + + diff --git a/CodePlay/DefaultCodePlay.aspx.cs b/CodePlay/CodePlay_Default.aspx.cs similarity index 100% rename from CodePlay/DefaultCodePlay.aspx.cs rename to CodePlay/CodePlay_Default.aspx.cs diff --git a/CodePlay/CodeplayMasterPage.master b/CodePlay/Codeplay_MasterPage.master similarity index 87% rename from CodePlay/CodeplayMasterPage.master rename to CodePlay/Codeplay_MasterPage.master index 8205f36..2508433 100644 --- a/CodePlay/CodeplayMasterPage.master +++ b/CodePlay/Codeplay_MasterPage.master @@ -1,7 +1,8 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeFile="CodeplayMasterPage.master.cs" Inherits="CodeplayMasterPage" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeFile="Codeplay_MasterPage.master.cs" Inherits="CodeplayMasterPage" %> - +<%@ Register Src="UserControls/DepartmentsList.ascx" TagName="DepartmentsList" TagPrefix="uc2" %> + The CodePlay @@ -46,16 +47,16 @@ - +
- diff --git a/CodePlay/CodeplayMasterPage.master.cs b/CodePlay/Codeplay_MasterPage.master.cs similarity index 100% rename from CodePlay/CodeplayMasterPage.master.cs rename to CodePlay/Codeplay_MasterPage.master.cs diff --git a/CodePlay/Default.aspx b/CodePlay/Default.aspx index a29a1b1..6f01969 100644 --- a/CodePlay/Default.aspx +++ b/CodePlay/Default.aspx @@ -2,7 +2,7 @@ <%@ Register Src="UserControls/ProductsList.ascx" TagName="ProductsList" TagPrefix="uc1" %> - Welcome to BalloonShop! + Welcome to BalloonShop!
This week we have a special price for these fantastic products:
diff --git a/CodePlay/DefaultCodePlay.aspx b/CodePlay/DefaultCodePlay.aspx deleted file mode 100644 index dacc565..0000000 --- a/CodePlay/DefaultCodePlay.aspx +++ /dev/null @@ -1,22 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/CodeplayMasterPage.master" AutoEventWireup="true" CodeFile="DefaultCodePlay.aspx.cs" Inherits="DefaultCodePlay" %> - -<%@ Register Src="UserControls/CartSummary.ascx" TagName="CartSummary" TagPrefix="uc6" %> -<%@ Register Src="UserControls/UserInfo.ascx" TagName="UserInfo" TagPrefix="uc5" %> -<%@ Register Src="UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="uc4" %> -<%@ Register Src="UserControls/CategoriesList.ascx" TagName="CategoriesList" TagPrefix="uc3" %> -<%@ Register Src="UserControls/DepartmentsList.ascx" TagName="DepartmentsList" TagPrefix="uc2" %> - - - - - -
- -
- - - -
- - - diff --git a/jason.jpg b/CodePlay/Images/jason.jpg similarity index 100% rename from jason.jpg rename to CodePlay/Images/jason.jpg diff --git a/CodePlay/Images/logo.jpg b/CodePlay/Images/logo.jpg new file mode 100644 index 0000000..1332530 Binary files /dev/null and b/CodePlay/Images/logo.jpg differ diff --git a/seth.jpg b/CodePlay/Images/seth.jpg similarity index 100% rename from seth.jpg rename to CodePlay/Images/seth.jpg diff --git a/shiv.jpg b/CodePlay/Images/shiv.jpg similarity index 100% rename from shiv.jpg rename to CodePlay/Images/shiv.jpg diff --git a/CodePlay/UserControls/DepartmentsList.ascx b/CodePlay/UserControls/DepartmentsList.ascx index 3962006..7c69cdd 100644 --- a/CodePlay/UserControls/DepartmentsList.ascx +++ b/CodePlay/UserControls/DepartmentsList.ascx @@ -1,19 +1,17 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="DepartmentsList.ascx.cs" Inherits="DepartmentsList" %> - - -

>>

 » - - -  « - - - Choose a Department - - - + + + +
  • + + +
    • +     +     + diff --git a/AboutUs b/Done-Made/AboutUs similarity index 100% rename from AboutUs rename to Done-Made/AboutUs diff --git a/AboutUs.html b/Done-Made/AboutUs.html similarity index 100% rename from AboutUs.html rename to Done-Made/AboutUs.html diff --git a/GamePage.html b/Done-Made/GamePage.html similarity index 100% rename from GamePage.html rename to Done-Made/GamePage.html diff --git a/Done-Made/jason.jpg b/Done-Made/jason.jpg new file mode 100644 index 0000000..679adf0 Binary files /dev/null and b/Done-Made/jason.jpg differ diff --git a/Done-Made/seth.jpg b/Done-Made/seth.jpg new file mode 100644 index 0000000..d7f10d9 Binary files /dev/null and b/Done-Made/seth.jpg differ diff --git a/Done-Made/shiv.jpg b/Done-Made/shiv.jpg new file mode 100644 index 0000000..308521f Binary files /dev/null and b/Done-Made/shiv.jpg differ diff --git a/template.html b/Done-Made/template.html similarity index 100% rename from template.html rename to Done-Made/template.html diff --git a/Thumbs.db b/Thumbs.db new file mode 100644 index 0000000..1c0d756 Binary files /dev/null and b/Thumbs.db differ diff --git a/logo.jpg b/logo.jpg index 964385a..1332530 100644 Binary files a/logo.jpg and b/logo.jpg differ