diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-10-24 15:56:48 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-10-24 15:56:48 -0700 |
| commit | 9dbb9aab73812202648c4e68d60261dd84d6c8e2 (patch) | |
| tree | 5de139019a7b2f870f84c57cac36c0e489bd1e41 /samples/OpenIdProviderMvc | |
| parent | 4b27c330fbfb3a260aa3bd6a9b1232ee3b53deb0 (diff) | |
| parent | e7ce41355c38b3125729a62920231f274b7a2100 (diff) | |
| download | DotNetOpenAuth-origin/mono2.zip DotNetOpenAuth-origin/mono2.tar.gz DotNetOpenAuth-origin/mono2.tar.bz2 | |
Merge branch 'v3.2' into mono2origin/mono2
Conflicts:
src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
Diffstat (limited to 'samples/OpenIdProviderMvc')
| -rw-r--r-- | samples/OpenIdProviderMvc/Views/Shared/Site.Master | 4 | ||||
| -rw-r--r-- | samples/OpenIdProviderMvc/Views/Shared/Xrds.aspx | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/samples/OpenIdProviderMvc/Views/Shared/Site.Master b/samples/OpenIdProviderMvc/Views/Shared/Site.Master index 073908e..49f6a7f 100644 --- a/samples/OpenIdProviderMvc/Views/Shared/Site.Master +++ b/samples/OpenIdProviderMvc/Views/Shared/Site.Master @@ -2,11 +2,11 @@ <!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 href='<%= Url.Content("~/Content/Site.css") %>' rel="stylesheet" type="text/css" /> <asp:ContentPlaceHolder ID="HeadContent" runat="server" /> </head> <body> diff --git a/samples/OpenIdProviderMvc/Views/Shared/Xrds.aspx b/samples/OpenIdProviderMvc/Views/Shared/Xrds.aspx index 7aad102..0d73909 100644 --- a/samples/OpenIdProviderMvc/Views/Shared/Xrds.aspx +++ b/samples/OpenIdProviderMvc/Views/Shared/Xrds.aspx @@ -27,5 +27,13 @@ for all XRDS discovery. <Type>http://specs.openid.net/extensions/ui/1.0/icon</Type>--%> <URI><%=new Uri(Request.Url, Response.ApplyAppPathModifier("~/OpenId/Provider"))%></URI> </Service> +<% if (ViewData["OPIdentifier"] == null) { %> + <Service priority="20"> + <Type>http://openid.net/signon/1.0</Type> + <Type>http://openid.net/extensions/sreg/1.1</Type> + <Type>http://axschema.org/contact/email</Type> + <URI><%=new Uri(Request.Url, Response.ApplyAppPathModifier("~/OpenId/Provider"))%></URI> + </Service> +<% } %> </XRD> </xrds:XRDS> |