Former-commit-id: d40fd32426a5f919b9d7fb86aeb0d956a87313f7
TangShanKaiPing
wanggang 6 years ago
parent d221b48f2f
commit 9fd8f5c96b

@ -72,6 +72,9 @@
</noscript> </noscript>
@RenderBody() @RenderBody()
</section> </section>
<a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
<i class="fas fa-chevron-up"></i>
</a>
</div> </div>
<footer class="main-footer"> <footer class="main-footer">
<strong> <strong>

@ -40,24 +40,5 @@
</ItemGroup> </ItemGroup>
 <ItemGroup>  <ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" /> <EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup><ItemGroup> </ItemGroup>
<Content Remove="wwwroot\lib\fontawesome-free\css\all.min.css" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.eot" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.svg" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.ttf" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.woff" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-brands-400.woff2" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.eot" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.svg" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.ttf" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.woff" />
<Content Remove="wwwroot\lib\fontawesome-free\webfonts\fa-regular-400.woff2" />
<Content Remove="wwwroot\lib\ionicons\css\ionicons.min.css" />
<Content Remove="wwwroot\lib\ionicons\fonts\ionicons.eot" />
<Content Remove="wwwroot\lib\ionicons\fonts\ionicons.svg" />
<Content Remove="wwwroot\lib\ionicons\fonts\ionicons.ttf" />
<Content Remove="wwwroot\lib\jquery\jquery.min.js" />
</ItemGroup><ItemGroup>
<Folder Include="wwwroot\lib\admin-lte\" />
</ItemGroup>
</Project> </Project>

@ -72,6 +72,9 @@
</noscript> </noscript>
@RenderBody() @RenderBody()
</section> </section>
<a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
<i class="fas fa-chevron-up"></i>
</a>
</div> </div>
<footer class="main-footer"> <footer class="main-footer">
<strong> <strong>

@ -15,18 +15,18 @@
{ {
var uihit = prop.TemplateHint ?? prop.DataTypeName; var uihit = prop.TemplateHint ?? prop.DataTypeName;
var isRequired = prop.IsRequired && prop.ModelType != typeof(bool); var isRequired = prop.IsRequired && prop.ModelType != typeof(bool);
var htmlClass = "col-sm-2 control-label"; var htmlClass = "col-sm-2 col-form-label";
htmlClass += isRequired ? " required" : ""; htmlClass += isRequired ? " required" : "";
<div class="form-group"> <div class="form-group row">
@if (prop.ModelType == typeof(bool)) @if (prop.ModelType != typeof(bool))
{ {
<div class="col-sm-2"></div> @Html.Label(prop.PropertyName, prop.GetDisplayName() + "", new { @class = htmlClass })
} }
else else
{ {
@Html.Label(prop.PropertyName, prop.GetDisplayName() + "", new { @class = htmlClass }) <div class="col-sm-2"></div>
} }
<div class="col-sm-6"> <div class="col-sm-8">
@if (metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(System.ComponentModel.ReadOnlyAttribute))) @if (metadata.Attributes.Attributes.Any(o => o.GetType() == typeof(System.ComponentModel.ReadOnlyAttribute)))
{ {
<div class="form-control form-control-display"> <div class="form-control form-control-display">
@ -57,8 +57,9 @@
} }
else if (prop.ModelType == typeof(bool)) else if (prop.ModelType == typeof(bool))
{ {
<div class="checkboxfix"> <div class="col-sm-10 form-check">
@Html.CheckBox(prop.PropertyName) <span>@prop.GetDisplayName()</span> @Html.CheckBox(prop.PropertyName, new { @class = "form-check-input" })
@Html.Label(prop.PropertyName, prop.GetDisplayName() + "", new { @class = "form-check-label" })
</div> </div>
} }
else else

@ -9,39 +9,30 @@
<h3 class="card-title">@HtmlTitle</h3> <h3 class="card-title">@HtmlTitle</h3>
</div> </div>
<form action="@url" method="post" class="form-horizontal"> <form action="@url" method="post" class="form-horizontal">
<div class="card-header"> <div class="card-body">
@Html.AntiForgeryToken() @Html.AntiForgeryToken()
<div class="row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-sm-2 col-form-label"></div>
<div class="form-group"> @Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-8" }, "div")
<div class="col-sm-2"></div>
@Html.ValidationSummary(true, "错误:", new { @class = "text-danger col-sm-8" }, "div")
</div>
@(await Html.PartialAsync("/Views/Shared/EditorTemplates/Input.cshtml"))
</div>
</div> </div>
<div class="row"> @(await Html.PartialAsync("/Views/Shared/EditorTemplates/Input.cshtml"))
<div class="col-md-12"> <div class="form-group row">
<div class="form-group"> <div class="col-sm-2"> </div>
<div class="col-sm-2"> </div> <div class="col-sm-8">
<div class="col-sm-6"> @if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl))
@if (!DisableBackUrl && string.IsNullOrEmpty(BackUrl)) {
{ BackUrl = Url.Action("Index", null);
BackUrl = Url.Action("Index", null); <a class="btn btn-default" href="@BackUrl">
<a class="btn btn-default" href="@BackUrl"> 返回
返回 </a>
</a> }
} <button class="btn btn-primary" type="submit">
<button class="btn btn-primary" type="submit"> 确定
确定 </button>
</button> @if (controller == "Account" && action == "Login")
@if (controller == "Account" && action == "Login") {
{ <a href="@Url.Action("ForgotPassword")">忘记密码?</a>
<a href="@Url.Action("ForgotPassword")">忘记密码?</a> }
}
</div>
<div class="col-sm-2"> </div>
</div>
</div> </div>
</div> </div>
</div> </div>

