Test

....
SethKaminski · Dec 17, 2015 · f57d7f2 · f57d7f2
1 parent e5876d6
commit f57d7f2
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 43 deletions.
diff --git a/CodePlay/BalloonShop.master b/CodePlay/BalloonShop.master
@@ -22,8 +22,7 @@
           <uc2:DepartmentsList ID="DepartmentsList1" runat="server" />
           <br />
           <uc3:CategoriesList ID="CategoriesList1" runat="server" />
-          <uc4:SearchBox id="SearchBox1" runat="server">
-          </uc4:SearchBox>
+          <uc4:SearchBox id="SearchBox1" runat="server"></uc4:SearchBox>
           <br />
           <uc6:CartSummary ID="CartSummary1" runat="server" />
         </td>

diff --git a/CodePlay/CodePlay.sln (2).v11.suo b/CodePlay/CodePlay.sln (2).v11.suo
diff --git a/CodePlay/CodePlay_Default.aspx b/CodePlay/CodePlay_Default.aspx
@@ -1,7 +1,9 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/Codeplay_MasterPage.master" AutoEventWireup="true" CodeFile="CodePlay_Default.aspx.cs" Inherits="DefaultCodePlay" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
+
 </asp:Content>
+
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
 
 </asp:Content>

diff --git a/CodePlay/Codeplay_MasterPage.master b/CodePlay/Codeplay_MasterPage.master
@@ -1,5 +1,6 @@
 <%@ Master Language="C#" AutoEventWireup="true" CodeFile="Codeplay_MasterPage.master.cs" Inherits="CodeplayMasterPage" %>
 
+<%@ Register Src="UserControls/SearchBox.ascx" TagName="SearchBox" TagPrefix="uc4" %>
 <%@ Register Src="UserControls/DepartmentsList.ascx" TagName="DepartmentsList" TagPrefix="uc2" %>
 
 <!DOCTYPE html>
@@ -37,6 +38,7 @@
     </asp:ContentPlaceHolder>
 </head>
 <body>
+    <form id="form2" runat="server">
     <nav class="navbar navbar-default">
         <div class="container-fluid">
             <!-- Brand and toggle get grouped for better mobile display -->
@@ -69,12 +71,14 @@
                         </ul>
                     </li>
                 </ul>
-                <form class="navbar-form navbar-left" role="search">
-                    <div class="form-group">
+                <div class="navbar-form navbar-left" role="search">
+                    <!--<div class="form-group">
                         <input type="text" class="form-control" placeholder="Search">
                     </div>
-                    <button type="submit" class="btn btn-default">Search Game</button>
-                </form>
+                    <button type="submit" class="btn btn-default">Search Game</button>-->
+
+                    <uc4:SearchBox id="SearchBox1" runat="server"></uc4:SearchBox>
+                </div>
                 <ul class="nav navbar-nav navbar-right">
                     <li><a href="#">YOUR CART</a></li>
                     <li class="dropdown">
@@ -88,11 +92,12 @@
         <!-- /.container-fluid -->
     </nav>
 
-    <form id="form2" runat="server">
+
     <div>
         <asp:ContentPlaceHolder id="ContentPlaceHolder2" runat="server">
 
         </asp:ContentPlaceHolder>
+
     </div>
     </form>
 </body>

diff --git a/CodePlay/MasterTest.aspx b/CodePlay/MasterTest.aspx
diff --git a/CodePlay/MasterTest.aspx.cs b/CodePlay/MasterTest.aspx.cs
diff --git a/CodePlay/UserControls/SearchBox.ascx b/CodePlay/UserControls/SearchBox.ascx
@@ -1,15 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeFile="SearchBox.ascx.cs" Inherits="SearchBox" %>
-<table border="0" cellpadding="0" cellspacing="0" width="200px">
-  <tr>
-    <td class="SearchBoxHead">
-      Search the Catalog
-    </td>
-  </tr>
-  <tr>
-    <td class="SearchBoxContent">
-      <asp:TextBox ID="searchTextBox" Runat="server" Width="128px" CssClass="SearchBox" BorderStyle="Dotted" MaxLength="100" Height="16px" />
-      <asp:Button ID="goButton" Runat="server" CssClass="SearchBox" Text="Go!" Width="36px" Height="21px" OnClick="goButton_Click" /><br />
-      <asp:CheckBox ID="allWordsCheckBox" CssClass="SearchBox" Runat="server" Text="Search for all words" />
-    </td>
-  </tr>
-</table>
+
+<div class="form-group">
+    <asp:TextBox ID="searchTextBox" Runat="server" type="text" class="form-control" placeholder="Search"/>
+</div>
+<asp:Button ID="goButton" Runat="server" class="btn btn-default" Text="Search Game" OnClick="goButton_Click" />
+<asp:CheckBox ID="allWordsCheckBox" CssClass="SearchBox" Runat="server" Text="Search for all words" />