yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge-U4-8782' into dev-v7

Browse Source
This commit is contained in:
Claus
2016-11-01 14:34:56 +01:00
parent 82a2f50d03 7fe5f0c099
commit ef38808ba5
5 changed files with 823 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/less/main.less
View File

@@ -157,7 +157,7 @@ h5.-black {
}
.controls-row {
padding-top: 5px;
padding-bottom: 5px;
margin-left: 240px;
}

1073
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
View File

File diff suppressed because it is too large Load Diff

2
src/Umbraco.Web.UI/umbraco/create/User.ascx
View File

@@ -22,7 +22,7 @@
ControlToValidate="Email" ValidateEmptyText="false" OnServerValidate="EmailExistsCheck"></asp:CustomValidator>
<asp:CustomValidator runat="server" ID="EmailValidator" OnServerValidate="EmailValidator_OnServerValidate"
ControlToValidate="Email"
ErrorMessage="Invalid email address"
ErrorMessage='<%#ui.Text("errorHandling", "errorRegExpWithoutTab", "E-mail", CurrentUser) %>'
Display="None" />
<br />
<asp:TextBox ID="Email" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>

94
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
View File

@@ -30,6 +30,8 @@ using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using PropertyType = umbraco.cms.businesslogic.propertytype.PropertyType;
using System.Text.RegularExpressions;
using System.Text;
namespace umbraco.cms.presentation.user
{
@@ -43,11 +45,16 @@ namespace umbraco.cms.presentation.user
CurrentApp = DefaultApps.users.ToString();
}
protected HtmlTable macroProperties;
protected TextBox uname = new TextBox();
protected TextBox lname = new TextBox();
protected TextBox uname = new TextBox() { ID = "uname" };
protected RequiredFieldValidator unameValidator = new RequiredFieldValidator();
protected TextBox lname = new TextBox() { ID = "lname" };
protected RequiredFieldValidator lnameValidator = new RequiredFieldValidator();
protected CustomValidator lnameCustomValidator = new CustomValidator();
protected PlaceHolder passw = new PlaceHolder();
protected CheckBoxList lapps = new CheckBoxList();
protected TextBox email = new TextBox();
protected TextBox email = new TextBox() { ID = "email" };
protected RequiredFieldValidator emailValidator = new RequiredFieldValidator();
protected CustomValidator emailCustomValidator = new CustomValidator();
protected DropDownList userType = new DropDownList();
protected DropDownList userLanguage = new DropDownList();
protected CheckBox NoConsole = new CheckBox();
@@ -148,8 +155,7 @@ namespace umbraco.cms.presentation.user
contentPicker.Value = "-1";
content.Controls.Add(contentPicker);
// Add password changer
var passwordChanger = (passwordChanger)LoadControl(SystemDirectories.Umbraco + "/controls/passwordChanger.ascx");
passwordChanger.MembershipProviderName = UmbracoSettings.DefaultBackofficeProvider;
@@ -173,10 +179,20 @@ namespace umbraco.cms.presentation.user
passw.Controls.Add(passwordChanger);
passw.Controls.Add(validatorContainer);
pp.addProperty(ui.Text("user", "username", UmbracoUser), uname);
pp.addProperty(ui.Text("user", "loginname", UmbracoUser), lname);
var validationSummary = new ValidationSummary
{
ID = "validationSummary",
DisplayMode = ValidationSummaryDisplayMode.BulletList,
CssClass = "error"
};
pp.addProperty(validationSummary);
pp.addProperty(ui.Text("user", "username", UmbracoUser), uname, unameValidator);
pp.addProperty(ui.Text("user", "loginname", UmbracoUser), lname, lnameValidator, lnameCustomValidator);
pp.addProperty(ui.Text("user", "password", UmbracoUser), passw);
pp.addProperty(ui.Text("email", UmbracoUser), email);
pp.addProperty(ui.Text("general", "email", UmbracoUser), email, emailValidator, emailCustomValidator);
pp.addProperty(ui.Text("user", "usertype", UmbracoUser), userType);
pp.addProperty(ui.Text("user", "language", UmbracoUser), userLanguage);
@@ -213,12 +229,56 @@ namespace umbraco.cms.presentation.user
save.Text = ui.Text("save");
save.ButtonType = MenuButtonType.Primary;
sectionValidator.ServerValidate += new ServerValidateEventHandler(sectionValidator_ServerValidate);
sectionValidator.ServerValidate += SectionValidator_OnServerValidate;
sectionValidator.ControlToValidate = lapps.ID;
sectionValidator.ErrorMessage = ui.Text("errorHandling", "errorMandatoryWithoutTab", ui.Text("user", "modules", UmbracoUser), UmbracoUser);
sectionValidator.CssClass = "error";
sectionValidator.Style.Add("color", "red");
unameValidator.ControlToValidate = uname.ID;
unameValidator.Display = ValidatorDisplay.Dynamic;
unameValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser);
unameValidator.CssClass = "error";
unameValidator.Style.Add("color", "red");
unameValidator.Style.Add("margin-left", "5px");
unameValidator.Style.Add("line-height", "28px");
lnameValidator.ControlToValidate = lname.ID;
lnameValidator.Display = ValidatorDisplay.Dynamic;
lnameValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser);
lnameValidator.CssClass = "error";
lnameValidator.Style.Add("color", "red");
lnameValidator.Style.Add("margin-left", "5px");
lnameValidator.Style.Add("line-height", "28px");
lnameCustomValidator.ServerValidate += LnameCustomValidator_OnServerValidate;
lnameCustomValidator.Display = ValidatorDisplay.Dynamic;
lnameCustomValidator.ControlToValidate = lname.ID;
var localizedLname = ui.Text("user", "loginname", UmbracoUser);
lnameCustomValidator.ErrorMessage = ui.Text("errorHandling", "errorExistsWithoutTab", localizedLname, UmbracoUser);
lnameCustomValidator.CssClass = "error";
lnameCustomValidator.Style.Add("color", "red");
lnameCustomValidator.Style.Add("margin-left", "5px");
lnameCustomValidator.Style.Add("line-height", "28px");
emailValidator.ControlToValidate = email.ID;
emailValidator.Display = ValidatorDisplay.Dynamic;
emailValidator.ErrorMessage = ui.Text("defaultdialogs", "requiredField", UmbracoUser);
emailValidator.CssClass = "error";
emailValidator.Style.Add("color", "red");
emailValidator.Style.Add("margin-left", "5px");
emailValidator.Style.Add("line-height", "28px");
emailCustomValidator.ServerValidate += EmailCustomValidator_OnServerValidate;
emailCustomValidator.Display = ValidatorDisplay.Dynamic;
emailCustomValidator.ControlToValidate = email.ID;
var localizedEmail = ui.Text("general", "email", UmbracoUser);
emailCustomValidator.ErrorMessage = ui.Text("errorHandling", "errorRegExpWithoutTab", localizedEmail, UmbracoUser);
emailCustomValidator.CssClass = "error";
emailCustomValidator.Style.Add("color", "red");
emailCustomValidator.Style.Add("margin-left", "5px");
emailCustomValidator.Style.Add("line-height", "28px");
SetupForm();
SetupChannel();
@@ -227,8 +287,18 @@ namespace umbraco.cms.presentation.user
.SyncTree(UID.ToString(), IsPostBack);
}
private void LnameCustomValidator_OnServerValidate(object source, ServerValidateEventArgs args)
{
var usersWithLoginName = ApplicationContext.Services.UserService.GetByUsername(lname.Text);
args.IsValid = usersWithLoginName == null || usersWithLoginName.Id == u.Id;
}
void sectionValidator_ServerValidate(object source, ServerValidateEventArgs args)
private void EmailCustomValidator_OnServerValidate(object source, ServerValidateEventArgs args)
{
args.IsValid = MembershipProviderBase.IsEmailValid(email.Text.Trim());
}
private void SectionValidator_OnServerValidate(object source, ServerValidateEventArgs args)
{
args.IsValid = false;
@@ -531,7 +601,9 @@ namespace umbraco.cms.presentation.user
}
else
{
ClientTools.ShowSpeechBubble(speechBubbleIcon.error, ui.Text("speechBubbles", "editUserError", UmbracoUser), "");
ClientTools.ShowSpeechBubble(speechBubbleIcon.error,
ui.Text("speechBubbles", "validationFailedHeader", UmbracoUser),
ui.Text("speechBubbles", "validationFailedMessage", UmbracoUser));
}
}

16
src/umbraco.controls/pane.cs
View File

@@ -36,6 +36,22 @@ namespace umbraco.uicontrols
set { m_title = value; }
}
public void addProperty(string Caption, Control C, params BaseValidator[] validators)
{
PropertyPanel pp = new PropertyPanel();
pp.Controls.Add(C);
foreach (var validator in validators)
{
validator.Display = ValidatorDisplay.Dynamic;
pp.Controls.Add(validator);
}
pp.Text = Caption;
this.Controls.Add(pp);
}
public void addProperty(string Caption, Control C)
{