summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2012-01-30 17:56:31 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2012-01-30 17:56:31 -0800
commit4185e8eb532939d1879dfd9e256db413c699f626 (patch)
tree52995f36cd89349660fdeaf1e589a4e3253af1e9
parentbc604dc63cfd2a83b1db4fa80f47e0e2546b1846 (diff)
downloadDotNetOpenAuth-4185e8eb532939d1879dfd9e256db413c699f626.zip
DotNetOpenAuth-4185e8eb532939d1879dfd9e256db413c699f626.tar.gz
DotNetOpenAuth-4185e8eb532939d1879dfd9e256db413c699f626.tar.bz2
Fixed OpenIdInfoCardSelector control on project template.v4.0.0.12030-Beta1
-rw-r--r--projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs5
-rw-r--r--projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx9
-rw-r--r--projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs2
3 files changed, 8 insertions, 8 deletions
diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
index 469b8a6..c16954c 100644
--- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -29,7 +28,7 @@ namespace WebFormsRelyingParty {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
- protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdSelector openIdSelector;
+ protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdInfoCardSelector openIdSelector;
/// <summary>
/// topWindowUrl control.
diff --git a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
index 8d17865..1f0b0e8 100644
--- a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx
@@ -6,6 +6,7 @@
<%@ Register Assembly="DotNetOpenAuth.InfoCard.UI" 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" %>
+<%@ Register Assembly="DotNetOpenAuth.OpenIdInfoCard.UI" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rpic" %>
<asp:Content runat="server" ContentPlaceHolderID="head">
<% if (Request.Url.IsLoopback) { %>
<script type="text/javascript" src="../scripts/jquery-1.3.1.js"></script>
@@ -130,17 +131,17 @@
<p>
Add a way to log into your account:
</p>
- <rp:OpenIdSelector runat="server" ID="openIdSelector" OnLoggedIn="openIdBox_LoggedIn"
+ <rpic:OpenIdInfoCardSelector 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>
+ <rpic:SelectorInfoCardButton>
<InfoCardSelector Issuer="" />
- </rp:SelectorInfoCardButton>
+ </rpic:SelectorInfoCardButton>
<rp:SelectorOpenIdButton Image="~/images/openid.png" />
</Buttons>
- </rp:OpenIdSelector>
+ </rpic:OpenIdInfoCardSelector>
</div>
<asp:Label ID="differentAccountLabel" runat="server" EnableViewState="False" ForeColor="Red"
Text="This identifier already belongs to a different user account." Visible="False" />
diff --git a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
index 100b794..77edab7 100644
--- a/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
+++ b/projecttemplates/WebFormsRelyingParty/Members/AccountInfo.aspx.designer.cs
@@ -136,7 +136,7 @@ namespace WebFormsRelyingParty.Members {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
- protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdSelector openIdSelector;
+ protected global::DotNetOpenAuth.OpenId.RelyingParty.OpenIdInfoCardSelector openIdSelector;
/// <summary>
/// differentAccountLabel control.