Some clean up on the setup UI around validation.

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-02-10 15:37:56 -08:00
parent af3d696d64
commit a9ef41d4e8
3 changed files with 13 additions and 11 deletions

View File

@@ -4,11 +4,11 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Setup.ViewModels { namespace Orchard.Setup.ViewModels {
public class SetupViewModel : BaseViewModel { public class SetupViewModel : BaseViewModel {
[Required, StringLength(70)] [Required(ErrorMessage = "Site name is required."), StringLength(70, ErrorMessage = "Site name can be no longer than 70 characters.")]
public string SiteName { get; set; } public string SiteName { get; set; }
[Required, StringLengthMin(3), StringLength(25)] [Required(ErrorMessage = "User name is required."), StringLengthMin(3, ErrorMessage = "User name must be longer than 3 characters."), StringLength(25, ErrorMessage = "User name can be no longer than 25 characters.")]
public string AdminUsername { get; set; } public string AdminUsername { get; set; }
[Required, StringLengthMin(6), StringLength(50)] [Required(ErrorMessage = "Password is required."), StringLengthMin(6, ErrorMessage = "Password must be longer than 6 characters."), StringLength(50, ErrorMessage = "Password can be no longer than 50 characters.")]
public string AdminPassword { get; set; } public string AdminPassword { get; set; }
[SqlDatabaseConnectionString] [SqlDatabaseConnectionString]
public string DatabaseConnectionString { get; set; } public string DatabaseConnectionString { get; set; }

View File

@@ -10,28 +10,25 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<div> <div>
<label for="SiteName"><%=_Encoded("What is the name of your site?") %></label> <label for="SiteName"><%=_Encoded("What is the name of your site?") %></label>
<%=Html.EditorFor(svm => svm.SiteName) %> <%=Html.EditorFor(svm => svm.SiteName) %>
<%=Html.ValidationMessage("SiteName", "*") %>
</div> </div>
<div> <div>
<label for="AdminUsername"><%=_Encoded("Choose a user name:") %></label> <label for="AdminUsername"><%=_Encoded("Choose a user name:") %></label>
<%=Html.EditorFor(svm => svm.AdminUsername)%> <%=Html.EditorFor(svm => svm.AdminUsername)%>
<%=Html.ValidationMessage("AdminUsername", "*")%>
</div> </div>
<div> <div>
<label for="AdminPassword"><%=_Encoded("Choose a password:") %></label> <label for="AdminPassword"><%=_Encoded("Choose a password:") %></label>
<%=Html.PasswordFor(svm => svm.AdminPassword) %> <%=Html.PasswordFor(svm => svm.AdminPassword) %>
<%=Html.ValidationMessage("AdminPassword", "*") %>
</div> </div>
</fieldset> </fieldset>
<fieldset class="data"> <fieldset class="data<%=Model.DatabaseOptions ? " builtin" : " sql" %>">
<legend><%=_Encoded("How would you like to store your data?") %></legend> <legend><%=_Encoded("How would you like to store your data?") %></legend>
<%=Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage") %> <%=Html.ValidationMessage("DatabaseOptions", "Unable to setup data storage") %>
<div> <div>
<input type="radio" name="databaseOptions" id="builtin" value="true" checked="checked" /> <%=Html.RadioButtonFor(svm => svm.DatabaseOptions, true, new { id = "builtin" })%>
<label for="builtin" class="forcheckbox"><%=_Encoded("Use built-in data storage (SQL Lite)") %></label> <label for="builtin" class="forcheckbox"><%=_Encoded("Use built-in data storage (SQL Lite)") %></label>
</div> </div>
<div> <div>
<input type="radio" name="databaseOptions" id="sql" value="false" /> <%=Html.RadioButtonFor(svm => svm.DatabaseOptions, false, new { id = "sql" })%>
<label for="sql" class="forcheckbox"><%=_Encoded("Use an existing SQL Server (or SQL Express) database") %></label> <label for="sql" class="forcheckbox"><%=_Encoded("Use an existing SQL Server (or SQL Express) database") %></label>
<span> <span>
<label for="DatabaseConnectionString"><%=_Encoded("Connection string") %></label> <label for="DatabaseConnectionString"><%=_Encoded("Connection string") %></label>

View File

@@ -146,7 +146,7 @@ button:focus, .button:focus {
text-decoration:none; text-decoration:none;
} }
html.dyn fieldset.data div span { html.dyn fieldset.data.builtin div span {
display:none; display:none;
} }
@@ -158,6 +158,10 @@ html.dyn fieldset.data div span {
padding:4px; padding:4px;
white-space:pre-wrap; white-space:pre-wrap;
} }
form .message, form .validation-summary-errors {
margin:0 10px;
white-space:inherit;
}
span.message { span.message {
display:block; display:block;
margin:4px 0 4px 4px; margin:4px 0 4px 4px;
@@ -176,7 +180,8 @@ span.message {
} }
/* todo: (heskew) what else (other inputs) needs this? */ /* todo: (heskew) what else (other inputs) needs this? */
.critical.message, .validation-summary-errors, .critical.message, .validation-summary-errors,
.input-validation-error.text-box, .input-validation-error.text { .input-validation-error.text-box, .input-validation-error.text,
input[type="password"].input-validation-error {
border:1px solid #990808; border:1px solid #990808;
} }
.critical.message, .validation-summary-errors { .critical.message, .validation-summary-errors {