diff options
3 files changed, 31 insertions, 30 deletions
diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx index 4886aa0..f156d92 100644 --- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx +++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx @@ -41,18 +41,6 @@ <rp:ProviderInfo Image="images/openid.gif" /> </Providers> </rp:OpenIdButtonPanel> - <div runat="server" style="display: none" id="OpenIDForm"> - <asp:HiddenField ID="originPage" runat="server" /> - <rp:OpenIdAjaxTextBox runat="server" ID="openid_identifier" /> - <div id="NotMyComputerDiv"> - <span title="Checking this box prevents the identifier you type here from being remembered next time someone comes to this web site from this browser."> - </span> - <input type="checkbox" name="NotMyComputer" id="NotMyComputer" value="1" /> - <label for="NotMyComputer"> - This is <i>not</i> my computer</label> - </div> - <!--<div id="state"></div>--> - </div> <div class="helpDoc"> <p> If you have logged in previously, click the same button you did last time. @@ -63,6 +51,7 @@ </p> </div> </div> + <asp:HiddenField ID="originPage" runat="server" /> </form> </body> </html> diff --git a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs index f845e56..b59d025 100644 --- a/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs +++ b/projecttemplates/WebFormsRelyingParty/LoginFrame.aspx.designer.cs @@ -23,15 +23,6 @@ namespace WebFormsRelyingParty { protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// <summary> - /// OpenIDForm control. - /// </summary> - /// <remarks> - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// </remarks> - protected global::System.Web.UI.HtmlControls.HtmlGenericControl OpenIDForm; - - /// <summary> /// originPage control. /// </summary> /// <remarks> @@ -39,14 +30,5 @@ namespace WebFormsRelyingParty { /// To modify move field declaration from designer file to code-behind file. /// </remarks> protected global::System.Web.UI.WebControls.HiddenField originPage; - - /// <summary> - /// openid_identifier 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 openid_identifier; } } diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdButtonPanel.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdButtonPanel.cs index 235d6f3..e71847c 100644 --- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdButtonPanel.cs +++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdButtonPanel.cs @@ -50,6 +50,17 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { private const string AuthenticatedAsToolTipDefault = "We recognize you!"; /// <summary> + /// The OpenIdAjaxTextBox that remains hidden until the user clicks the OpenID button. + /// </summary> + private OpenIdAjaxTextBox textBox; + + /// <summary> + /// Initializes a new instance of the <see cref="OpenIdButtonPanel"/> class. + /// </summary> + public OpenIdButtonPanel() { + } + + /// <summary> /// Gets or sets the tool tip text that appears on the green checkmark when authentication succeeds. /// </summary> [Bindable(true), DefaultValue(AuthenticatedAsToolTipDefault), Localizable(true), Category(AppearanceCategory)] @@ -83,6 +94,17 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { } /// <summary> + /// Called by the ASP.NET page framework to notify server controls that use composition-based implementation to create any child controls they contain in preparation for posting back or rendering. + /// </summary> + protected override void CreateChildControls() { + base.CreateChildControls(); + + this.textBox = new OpenIdAjaxTextBox(); + this.textBox.ID = "openid_identifier"; + this.Controls.Add(this.textBox); + } + + /// <summary> /// Raises the <see cref="E:System.Web.UI.Control.PreRender"/> event. /// </summary> /// <param name="e">An <see cref="T:System.EventArgs"/> object that contains the event data.</param> @@ -142,6 +164,14 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { } writer.RenderEndTag(); // </ul> + + writer.AddStyleAttribute(HtmlTextWriterStyle.Display, "none"); + writer.AddAttribute(HtmlTextWriterAttribute.Id, "OpenIDForm"); + writer.RenderBeginTag(HtmlTextWriterTag.Div); + + this.RenderChildren(writer); + + writer.RenderEndTag(); // </div> } } |