Renamed OpenIdButtonPanel to OpenIdSelector.

3 files changed, 17 insertions, 17 deletions

diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx
index 3d722d3..56e2de8 100644
--- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx
+++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx
@@ -36,17 +36,17 @@
 		<p>
 			Login with an account you already use!
 		</p>
-		<rp:OpenIdButtonPanel runat="server" ID="openIdButtonPanel" OnLoggedIn="openIdButtonPanel_LoggedIn"
-			OnFailed="openIdButtonPanel_Failed" OnCanceled="openIdButtonPanel_Failed" OnReceivedToken="openIdButtonPanel_ReceivedToken"
-			OnTokenProcessingError="openIdButtonPanel_TokenProcessingError">
-			<Providers>
-				<rp:ProviderInfo OPIdentifier="https://me.yahoo.com/" Image="images/yahoo.gif" />
-				<rp:ProviderInfo OPIdentifier="https://www.google.com/accounts/o8/id" Image="images/google.gif" />
-				<rp:ProviderInfo OPIdentifier="https://www.myopenid.com/" Image="images/myopenid.png" />
-				<rp:ProviderInfo OPIdentifier="https://pip.verisignlabs.com/" Image="images/verisign.gif" />
-				<rp:ProviderInfo Image="images/openid.gif" />
-			</Providers>
-		</rp:OpenIdButtonPanel>
+		<rp:OpenIdSelector runat="server" ID="openIdSelector" OnLoggedIn="openIdSelector_LoggedIn"
+			OnFailed="openIdSelector_Failed" OnCanceled="openIdSelector_Failed" OnReceivedToken="openIdSelector_ReceivedToken"
+			OnTokenProcessingError="openIdSelector_TokenProcessingError">
+			<Buttons>
+				<rp:SelectorButton OPIdentifier="https://me.yahoo.com/" Image="images/yahoo.gif" />
+				<rp:SelectorButton OPIdentifier="https://www.google.com/accounts/o8/id" Image="images/google.gif" />
+				<rp:SelectorButton OPIdentifier="https://www.myopenid.com/" Image="images/myopenid.png" />
+				<rp:SelectorButton OPIdentifier="https://pip.verisignlabs.com/" Image="images/verisign.gif" />
+				<rp:SelectorButton Image="images/openid.gif" />
+			</Buttons>
+		</rp:OpenIdSelector>
 		<asp:HiddenField runat="server" ID="topWindowUrl" />
 		<asp:Panel ID="errorPanel" runat="server" EnableViewState="false" Visible="false" ForeColor="Red">
 			Oops. Something went wrong while logging you in. Trying again may work. <a href="#" onclick="$('#errorMessage').show()">
diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.cs b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.cs
index 66ba529..2528b36 100644
--- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.cs
+++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.cs
@@ -25,22 +25,22 @@
 			}
 		}
 
-		protected void openIdButtonPanel_LoggedIn(object sender, OpenIdEventArgs e) {
+		protected void openIdSelector_LoggedIn(object sender, OpenIdEventArgs e) {
 			this.LoginUser(e.ClaimedIdentifier, e.Response.FriendlyIdentifierForDisplay, e.Response.GetExtension<ClaimsResponse>());
 		}
 
-		protected void openIdButtonPanel_ReceivedToken(object sender, DotNetOpenAuth.InfoCard.ReceivedTokenEventArgs e) {
+		protected void openIdSelector_ReceivedToken(object sender, DotNetOpenAuth.InfoCard.ReceivedTokenEventArgs e) {
 			this.LoginUser(AuthenticationToken.SynthesizeClaimedIdentifierFromInfoCard(e.Token.UniqueId), e.Token.SiteSpecificId, null);
 		}
 
-		protected void openIdButtonPanel_Failed(object sender, OpenIdEventArgs e) {
+		protected void openIdSelector_Failed(object sender, OpenIdEventArgs e) {
 			if (e.Response.Exception != null) {
-				errorMessageLabel.Text = e.Response.Exception.Message;
+				this.errorMessageLabel.Text = e.Response.Exception.Message;
 			}
 			this.errorPanel.Visible = true;
 		}
 
-		protected void openIdButtonPanel_TokenProcessingError(object sender, TokenProcessingErrorEventArgs e) {
+		protected void openIdSelector_TokenProcessingError(object sender, TokenProcessingErrorEventArgs e) {
 			this.errorMessageLabel.Text = e.Exception.Message;
 			this.errorPanel.Visible = true;
 		}
diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
index 5d0a0c9..2a24524 100644
--- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
@@ -29,7 +29,7 @@ namespace WebFormsRelyingParty {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdButtonPanel openIdButtonPanel;
+        protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdSelector openIdButtonPanel;
         
         /// <summary>
         /// topWindowUrl control.