More improvements to registration, leaf input create, and charting
This commit is contained in:
@@ -7,15 +7,15 @@
|
||||
Html.RequiresJs("~/scripts/jquery.autocomplete.min.js", 2);
|
||||
Html.RequiresJs("~/scripts/jquery.validate.min.js", 2);
|
||||
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.min.js", 2);
|
||||
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.js", 2);
|
||||
Html.RequiresJs("~/scripts/jquery.validate.custom.js", 2);
|
||||
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.js", 2);
|
||||
Html.RequiresJs("~/scripts/LeafInputCreate.js", 3);
|
||||
|
||||
var user = Membership.GetUser();
|
||||
}
|
||||
|
||||
<div class="container-lg">
|
||||
<div class="row">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8 card card-body bg-light">
|
||||
@Html.Partial("_ValidationSummary")
|
||||
|
||||
@@ -58,8 +58,8 @@
|
||||
</div>
|
||||
@Html.Partial("_ValidationField", "Files")
|
||||
<!-- The table listing the files available for upload/download -->
|
||||
<div class="table-responsive">
|
||||
<table role="presentation" class="table table-sm table-striped"><tbody class="files"></tbody></table>
|
||||
<div class="table-responsive card mb-4">
|
||||
<table role="presentation" class="table table-sm table-striped mb-0"><tbody class="files"></tbody></table>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -74,12 +74,7 @@
|
||||
@Html.EditorFor(m => m.Email)
|
||||
@Html.EditorFor(m => m.EmailConfirm)
|
||||
}
|
||||
else
|
||||
{
|
||||
@Html.HiddenFor(m => m.Name)
|
||||
@Html.HiddenFor(m => m.Email)
|
||||
@Html.HiddenFor(m => m.EmailConfirm)
|
||||
}
|
||||
|
||||
@Html.EditorFor(m => m.TermsOfService)
|
||||
<input type="submit" id="submit-form" class="d-none" />
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
|
||||
@RenderBody()
|
||||
</main>
|
||||
<footer class="mt-auto py-3 dark">
|
||||
<footer class="mt-5 py-3 dark">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
@{
|
||||
var home = CurrentPage.Site();
|
||||
var loginStatus = Members.GetCurrentLoginStatus();
|
||||
var admin = Members.IsMemberAuthorized(allowGroups: new List<string>{"Administrator"});
|
||||
}
|
||||
|
||||
@if (home.Children.Any())
|
||||
@@ -40,7 +41,7 @@
|
||||
</ul>
|
||||
<div class="navbar-text text-light text-left">
|
||||
@Html.Partial("LoginStatus")
|
||||
@if (loginStatus.IsLoggedIn)
|
||||
@if (loginStatus.IsLoggedIn && admin)
|
||||
{
|
||||
<div class="align-items-center">
|
||||
<a href="~/umbraco#"><span class="fa fa-cog"></span> Site Editor</a>
|
||||
|
||||
@@ -2,4 +2,22 @@
|
||||
@{
|
||||
Layout = "_FieldLayout.cshtml";
|
||||
}
|
||||
@Html.Password("", ViewData.TemplateInfo.FormattedModelValue, new { @class = "form-control" })
|
||||
@{
|
||||
var htmlAttributes = new RouteValueDictionary();
|
||||
|
||||
var controlClass = "form-control";
|
||||
|
||||
if (ViewBag.@class != null)
|
||||
{
|
||||
controlClass = string.Concat(controlClass, " ", ViewBag.@class);
|
||||
}
|
||||
|
||||
if (ViewData.ModelState.ContainsKey(ViewData.TemplateInfo.HtmlFieldPrefix) &&
|
||||
ViewData.ModelState[ViewData.TemplateInfo.HtmlFieldPrefix].Errors.Any())
|
||||
{
|
||||
controlClass = string.Concat(controlClass, " ", "is-invalid");
|
||||
}
|
||||
htmlAttributes.Add("class", controlClass);
|
||||
}
|
||||
|
||||
@Html.Password("", ViewData.TemplateInfo.FormattedModelValue, htmlAttributes)
|
||||
@@ -6,18 +6,18 @@
|
||||
var prefix = ViewData.TemplateInfo.HtmlFieldPrefix;
|
||||
ViewData.TemplateInfo.HtmlFieldPrefix = string.Empty;
|
||||
|
||||
var required = new { required = "true" };
|
||||
var required = " required";
|
||||
|
||||
foreach (var li in Model.ListItems)
|
||||
{
|
||||
var name = prefix + ".Selected";
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="radio" name="@name" id="@li.Value" value="@li.Value" @(li.Selected ? " checked" : "")>
|
||||
<input class="form-check-input" type="radio" name="@name" id="@li.Value" value="@li.Value" @(li.Selected ? " checked" : "")@required>
|
||||
<label class="form-check-label" for="@li.Value">
|
||||
@li.Text
|
||||
</label>
|
||||
</div>
|
||||
required = null;
|
||||
//required = string.Empty;
|
||||
}
|
||||
ViewData.TemplateInfo.HtmlFieldPrefix = prefix;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
@{
|
||||
var propertyName = ViewData.ModelMetadata.PropertyName;
|
||||
//var isChecked = Model.HasValue && Model.Value;
|
||||
}
|
||||
|
||||
<div class="@(Html.ValidationErrorFor(m => m, " is-invalid"))">
|
||||
|
||||
Reference in New Issue
Block a user