lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-09-02 21:29:10 -07:00
parent 33d47b3c39 a2747b933a
commit 70453d012b
74 changed files with 1755 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailFail.ascx Normal file
View File

@@ -0,0 +1,3 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
<h1><%: Html.TitleForPage(T("Challenge Email").ToString()) %></h1>
<p><%: T("Your email address could not be validated.") %></p>

3
src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailSent.ascx Normal file
View File

@@ -0,0 +1,3 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
<h1><%: Html.TitleForPage(T("Challenge Email Sent").ToString()) %></h1>
<p><%: T("An email has been sent to you. Please click on the link it contains in order to have access on this site.") %></p>

3
src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChallengeEmailSuccess.ascx Normal file
View File

@@ -0,0 +1,3 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<object>" %>
<h1><%: Html.TitleForPage(T("Challenge Email").ToString()) %></h1>
<p><%: T("Your email address has been validated.") %></p>

13
src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.aspx
View File

@@ -1,4 +1,5 @@
<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<UsersIndexViewModel>" %>
<%@ Import Namespace="Orchard.Users.Models" %>
<%@ Import Namespace="Orchard.Users.ViewModels"%>
<h1><%: Html.TitleForPage(T("Manage Users").ToString()) %></h1>
<% using (Html.BeginFormAntiForgeryPost()) { %>
@@ -22,6 +23,12 @@
{ %>
<tr>
<td>
<% if(row.UserPart.RegistrationStatus == UserStatus.Approved) { %>
<img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Users/Content/Admin/images/online.gif") %>" alt="<%:T("Approved") %>" title="<%:T("User is approved") %>" />
<% }
else { %>
<img class="icon" src="<%=ResolveUrl("~/Modules/Orchard.Users/Content/Admin/images/offline.gif") %>" alt="<%:T("Moderated") %>" title="<%:T("User is moderated") %>" />
<% } %>
<%: row.UserPart.UserName %>
</td>
<td>
@@ -29,7 +36,11 @@
</td>
<td>
<%: Html.ActionLink(T("Edit").ToString(), "Edit", new { row.UserPart.Id })%> |
<%: Html.ActionLink(T("Remove").ToString(), "Delete", new { row.UserPart.Id })%>
<%: Html.ActionLink(T("Remove").ToString(), "Delete", new { row.UserPart.Id })%> |
<%: row.UserPart.RegistrationStatus == UserStatus.Pending ? Html.ActionLink(T("Approve").ToString(), "Approve", new { row.UserPart.Id }) : Html.ActionLink(T("Disable").ToString(), "Moderate", new { row.UserPart.Id })%>
<% if ( row.UserPart.EmailStatus == UserStatus.Pending ) { %> |
<%: Html.ActionLink(T("Challenge Email").ToString(), "SendChallengeEmail", new { row.UserPart.Id })%>
<% } %>
</td>
</tr>
<%}%>

25
src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.ascx Normal file
View File

@@ -0,0 +1,25 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<RegistrationSettingsPartRecord>" %>
<%@ Import Namespace="Orchard.Users.Models"%>
<fieldset>
<legend><%: T("Users registration")%></legend>
<div>
<%: Html.EditorFor(m => m.UsersCanRegister) %>
<label class="forcheckbox" for="<%: Html.FieldIdFor( m => m.UsersCanRegister) %>"><%: T("Users can create new accounts on the site")%></label>
<%: Html.ValidationMessage("UsersCanRegister", "*")%>
</div>
<div>
<%: Html.EditorFor(m => m.UsersMustValidateEmail)%>
<label class="forcheckbox" for="<%: Html.FieldIdFor( m => m.UsersMustValidateEmail) %>"><%: T("Users must justify their email address")%></label>
<%: Html.ValidationMessage("UsersMustValidateEmail", "*")%>
</div>
<div>
<%: Html.EditorFor(m => m.UsersAreModerated)%>
<label class="forcheckbox" for="<%: Html.FieldIdFor( m => m.UsersAreModerated) %>"><%: T("Users must be approved before they can log in")%></label>
<%: Html.ValidationMessage("UsersAreModerated", "*")%>
</div>
<div data-controllerid="<%:Html.FieldIdFor(m => m.UsersAreModerated) %>">
<%: Html.EditorFor(m => m.NotifyModeration)%>
<label class="forcheckbox" for="<%: Html.FieldIdFor( m => m.NotifyModeration) %>"><%: T("Send a notification when a user needs moderation")%></label>
<%: Html.ValidationMessage("NotifyModeration", "*")%>
</div>
</fieldset>