Project starter template's accountinfo.aspx page now uses the OpenIdSelector so the user has a consistent interface.

3 files changed, 34 insertions, 45 deletions

diff --git a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
index 46040ff..fe99b75 100644
--- a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
@@ -6,6 +6,19 @@
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.InfoCard" TagPrefix="ic" %>
 <%@ Register Assembly="System.Web.Entity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
 	Namespace="System.Web.UI.WebControls" TagPrefix="asp" %>
+<asp:Content runat="server" ContentPlaceHolderID="head">
+<% if (Request.Url.IsLoopback) { %>
+	<script type="text/javascript" src="../scripts/jquery-1.3.1.js"></script>
+	<script type="text/javascript" src="../scripts/jquery-ui-personalized-1.6rc6.js"></script>
+<% } else { %>
+	<script type="text/javascript" language="javascript" src="http://www.google.com/jsapi"></script>
+	<script type="text/javascript" language="javascript">
+		google.load("jquery", "1.3.2");
+		google.load("jqueryui", "1.7.2");
+	</script>
+<% } %>
+	<script type="text/javascript" src="../scripts/jquery.cookie.js"></script>
+</asp:Content>
 <asp:Content runat="server" ContentPlaceHolderID="Body">
 	<asp:ScriptManager ID="ScriptManager1" runat="server" />
 	<h3>
@@ -82,18 +95,22 @@
 			</ul>
 		</FooterTemplate>
 	</asp:Repeater>
-	<asp:Panel ID="Panel1" runat="server">
-		<rp:OpenIdAjaxTextBox runat="server" ID="openIdBox" OnLoggedIn="openIdBox_LoggedIn"
-			AutoPostBack="true" />
-		<asp:Label ID="differentAccountLabel" runat="server" EnableViewState="False" ForeColor="Red"
-			Text="This identifier already belongs to a different user account." Visible="False" />
-		<asp:Label ID="alreadyLinkedLabel" runat="server" EnableViewState="False" ForeColor="Red"
-			Text="This identifier is already linked to your account." Visible="False" />
-	</asp:Panel>
-	<asp:Panel ID="Panel2" runat="server">
-		<ic:InfoCardSelector ID="InfoCardSelector1" runat="server" ImageSize="Size92x64"
-			ToolTip="Log in with your Information Card" OnReceivedToken="InfoCardSelector1_ReceivedToken">
-			<ic:ClaimType Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" />
-		</ic:InfoCardSelector>
-	</asp:Panel>
+	<div>
+		<p>
+			Add a way to log into your account:
+		</p>
+		<rp:OpenIdSelector runat="server" ID="openIdSelector" OnLoggedIn="openIdBox_LoggedIn"
+			OnReceivedToken="InfoCardSelector1_ReceivedToken">
+			<Buttons>
+				<rp:SelectorProviderButton OPIdentifier="https://me.yahoo.com/" Image="~/images/yahoo.gif" />
+				<rp:SelectorProviderButton OPIdentifier="https://www.google.com/accounts/o8/id" Image="~/images/google.gif" />
+				<rp:SelectorInfoCardButton />
+				<rp:SelectorOpenIdButton Image="~/images/openid.gif" />
+			</Buttons>
+		</rp:OpenIdSelector>
+	</div>
+	<asp:Label ID="differentAccountLabel" runat="server" EnableViewState="False" ForeColor="Red"
+		Text="This identifier already belongs to a different user account." Visible="False" />
+	<asp:Label ID="alreadyLinkedLabel" runat="server" EnableViewState="False" ForeColor="Red"
+		Text="This identifier is already linked to your account." Visible="False" />
 </asp:Content>
diff --git a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
index f35a0ce..f1a40f7 100644
--- a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.cs
@@ -30,7 +30,6 @@ namespace WebFormsRelyingParty.Members {
 
 		protected void openIdBox_LoggedIn(object sender, OpenIdEventArgs e) {
 			this.AddIdentifier(e.ClaimedIdentifier, e.Response.FriendlyIdentifierForDisplay);
-			this.openIdBox.Focus();
 		}
 
 		protected void deleteOpenId_Command(object sender, CommandEventArgs e) {
@@ -69,7 +68,7 @@ namespace WebFormsRelyingParty.Members {
 				this.Repeater1.DataBind();
 
 				// Clear the box for the next entry
-				this.openIdBox.Text = string.Empty;
+				this.openIdSelector.Identifier = null;
 			} else {
 				if (existingToken.User == Global.LoggedInUser) {
 					this.alreadyLinkedLabel.Visible = true;
diff --git a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
index c3f5b15..b7f43ce 100644
--- a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
@@ -95,22 +95,13 @@ namespace WebFormsRelyingParty.Members {
         protected global::System.Web.UI.WebControls.Repeater Repeater1;
         
         /// <summary>
-        /// Panel1 control.
+        /// openIdSelector control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel Panel1;
-        
-        /// <summary>
-        /// openIdBox control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdAjaxTextBox openIdBox;
+        protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdSelector openIdSelector;
         
         /// <summary>
         /// differentAccountLabel control.
@@ -129,23 +120,5 @@ namespace WebFormsRelyingParty.Members {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label alreadyLinkedLabel;
-        
-        /// <summary>
-        /// Panel2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Panel Panel2;
-        
-        /// <summary>
-        /// InfoCardSelector1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::DotNetOpenAuth.InfoCard.InfoCardSelector InfoCardSelector1;
     }
 }