Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paul #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions WorkshopASPNet/About.aspx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="WorkshopASPNet.About" %>
<%@ Page Title="This Page is about Paul" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="About.aspx.cs" Inherits="WorkshopASPNet.About" %>

<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
<h2><%: Title %>.</h2>
<h3>Your application description page.</h3>
<p>Use this area to provide additional information.</p>
<h3>Hello this is Paul.</h3>
<p>More about Paul.</p>
</asp:Content>
11 changes: 5 additions & 6 deletions WorkshopASPNet/Contact.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

<asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
<h2><%: Title %>.</h2>
<h3>Your contact page.</h3>
<h3>Paul's Contact Page</h3>
<address>
One Microsoft Way<br />
Redmond, WA 98052-6399<br />
Level 8, 1 Castlereagh Street<br />
Sydney, NSW 2000<br />
<abbr title="Phone">P:</abbr>
425.555.0100
0800 Wrong Number
</address>

<address>
<strong>Support:</strong> <a href="mailto:[email protected]">[email protected]</a><br />
<strong>Marketing:</strong> <a href="mailto:[email protected]">[email protected]</a>
<strong>Email:</strong> <a href="mailto:[email protected]">[email protected]</a><br />
</address>
</asp:Content>
1 change: 1 addition & 0 deletions WorkshopASPNet/Site.Master
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
</asp:ContentPlaceHolder>
<hr />
<footer>
<p>This is a custom footer. So exciting.</p>
<p>&copy; <%: DateTime.Now.Year %> - My ASP.NET Application</p>
</footer>
</div>
Expand Down
21 changes: 5 additions & 16 deletions WorkshopASPNet/Site.Master.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.