diff options
Diffstat (limited to 'projecttemplates/MvcRelyingParty/Views')
10 files changed, 132 insertions, 60 deletions
diff --git a/projecttemplates/MvcRelyingParty/Views/Account/AuthenticationTokens.ascx b/projecttemplates/MvcRelyingParty/Views/Account/AuthenticationTokens.ascx index 9632988..ad9634f 100644 --- a/projecttemplates/MvcRelyingParty/Views/Account/AuthenticationTokens.ascx +++ b/projecttemplates/MvcRelyingParty/Views/Account/AuthenticationTokens.ascx @@ -1,4 +1,7 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<MvcRelyingParty.Models.AccountInfoModel>" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> +<%@ Import Namespace="DotNetOpenAuth.OpenId.RelyingParty" %> + <h3> Login methods </h3> @@ -11,10 +14,15 @@ </ul> <h4>Add a new login method </h4> -<% using(Html.BeginForm("AddAuthenticationToken", "Account", FormMethod.Post)) { %> - <%= Html.AntiForgeryToken() %> - <label for="openid_identifier">OpenID:</label> - <%= Html.TextBox("openid_identifier")%> - <%= Html.ValidationMessage("openid_identifier")%> - <input type="submit" value="Add token" /> + +<% using(Html.BeginForm("AddAuthenticationToken", "Auth", FormMethod.Post)) { %> +<%= Html.AntiForgeryToken() %> +<%= Html.Hidden("openid_openidAuthData") %> + +<%= Html.OpenIdSelector(this.Page, new SelectorButton[] { + new SelectorProviderButton("https://me.yahoo.com/", Url.Content("~/Content/images/yahoo.gif")), + new SelectorProviderButton("https://www.google.com/accounts/o8/id", Url.Content("~/Content/images/google.gif")), + new SelectorOpenIdButton(Url.Content("~/Content/images/openid.gif")), +}) %> + <% } %>
\ No newline at end of file diff --git a/projecttemplates/MvcRelyingParty/Views/Account/Edit.aspx b/projecttemplates/MvcRelyingParty/Views/Account/Edit.aspx index 09635f2..25ba2a8 100644 --- a/projecttemplates/MvcRelyingParty/Views/Account/Edit.aspx +++ b/projecttemplates/MvcRelyingParty/Views/Account/Edit.aspx @@ -2,15 +2,25 @@ Inherits="System.Web.Mvc.ViewPage<AccountInfoModel>" %> <%@ Import Namespace="MvcRelyingParty.Models" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> +<%@ Import Namespace="DotNetOpenAuth.OpenId.RelyingParty" %> <asp:Content ID="Content1" ContentPlaceHolderID="TitleContent" runat="server"> Edit </asp:Content> +<asp:Content ContentPlaceHolderID="Head" runat="server"> + <%= Html.OpenIdSelectorStyles(this.Page) %> +</asp:Content> <asp:Content ContentPlaceHolderID="ScriptsArea" runat="server"> - - <script src="../../Scripts/MicrosoftAjax.js" type="text/javascript"></script> - - <script src="../../Scripts/MicrosoftMvcAjax.js" type="text/javascript"></script> - + <script type="text/javascript" src='<%= Url.Content("~/Scripts/MicrosoftAjax.js") %>'></script> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/MicrosoftMvcAjax.js") %>'></script> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery.cookie.js") %>'></script> + <% var selector = new OpenIdSelector(); + selector.TextBox.LogOnText = "ADD"; + selector.TextBox.LogOnToolTip = "Bind this OpenID to your account."; + var additionalOptions = new OpenIdAjaxOptions { + FormIndex = 1, + }; %> + <%= Html.OpenIdSelectorScripts(this.Page, selector, additionalOptions)%> </asp:Content> <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> <h2> diff --git a/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx b/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx deleted file mode 100644 index f0cd6ac..0000000 --- a/projecttemplates/MvcRelyingParty/Views/Account/LogOn.aspx +++ /dev/null @@ -1,39 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> - -<asp:Content ID="loginTitle" ContentPlaceHolderID="TitleContent" runat="server"> - Log On -</asp:Content> -<asp:Content ID="loginContent" ContentPlaceHolderID="MainContent" runat="server"> - <h2> - Log On - </h2> - <%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %> - - <% using (Html.BeginForm("LogOn", "Account")) { %> - <%= Html.AntiForgeryToken() %> - <%= Html.Hidden("ReturnUrl", Request.QueryString["ReturnUrl"]) %> - <div> - <fieldset> - <legend>Account Information</legend> - <p> - <label for="openid_identifier">OpenID:</label> - <%= Html.TextBox("openid_identifier")%> - <%= Html.ValidationMessage("openid_identifier")%> - </p> - <p> - <%= Html.CheckBox("rememberMe") %> <label class="inline" for="rememberMe">Remember me?</label> - </p> - <p> - <input type="submit" value="Log On" /> - </p> - </fieldset> - </div> - <% } %> -</asp:Content> -<asp:Content ID="Content1" ContentPlaceHolderID="ScriptsArea" runat="server"> - <script type="text/javascript" src="../../Scripts/MicrosoftAjax.js"></script> - <script type="text/javascript" src="../../Scripts/MicrosoftMvcAjax.js"></script> - <script type="text/javascript" language="javascript"><!--//<![CDATA[ - $addHandler(window, 'load', function() { document.getElementsByName("openid_identifier")[0].focus(); }); - //]]>--></script> -</asp:Content> diff --git a/projecttemplates/MvcRelyingParty/Views/Auth/LogOn.aspx b/projecttemplates/MvcRelyingParty/Views/Auth/LogOn.aspx new file mode 100644 index 0000000..02913f1 --- /dev/null +++ b/projecttemplates/MvcRelyingParty/Views/Auth/LogOn.aspx @@ -0,0 +1,11 @@ +<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> +<asp:Content ContentPlaceHolderID="Head" runat="server"> + <%= Html.OpenIdSelectorStyles(this.Page) %> +</asp:Content> +<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> + <% Html.RenderPartial("LogOnContent"); %> +</asp:Content> +<asp:Content ContentPlaceHolderID="ScriptsArea" runat="server"> + <% Html.RenderPartial("LogOnScripts"); %> +</asp:Content>
\ No newline at end of file diff --git a/projecttemplates/MvcRelyingParty/Views/Auth/LogOnContent.ascx b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnContent.ascx new file mode 100644 index 0000000..eb8dc16 --- /dev/null +++ b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnContent.ascx @@ -0,0 +1,29 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> +<%@ Import Namespace="DotNetOpenAuth.OpenId.RelyingParty" %> +<p>Login using an account you already use. </p> +<%= Html.ValidationSummary("Login was unsuccessful. Please correct the errors and try again.") %> + +<% using (Html.BeginForm("LogOnPostAssertion", "Auth", FormMethod.Post, new { target = "_top" })) { %> +<%= Html.AntiForgeryToken() %> +<%= Html.Hidden("ReturnUrl", Request.QueryString["ReturnUrl"], new { id = "ReturnUrl" }) %> +<%= Html.Hidden("openid_openidAuthData") %> +<div> +<%= Html.OpenIdSelector(this.Page, new SelectorButton[] { + new SelectorProviderButton("https://me.yahoo.com/", Url.Content("~/Content/images/yahoo.gif")), + new SelectorProviderButton("https://www.google.com/accounts/o8/id", Url.Content("~/Content/images/google.gif")), + new SelectorOpenIdButton(Url.Content("~/Content/images/openid.gif")), +}) %> + + <div class="helpDoc"> + <p> + If you have logged in previously, click the same button you did last time. + </p> + <p> + If you don't have an account with any of these services, just pick Google. They'll + help you set up an account. + </p> + </div> + +</div> +<% } %> diff --git a/projecttemplates/MvcRelyingParty/Views/Auth/LogOnPopup.aspx b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnPopup.aspx new file mode 100644 index 0000000..bfc33e9 --- /dev/null +++ b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnPopup.aspx @@ -0,0 +1,25 @@ +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <title>Login</title> + <%= Html.OpenIdSelectorStyles(this.Page) %> + <link rel="stylesheet" type="text/css" href='<%= Url.Content("~/Content/loginpopup.css") %>' /> +</head> +<body> +<% Html.RenderPartial("LogOnContent"); %> + <% if (Request.Url.IsLoopback) { %> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery-1.3.2.min.js") %>'></script> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery-ui-personalized-1.6rc6.min.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> + <% } %> +<% Html.RenderPartial("LogOnScripts"); %> +</body> +</html> diff --git a/projecttemplates/MvcRelyingParty/Views/Auth/LogOnScripts.ascx b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnScripts.ascx new file mode 100644 index 0000000..0ebc38b --- /dev/null +++ b/projecttemplates/MvcRelyingParty/Views/Auth/LogOnScripts.ascx @@ -0,0 +1,11 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> +<%@ Import Namespace="DotNetOpenAuth.Mvc" %> +<script type="text/javascript" src='<%= Url.Content("~/Scripts/MicrosoftAjax.js") %>'></script> +<script type="text/javascript" src='<%= Url.Content("~/Scripts/MicrosoftMvcAjax.js") %>'></script> +<script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery.cookie.js") %>'></script> +<% + var options = new OpenIdAjaxOptions { + PreloadedDiscoveryResults = (string)this.ViewData["PreloadedDiscoveryResults"], + }; +%> +<%= Html.OpenIdSelectorScripts(this.Page, null, options)%> diff --git a/projecttemplates/MvcRelyingParty/Views/Home/Index.aspx b/projecttemplates/MvcRelyingParty/Views/Home/Index.aspx index ddd2ffe..4efd7f6 100644 --- a/projecttemplates/MvcRelyingParty/Views/Home/Index.aspx +++ b/projecttemplates/MvcRelyingParty/Views/Home/Index.aspx @@ -1,12 +1,16 @@ <%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="System.Web.Mvc.ViewPage" %> <asp:Content ID="indexTitle" ContentPlaceHolderID="TitleContent" runat="server"> - Home Page + Home Page </asp:Content> - <asp:Content ID="indexContent" ContentPlaceHolderID="MainContent" runat="server"> - <h2><%= Html.Encode(ViewData["Message"]) %></h2> - <p> - To learn more about ASP.NET MVC visit <a href="http://asp.net/mvc" title="ASP.NET MVC Website">http://asp.net/mvc</a>. - </p> + <h2> + <%= Html.Encode(ViewData["Message"]) %></h2> + <p> + To learn more about DotNetOpenAuth visit <a href="http://www.dotnetopenauth.net/" + title="DotNetOpenAuth web site">http://www.dotnetopenauth.net/</a>. + </p> + <p> + Try logging in. + </p> </asp:Content> diff --git a/projecttemplates/MvcRelyingParty/Views/Shared/LogOnUserControl.ascx b/projecttemplates/MvcRelyingParty/Views/Shared/LogOnUserControl.ascx index 9c8d139..214696a 100644 --- a/projecttemplates/MvcRelyingParty/Views/Shared/LogOnUserControl.ascx +++ b/projecttemplates/MvcRelyingParty/Views/Shared/LogOnUserControl.ascx @@ -16,13 +16,13 @@ Welcome <b> } %> </b>! [ -<%= Html.ActionLink("Log Off", "LogOff", "Account") %> +<%= Html.ActionLink("Log Off", "LogOff", "Auth") %> ] <% } else { %> [ -<%= Html.ActionLink("Log On", "LogOn", "Account") %> +<a href="#" class="loginPopupLink">Login / Register</a> ] <% } diff --git a/projecttemplates/MvcRelyingParty/Views/Shared/Site.Master b/projecttemplates/MvcRelyingParty/Views/Shared/Site.Master index f49b072..ed68f0c 100644 --- a/projecttemplates/MvcRelyingParty/Views/Shared/Site.Master +++ b/projecttemplates/MvcRelyingParty/Views/Shared/Site.Master @@ -2,11 +2,13 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> -<head runat="server"> +<head> <title> <asp:ContentPlaceHolder ID="TitleContent" runat="server" /> </title> - <link href="../../Content/Site.css" rel="stylesheet" type="text/css" /> + <link rel="stylesheet" type="text/css" href='<%= Url.Content("~/Content/Site.css") %>' /> + <link rel="stylesheet" type="text/css" href='<%= Url.Content("~/Content/theme/ui.all.css") %>' /> + <asp:ContentPlaceHolder ID="Head" runat="server" /> </head> <body> <div class="page"> @@ -41,6 +43,17 @@ </div> </div> </div> + <% if (Request.Url.IsLoopback) { %> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery-1.3.2.min.js") %>'></script> + <script type="text/javascript" src='<%= Url.Content("~/Scripts/jquery-ui-personalized-1.6rc6.min.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" language="javascript" src='<%= Url.Content("~/Scripts/LoginLink.js") %>'></script> <asp:ContentPlaceHolder runat="server" ID="ScriptsArea" /> </body> </html> |