Update email and formating.

This commit is contained in:
2017-02-08 09:44:55 -05:00
parent 5f0e9baf1d
commit 8099f517e0
18 changed files with 219 additions and 83 deletions
+25
View File
@@ -0,0 +1,25 @@
@using ClientDependency.Core.Mvc
@using LeafWeb.WebCms.Controllers
@model ContactForm
@{
Html.RequiresJs("~/scripts/jquery.validate.min.js", 2);
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.min.js", 2);
Html.RequiresJs("~/scripts/jquery.validate.unobtrusive.bootstrap.min.js", 2);
Html.RequiresJs("~/scripts/jquery.validate.custom.js", 2);
}
<div class="container">
<div class="row">
<div class="col-md-6 col-md-push-2 well">
@Html.Partial("_ValidationSummary")
@using (Html.BeginUmbracoForm<ContactController>("Submit"))
{
@Html.EditorFor(m => m.Name)
@Html.EditorFor(m => m.Email)
@Html.EditorFor(m => m.Message)
<input type="submit" id="submit-form" class="hidden"/>}
<label for="submit-form" class="btn btn-primary pull-right">Send</label>
</div>
</div>
</div>
@@ -0,0 +1,4 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@{
Html.RenderAction("Index", "Contact");
}
-10
View File
@@ -33,15 +33,6 @@
</button>
}
@*@using (Html.BeginUmbracoForm<QueueController>(
"SendUserChartLink", null, new { @class = "confirm", confirm_msg = "Confirm sending email to user" }))
{
<input type="hidden" name="id" value="@Model.LeafInputId" />
<button type="submit" class="btn btn-default" @{if (!Model.HasLeafChart) { <text> disabled="disabled" </text> }}>
<span class="glyphicon glyphicon-send"></span> Email User Chart link
</button>
}*@
@DeleteLink(Model.LeafInputId, Model.Identifier, Model.IsDeletable)
</div>
<div class="col-sm-9">
@@ -49,7 +40,6 @@
</div>
</div>
@helper DeleteLink(int id, string identifier, bool deletable)
{
using (Html.BeginUmbracoForm<QueueController>(
+50 -50
View File
@@ -34,7 +34,7 @@
grid.Column("Identifier", "Identifier"),
grid.Column("SiteId", "Site Id"),
grid.Column("Name", "Submitted By"),
grid.Column("TimeInProgress", "Statistics", item => TimeInProgress(item.Value)),
grid.Column("TimeInProgress", "Statistics", item => Statistics(item.Value)),
grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
grid.Column("Total Results: " + Model.Items.Count(), format: item => Btns(item.Value))),
htmlAttributes: new {@class = "table table-striped table-bordered table-hover table-condensed"}
@@ -48,28 +48,28 @@ else
@helper Status(LeafInput leafInput)
{
if (leafInput.IsPending)
{
<span class="text-nowrap">
<span class="text-muted" title="@leafInput.PendingPriority.ToString() Priority">
@Html.Partial("DisplayTemplates/PriorityIcon", leafInput.PendingPriority)
if (leafInput.IsPending)
{
<span class="text-nowrap">
<span class="text-muted" title="@leafInput.PendingPriority.ToString() Priority">
@Html.Partial("DisplayTemplates/PriorityIcon", leafInput.PendingPriority)
</span>
@Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput.CurrentStatus.ToString())
</span>
}
else
{
<span class="text-nowrap">
@Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput.CurrentStatus.ToString())
@if (leafInput.OutputErrorMessage != null)
{
<i class="fa fa-warning text-danger" title="Generated Error Message"></i>
} else if (leafInput.OutputWarningMessage != null)
{
<i class="fa fa-warning text-info" title="Generated Warning Message"></i>
}
</span>
@Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput.CurrentStatus.ToString())
</span>
}
else
{
<span class="text-nowrap">
@Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput.CurrentStatus.ToString())
@if (leafInput.OutputErrorMessage != null)
{
<i class="fa fa-warning text-danger"></i>
} else if (leafInput.OutputWarningMessage != null)
{
<i class="fa fa-warning text-info"></i>
}
</span>
}
}
@helper Btns(LeafInput item)
@@ -129,41 +129,41 @@ else
<span class="glyphicon glyphicon-download"></span> ToUser
</a>
}
@helper TimeInProgress(LeafInput leafInput)
@helper Statistics(LeafInput leafInput)
{
var summary = new List<string> { "Added Time: " + leafInput.Added };
if (leafInput.StartTime.HasValue)
{
summary.Add("Start Time: " + leafInput.StartTime.Value);
}
if (leafInput.EndTime.HasValue)
{
summary.Add("End Time: " + leafInput.EndTime.Value);
}
var summaryText = string.Join(Environment.NewLine, summary);
<span class="text-nowrap" title="@summaryText">
<i class="fa fa-file-o"></i> @leafInput.InputFiles.Count @if(leafInput.InputFiles.Count > 1) {<text>LeafInputs</text>} else { <text>LeafInput</text>}
<br />
@if (leafInput.TimeInProgress > TimeSpan.Zero)
var summary = new List<string> { "Added Time: " + leafInput.Added };
if (leafInput.StartTime.HasValue)
{
<text>
<i class="fa fa-clock-o"></i> @leafInput.TimeInProgress.ToRoundedReadableString()
</text>
summary.Add("Start Time: " + leafInput.StartTime.Value);
}
else if (leafInput.IsPending)
if (leafInput.EndTime.HasValue)
{
<text>
<i class="fa fa-hourglass-start"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) est.
</text>
summary.Add("End Time: " + leafInput.EndTime.Value);
}
@if (leafInput.IsRunning)
{
<text>
var summaryText = string.Join(Environment.NewLine, summary);
<span class="text-nowrap" title="@summaryText">
<i class="fa fa-file-o"></i> @leafInput.InputFiles.Count @if(leafInput.InputFiles.Count > 1) {<text>LeafInputs</text>} else { <text>LeafInput</text>}
<br />
<i class="fa fa-hourglass-half"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) left
</text>
}
</span>
@if (leafInput.TimeInProgress > TimeSpan.Zero)
{
<text>
<i class="fa fa-clock-o"></i> @leafInput.TimeInProgress.ToRoundedReadableString()
</text>
}
else if (leafInput.IsPending)
{
<text>
<i class="fa fa-hourglass-start"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) est.
</text>
}
@if (leafInput.IsRunning)
{
<text>
<br />
<i class="fa fa-hourglass-half"></i> @Html.Partial("DisplayTemplates/_TimeRemaining", Tuple.Create(leafInput, Model.TimeInProgressEstimater)) left
</text>
}
</span>
}
@helper DeleteLink(LeafInput item)
{
+4 -4
View File
@@ -1,14 +1,14 @@
@if (TempData.ContainsKey("StatusMessage"))
{
<p class="center-content alert @Html.Raw(TempData["StatusMessage-Type"])">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p class="alert @Html.Raw(TempData["StatusMessage-Type"])">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@Html.Raw(TempData["StatusMessage"])
</p>
}
else if (ViewBag.StatusMessage != null)
{
<p class="center-content alert">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<p class="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@ViewBag.StatusMessage
</p>
}