Permalink
Browse files

Search changed

  • Loading branch information...
1 parent ea6ca62 commit 4b03b370a28f13320fe2c51bfaaee969406d57df @ArtisOracle committed Apr 10, 2012
Showing with 1,939 additions and 1,722 deletions.
  1. BIN StudentAlumniTrackingTool/StudentAlumniTrackingTool.suo
  2. +15 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/LoginError.aspx
  3. +21 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/LoginError.aspx.cs
  4. +15 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/Account/LoginError.aspx.designer.cs
  5. +2 −2 StudentAlumniTrackingTool/StudentAlumniTrackingTool/Site.Master
  6. +13 −13 StudentAlumniTrackingTool/StudentAlumniTrackingTool/StudentAlumniTrackingTool.csproj
  7. +4 −1 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Delete.aspx.cs
  8. +0 −815 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Edit.aspx
  9. +0 −239 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Edit.aspx.cs
  10. +0 −591 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Edit.aspx.designer.cs
  11. +813 −20 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Profile.aspx
  12. +230 −5 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Profile.aspx.cs
  13. +555 −6 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Profile.aspx.designer.cs
  14. +1 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/Search.aspx.cs
  15. +9 −12 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx
  16. +17 −9 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.cs
  17. +176 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.cs.orig
  18. +0 −9 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.designer.cs
  19. +68 −0 StudentAlumniTrackingTool/StudentAlumniTrackingTool/WebPages/SearchResults.aspx.orig
Binary file not shown.
@@ -0,0 +1,15 @@
+<%@ Page Title="Register" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true"
+ CodeBehind="LoginError.aspx.cs" Inherits="StudentAlumniTrackingTool.Account.LoginError" %>
+
+<asp:Content ID="HeaderContent" runat="server" ContentPlaceHolderID="HeadContent">
+</asp:Content>
+<asp:Content ID="BodyContent" runat="server" ContentPlaceHolderID="MainContent">
+ <h2>Login Error Occured</h2>
+ <p>
+ An error occured during login. The most likely reason is because your user name or password
+ was entered incorrectly.
+ </p>
+ <p>
+ <a href="Login.aspx">Try again</a>.
+ </p>
+ </asp:Content>
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Security;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data.SqlClient;
+using System.Data.Sql;
+
+namespace StudentAlumniTrackingTool.Account
+{
+ public partial class RegisterError : System.Web.UI.Page
+ {
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
@@ -0,0 +1,15 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace StudentAlumniTrackingTool.Account {
+
+
+ public partial class LoginError {
+ }
+}
@@ -57,8 +57,8 @@
<asp:MenuItem NavigateUrl="~/Default.aspx" Text="Home"/>
<asp:MenuItem NavigateUrl="~/Account/Register.aspx" Text="Add"/>
<asp:MenuItem NavigateUrl="~/WebPages/Search.aspx" Text="Search"/>
- <asp:MenuItem NavigateUrl="~/WebPages/Edit.aspx" Text="Edit" />
- <asp:MenuItem NavigateUrl="~/WebPages/Delete.aspx" Text="Delete" />
+ <asp:MenuItem NavigateUrl="~/WebPages/Search.aspx" Text="Edit" />
+ <asp:MenuItem NavigateUrl="~/WebPages/Search.aspx" Text="Delete" />
<asp:MenuItem NavigateUrl="~/About.aspx" Text="About"/>
<asp:MenuItem NavigateUrl="~/Account/Logout.aspx" Text="Logout"/>
</Items>
@@ -52,6 +52,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="About.aspx" />
+ <Content Include="Account\LoginError.aspx" />
<Content Include="Account\RegisterError.aspx" />
<Content Include="Account\Success.aspx" />
<Content Include="Account\Logout.aspx" />
@@ -78,9 +79,8 @@
<Content Include="WebPages\DeleteAll.aspx" />
<Content Include="WebPages\Delete.aspx" />
<Content Include="WebPages\Error.aspx" />
- <Content Include="WebPages\Edit.aspx" />
- <Content Include="WebPages\SearchResults.aspx" />
<Content Include="WebPages\Profile.aspx" />
+ <Content Include="WebPages\SearchResults.aspx" />
<Content Include="WebPages\Search.aspx" />
</ItemGroup>
<ItemGroup>
@@ -91,6 +91,13 @@
<Compile Include="About.aspx.designer.cs">
<DependentUpon>About.aspx</DependentUpon>
</Compile>
+ <Compile Include="Account\LoginError.aspx.cs">
+ <DependentUpon>LoginError.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Account\LoginError.aspx.designer.cs">
+ <DependentUpon>LoginError.aspx</DependentUpon>
+ </Compile>
<Compile Include="Account\RegisterError.aspx.cs">
<DependentUpon>RegisterError.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -172,12 +179,12 @@
<Compile Include="WebPages\Error.aspx.designer.cs">
<DependentUpon>Error.aspx</DependentUpon>
</Compile>
- <Compile Include="WebPages\Edit.aspx.cs">
- <DependentUpon>Edit.aspx</DependentUpon>
+ <Compile Include="WebPages\Profile.aspx.cs">
+ <DependentUpon>Profile.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
- <Compile Include="WebPages\Edit.aspx.designer.cs">
- <DependentUpon>Edit.aspx</DependentUpon>
+ <Compile Include="WebPages\Profile.aspx.designer.cs">
+ <DependentUpon>Profile.aspx</DependentUpon>
</Compile>
<Compile Include="WebPages\SearchResults.aspx.cs">
<DependentUpon>SearchResults.aspx</DependentUpon>
@@ -186,13 +193,6 @@
<Compile Include="WebPages\SearchResults.aspx.designer.cs">
<DependentUpon>SearchResults.aspx</DependentUpon>
</Compile>
- <Compile Include="WebPages\Profile.aspx.cs">
- <DependentUpon>Profile.aspx</DependentUpon>
- <SubType>ASPXCodeBehind</SubType>
- </Compile>
- <Compile Include="WebPages\Profile.aspx.designer.cs">
- <DependentUpon>Profile.aspx</DependentUpon>
- </Compile>
<Compile Include="WebPages\Search.aspx.cs">
<DependentUpon>Search.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -27,8 +27,11 @@ protected void DeleteUser(object sender, CommandEventArgs e)
SqlConnection sqlCon = new SqlConnection();
string clientQueryStr = ClientQueryString;
+ // Run the query from here
sqlComm = new SqlCommand("");
- // Delete user
+ // sqlComm.doStuff();
+
+ // Redirect to success page. Great success.
Response.Redirect("Success.aspx");
}
Oops, something went wrong. Retry.

0 comments on commit 4b03b37

Please sign in to comment.