merge from Yavsc
This commit is contained in:
commit
53325b7e6c
30 changed files with 243 additions and 546 deletions
|
|
@ -20,7 +20,7 @@
|
|||
<input type="submit"/>
|
||||
<% } %></div>
|
||||
<div class="panel">
|
||||
<%= Html.ActionLink("S'enregistrer","Register",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %>
|
||||
<%= Html.ActionLink("S'enregistrer","RegisterForm",new {returnUrl=ViewData["returnUrl"]}, new { @class="actionlink" }) %>
|
||||
</div>
|
||||
<div class="panel">
|
||||
<a href="<%=Request.Url.Scheme + "://" + Request.Url.Authority + "/Google/Login"%>?returnUrl=<%=ViewData["returnUrl"]==null?Request.Url.PathAndQuery:(string)ViewData["returnUrl"]%>" class="actionlink">
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ Avatar : <img src="<%=Html.AvatarUrl(HttpContext.Current.User.Identity.Name)%>"
|
|||
<% } %>
|
||||
<aside>
|
||||
<%= Html.ActionLink("Changer de mot de passe","ChangePassword", "Account",null, new { @class="actionlink" })%>
|
||||
<%= Html.ActionLink("Désincription","Unregister", "Account",null, new { @class="actionlink" })%>
|
||||
<%= Html.ActionLink("Désincription","Unregister", "Account", new { id=ViewData["UserName"] } , new { @class="actionlink" })%>
|
||||
</aside>
|
||||
<aside>
|
||||
<% if (Roles.IsUserInRole((string)ViewData ["UserName"],"Admin")) { %>
|
||||
|
|
|
|||
|
|
@ -7,5 +7,6 @@ Warning: This will delete all of your data here, your profile, your posts and ot
|
|||
<label for="confirmed">Unregister</label>
|
||||
<%=Html.CheckBox("confirmed")%>
|
||||
<input type="submit"/>
|
||||
<%= Html.Hidden("UserName") %>
|
||||
<% } %>
|
||||
</asp:Content>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue