Cleanup and small fixes

This commit is contained in:
2020-08-04 21:40:32 -04:00
parent cb1b6c6e47
commit 2716b9bfb4
5 changed files with 59 additions and 16 deletions
+1 -1
View File
@@ -10,7 +10,7 @@ NOTES:
* Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
* A new version will invalidate both client and server cache and create new persisted files
-->
<clientDependency version="1253434195" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<clientDependency version="1125323495" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.UI.CdfLogger, umbraco">
<!--
This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
+1
View File
@@ -9,6 +9,7 @@ namespace LeafWeb.WebCms.Controllers
public const int Details_Admin = 1111;
public const int Details_Results = 1183;
public const int PasswordResetRequest = 1164;
public const int LeafInputCreate = 1099;
}
public static class LeafWebMemberProperties
+39 -13
View File
@@ -1,4 +1,5 @@
@using LeafWeb.Core.Entities
@using LeafWeb.WebCms.Controllers
@using LeafWeb.WebCms.Utility
@model SearchViewModel
@{
@@ -18,19 +19,32 @@
</div>
</div>
<div class="table-responsive">
@grid.Table(columns:
grid.Columns(
grid.Column("Identifier", "Identifier"),
grid.Column("SiteId", "Site Id"),
//grid.Column("Name", "Submitted By"),
grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
grid.Column("", format: item => Actions(item.Value), canSort: false)
),
htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
)
@grid.PagerList()
</div>
@if (Model.Items.Any())
{
<div class="table-responsive">
@grid.Table(columns:
grid.Columns(
grid.Column("Identifier", "Identifier"),
grid.Column("SiteId", "Site Id"),
//grid.Column("Name", "Submitted By"),
grid.Column("CurrentStatus", "Status", item => Status(item.Value)),
grid.Column("", format: item => Actions(item.Value), canSort: false)
),
htmlAttributes: new { @class = "table table-sm table-striped table-bordered table-hover" }
)
</div>
<div class="row justify-content-end">
<div class="col-sm">@grid.PagerList()</div>
<div class="col-sm col-lg-5 pl-4 pt-3 pt-sm-0">
<span class="pr-2">Download Results</span>
@DownloadResults()
</div>
</div>
}
else
{
<p>No results. <a href="@UmbracoContext.Current.UrlProvider.GetUrl(LeafWebPageIds.LeafInputCreate)">Click here to submit Leaf Data.</a></p>
}
@helper Actions(LeafInput leafInput)
@@ -42,3 +56,15 @@
{
@Html.Partial("DisplayTemplates/_LeafInputStatus", leafInput)
}
@helper DownloadResults()
{
<div class="btn-group" role="group" aria-label="Download">
<a class="btn btn-outline-secondary small" role="button" href="@Url.Action("ResultsInputZip", "Download", Model.Q.GetNameValueCollection().ToRouteValueDictionary())">
<span class="fa fa-download"></span> Input
</a>
<a class="btn btn-outline-secondary small" role="button" href="@Url.Action("ResultsOutputZip", "Download", Model.Q.GetNameValueCollection().ToRouteValueDictionary())">
<span class="fa fa-download"></span> Output
</a>
</div>
}
@@ -12,4 +12,6 @@
var id = ViewData.TemplateInfo.GetFullHtmlFieldId("");
}
<input id="@id" name="@id" type="checkbox" @if(isChecked) {<text>checked="checked"</text>} />
<input id="@id" name="@id" type="checkbox"
@if(isChecked) {<text>checked="checked"</text>}
@if(htmlAttributes.ContainsKey("class")){<text>class="@htmlAttributes["class"]"</text> } />
+14
View File
@@ -6,6 +6,20 @@
required: function ()
{
return !!$(".lat input.form-control").val();
},
messages: {
required: "Enter +/- range of latitude"
}
});
$("form#leafdataquery .lonr input.form-control")
.rules("add",
{
//required: true
required: function () {
return !!$(".lon input.form-control").val();
},
messages: {
required: "Enter +/- range of longitude"
}
});
});