@ -77,6 +77,9 @@
@RenderBody() @RenderBody()
</div> </div>
</div> </div>
<a id="back-to-top" href="#" class="btn btn-primary back-to-top" role="button" aria-label="Scroll to top">
<i class="fas fa-chevron-up"></i>
</a>
</div> </div>
<footer class="main-footer"> <footer class="main-footer">
<div class="container"> <div class="container">
@ -93,7 +96,6 @@
</div> </div>
</footer> </footer>
</div> </div>
<a id="backTop" class="btn btn-back-top bg-light-blue-active"></a>
@(await Html.PartialAsync("_Footer")) @(await Html.PartialAsync("_Footer"))
@RenderSection("scripts", required: false) @RenderSection("scripts", required: false)
<script src="~/js/site.js"></script> <script src="~/js/site.js"></script>

@ -1,3 +1,6 @@
.col-form-label{
text-align:right;
}
/*.content-header2 { /*.content-header2 {
overflow: hidden; overflow: hidden;
} }

@ -38,9 +38,6 @@ function updateSelectList(url, id) {
}); });
}; };
}(jQuery)); }(jQuery));
$(function () {
$('#backTop').backTop();
});
//ajax cache //ajax cache
$(function () { $(function () {
$.ajaxSetup({ $.ajaxSetup({
@ -260,28 +257,28 @@ $(function () {
$('select.search').select2({ language: "zh-CN" }); $('select.search').select2({ language: "zh-CN" });
}); });
$('body').on('click', '.cmd', function () { $('body').on('click', '.cmd', function () {
$.getJSON($(this).attr('href'), function (response) { $.getJSON($(this).attr('href'), function (response) {
console.log(response); console.log(response);
}).fail(function (jqxhr, textStatus, error) { }).fail(function (jqxhr, textStatus, error) {
var err = textStatus + ", " + error; var err = textStatus + ", " + error;
alert(err); alert(err);
}); });
return false; return false;
}); });
function update(url, parent, targetId) { function update(url, parent, targetId) {
$(targetId).find('option').not('[value=""]').remove(); $(targetId).find('option').not('[value=""]').remove();
if (url != null) { if (url != null) {
url += '?parentId=' + encodeURI(parent); url += '?parentId=' + encodeURI(parent);
$.getJSON(url, function (data) { $.getJSON(url, function (data) {
$.each(data, function (i, v) { $.each(data, function (i, v) {
$(targetId).append('<option value="' + v.Value + '">' + v.Text + '</option>'); $(targetId).append('<option value="' + v.Value + '">' + v.Text + '</option>');
}); });
}); });
} }
} }
function reset() { function reset() {
$('form').removeData('validator'); $('form').removeData('validator');
$('form').removeData('unobtrusiveValidation'); $('form').removeData('unobtrusiveValidation');
$.validator.unobtrusive.parse('form'); $.validator.unobtrusive.parse('form');
} }

@ -16,7 +16,4 @@
<ProjectReference Include="..\IoTClient\Assets\StreamingAssets\IoT.Resources.csproj" /> <ProjectReference Include="..\IoTClient\Assets\StreamingAssets\IoT.Resources.csproj" />
<ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" /> <ProjectReference Include="..\IoT.Shared\IoT.Shared.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="logs\" />
</ItemGroup>
</Project> </Project>

Binary file not shown.

@ -12,9 +12,4 @@
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="wwwroot\**\*" /> <EmbeddedResource Include="wwwroot\**\*" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Remove="wwwroot\js\node.js" />
<None Remove="wwwroot\js\product.js" />
<None Remove="wwwroot\product.html" />
</ItemGroup>
</Project> </Project>

Binary file not shown.
Loading…
Cancel
Save