From f57d7f2239cce033af5cc296b4cb33b1c568499b Mon Sep 17 00:00:00 2001 From: Seth Kaminski Date: Thu, 17 Dec 2015 16:24:41 -0500 Subject: [PATCH] Test .... --- CodePlay/BalloonShop.master | 3 +-- CodePlay/CodePlay.sln (2).v11.suo | Bin 46080 -> 44544 bytes CodePlay/CodePlay_Default.aspx | 2 ++ CodePlay/Codeplay_MasterPage.master | 15 ++++++++++----- CodePlay/MasterTest.aspx | 8 -------- CodePlay/MasterTest.aspx.cs | 14 -------------- CodePlay/UserControls/SearchBox.ascx | 20 ++++++-------------- 7 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 CodePlay/MasterTest.aspx delete mode 100644 CodePlay/MasterTest.aspx.cs diff --git a/CodePlay/BalloonShop.master b/CodePlay/BalloonShop.master index 0d267d4..62073ee 100644 --- a/CodePlay/BalloonShop.master +++ b/CodePlay/BalloonShop.master @@ -22,8 +22,7 @@
- - +
diff --git a/CodePlay/CodePlay.sln (2).v11.suo b/CodePlay/CodePlay.sln (2).v11.suo index 98c7d9f1ceeaaf9a41da884ad0af06dbd5ab2aa6..e0cf32dc96e9e532b0aad0d92fb3bba4c3a3e8bd 100644 GIT binary patch delta 3650 zcmb_fdr*|u760zKyDqQ`iy-onR}itnvdd#xlr2@B4& z4j3bQd?a9vAx$!AY(ziXWKyl`D?Vy#aQvgw@sCbxXIiJzI-M}Bw2}VKx9kQ|P12cs z%YL0HpX+NjGR*~#6f~0Ap`A_2G9c$fEtJaSZ^NMSRfAI#S;OR zFGN_Kx&o1du%hU!E><|u%OQ1$QBwh(GKz~!9<0CS4b|xadm&?JqM8R}o)b$eLbKGz zph;b!`R0Jidk_Trr_etQ$iN4{&w!r;?*nu1`+1Ka{W z2F3t#hIP@ssKmjInIn3YH_avXkUOoKS=KTye-Sj12GUb3o%(M2}7<7ix zM8t%sqH$x7s3dn}wL!2#!ZbztB+~dN3)CG3!*A;OdPtwHHiE%Ldbr?eJ)fr; z*fqF@SoW1g+L@`R^8J{ELB)J#%Xt*+(<%f$_34`FPj8A6Js)XE&l^DtMnp#uI zCzfk~jIs9;mtn9RumcW&IV_!O$rzVt4AfgSgf##a$EE98xE_ON0C{`%K_QY!# zoO(XeDddyFM7zNB)fRT{9!2SCG*<-3$Vh)Y6DKLq1dWJMneqc+o1lq_Vu>`i2lQ zSXNa=(8L1&oqQh2>=7rCx*qYKlC2Zib2AF0M#q^CL`1IeTmEXAc9~=%XFBpkIRB@9 zLX`S}{Z~$AY%rNsu;PT0O_QnT+v;=4lts=TmBh?{Vq##llb*|4OJ^)ebkDp?zHND4 z(C;fUsXecq%+YE1A>kzKRg@lBbrf1?7RTs96j&?j z$2Fslral?IFEvUZQ$nMOJaucx(U_z6VT)k^?lnO<>(YcudGDm&#+~90R9mn%`V`r; zmP<{NmP+|}@0Q9Xvt*S@q$1ELHY_J!lW(fTOoEzgI_MA89{J8%trA`Gmu!$GP0x_I z&a9RG&n^Cdw@Bu7sk}joZORZ5r8Y%TZBsPgb&uJue7;Et@-+XW%z+pR5Q7B~Iq(_c zz{sZb@+GH~D-}Xkf^m@|<9CTv3hi>t*rYtPQ&=Z{V)zo#N>{0OdmlA@uUuT7>KQ^h zTQ_xV-rC&OMgQE9P2R2N#4j;7K>aV|lV|%Cdb#!e2+k*(uG2VTMinf<0a%HQg+@oof8o*2=iqOR$paZFt@LbaAHdJ=>cjD>p zhJzJOM4N|-VfM=K&Q{ndf)z8AkLdHzW3Fw=tVO9V2i{KblMCx|XxOIMcESfsY_Mmx zE$Eftk9}E`IcB>6v-!$wA$n%ab6yJ-?#m^M!gg(oDeT!G+cS8a7Wfx%{}{G|UcM%_ zH_v3dtGj!5L1CUHx3n-X+nQ_6&CV|>D+(mL%wcg@ou!s?>kG5qUi18)v}2L`&q>Fx zM`YahUr3Kn8};-$PVe>z=Ka%mqYw%YCKeYFN z4eK@YdLe=J1pZTqqSt!jXvbib?0NmRkZ-?a5*nsz7L9p-B$m*Ht&8ZiH;w-GW)y#^ z$eO`+5n*X5FmKA+q$slUiT#V|ty7ciAHD!Bb(XnzE?KTPhM@O2Se+reaJ)cLk)D} a=uT=mx`iGMZ=n;zwX|xuS^nUpPW%_J-mbv_ delta 3971 zcmdT{ZBSI#8NTPT3(J1M5>P&c1;IdIVb|Tj!Z^AMyI@la+MqGU628?&gd!W!pe&G? zq(sBAukARU#w4V_(vli(64N#|2x(fK)(mFJ`zZ4FK*&0PcTlR8OzX-{-!c5t6 zR$RB|+TXP0bHW1m)K)q!9~X->FAs=clRv7?Bobhc1~5aI=1jS!U!kJ|xTKQM+-)+V z#g;4}6DuT(bbe-RK%a-1R_a95dVtwbAU`ELf5lO>QgbjDEBeJi8K&7tS2ek!j){}Y zmrr}N&oOzONj^ugevsG^Z;eO{`h#g{g*8W7EYR z%w0$pjb^OjyCJ0R9GESj!8h9EQ1%g0?AZ^zdX;cyW^iJCk;F$nk0)7ab z2VMpy0R@PRdTpgmSM`>Ar_i|sOan6j2mK87+rZC(UjVZJ+kc7rUEn=RFeH-K(3kfy zdVd7|1pFEJ1egc@0(=UnOOEZ#8aK+JoEe&_3{cg^L8B3_TtJlwS1EcNooR^{;}=Ce z&6@{s%>INrlf);Gz9x`9NiZ9SU|1`Wh9x4KK4n>oT77;*lcIf0;QMgjNt;&?^D3Yc z#+cXFw10y38^A^2r@))Q6c93`WUrOz9oSeRp5r~#?*o@rscH?~);mdc9nlLbqnE~Z zCXXk{Aqymnw$s$(8oF+&HS+D+2t;I~-t2k~hE~~VqAUEkjSoZ=C0s85N#xY%WEgI&Sb6!DC#Y3VkQUPa8eNb0 z?NPL7zR$P`O@19B!*6@6z3CZbE^->95NujI;1%+x4Ty6zpB6TR;Aj9)C|u?vZ@f)h zCVwV!6EDPzaN*n}-luuj{kqlHkWKH9KkF$9q?^ec*CxiuABTaQsUq2l2S&SL=m7ha zS(D(Mn}Nuz(X7vsfflo7|E+V;s^>xr8^3I{V5DZvRN^i2y9dPUG>_*6^5+d0`1-W~ zC=@RA-K@oHsunM@7TR-&YETyP?i0*JY$gBQbu=T}V|kG#PD}sURWL@b0$%~;P{A2N z(+}-c_STFD`mp#T#cL~;LoTnXJyI)c&ncG`;-YGQV;Cf&vd#Q}vD_rKj|1!B*N-QLFUqXymIxJ6kOjXxK?M zIR>w65<}^!Kp;jb)jLLR7i3JsXx^K^e=6CPBeeXKpA^*CkVAjiwVC2~o8uprI;Cdm zh}0{!OFdFIjXBndLy?HoHds60_e+NmQLILGOMOyHB*Jh|9lsxON2qSso-bt89`Pw% z+SMipZ*1-O?zHS~Y^Y0W1Nl~vKY}eBR5!Z3jaI3Te2u&5N>55uTf0PJc-#2Hg4|8# zYkZPja!NL&w=$%*dnGIS9@KWUoYH1k%g}Nm_1V$0qG!iHm*kL2@pMVmu#`)cbn$@# zYHE&7bzzojjORH@)v;BG@=8^7YQ=opP{YwvFE>FsPkOxIc* zlzHT$P&mSKw7sRcwd-)l!TtUHk5zjdRbGePXDxS?Ra%`+hsRo8>9Skxu2Q?r>2rBK zRrVA7P5^2-=w4kpDn|11%CzukB3*rCmJCOKd&{-i-|C;8?36_zYx70v+S#=~M*X@) z87SPIL6%1o|F0GO(&S?SLC^P8P|1O>-~@(o`Zdd^{K)4&<&^_otx_cQzNY#Q1=v4ze)zJ;a+18V;5ZcL^Vje5YSTxf2#=6VA3}F>X3{22DejSq=m+Z+|>N_%+T<7jQX?7%P(niXvjTzVooS?&z1uK*I)IwlM$xmQ^}r7D$H#4Na85qiBQO;C-Xqf;W9M tnn=M38)lDJ0xz5sN+Y%D=*7JCu;$a$gj@A;#Ak8MWcio=wedFD{0{<1yZ- + + diff --git a/CodePlay/Codeplay_MasterPage.master b/CodePlay/Codeplay_MasterPage.master index 2508433..b19f63f 100644 --- 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" %> @@ -37,6 +38,7 @@ +
- +
+
diff --git a/CodePlay/MasterTest.aspx b/CodePlay/MasterTest.aspx deleted file mode 100644 index fab28da..0000000 --- a/CodePlay/MasterTest.aspx +++ /dev/null @@ -1,8 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/CodePlay.master" AutoEventWireup="true" CodeFile="MasterTest.aspx.cs" Inherits="MasterTest" %> - - - - -

Test

- - diff --git a/CodePlay/MasterTest.aspx.cs b/CodePlay/MasterTest.aspx.cs deleted file mode 100644 index ff08641..0000000 --- a/CodePlay/MasterTest.aspx.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -public partial class MasterTest : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} \ No newline at end of file diff --git a/CodePlay/UserControls/SearchBox.ascx b/CodePlay/UserControls/SearchBox.ascx index 4aa609a..0b918cc 100644 --- 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" %> - - - - - - - -
- Search the Catalog -
- -
- -
+ +
+ +
+ +