New style partially complete
This commit is contained in:
@@ -3,23 +3,30 @@
|
||||
@{
|
||||
ViewBag.Title = "Create Log";
|
||||
}
|
||||
@section Styles
|
||||
{
|
||||
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
|
||||
}
|
||||
@section Scripts
|
||||
{
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
|
||||
}
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
|
||||
<div>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
|
||||
</div>
|
||||
|
||||
@using (Html.BeginForm()) {
|
||||
@using (Html.BeginForm("Create", "Log", FormMethod.Post, new { @class = "form-horizontal" })) {
|
||||
@Html.ValidationSummary(true)
|
||||
<fieldset>
|
||||
<legend>Log</legend>
|
||||
@Html.EditorForModel()
|
||||
<p>
|
||||
<input type="submit" value="Create" />
|
||||
<input type="submit" value="Create" class="btn btn-primary" />
|
||||
</p>
|
||||
</fieldset>
|
||||
}
|
||||
|
||||
<p>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
|
||||
</p>
|
||||
|
||||
@@ -6,14 +6,15 @@
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
|
||||
<h3>Are you sure you want to delete this?</h3>
|
||||
<fieldset>
|
||||
<legend>Log</legend>
|
||||
@Html.DisplayForModel()
|
||||
</fieldset>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
|
||||
|
||||
<h3>Are you sure you wish to delete this log?</h3>
|
||||
|
||||
@Html.DisplayForModel()
|
||||
|
||||
@using (Html.BeginForm()) {
|
||||
<p>
|
||||
<input type="submit" value="Delete" />
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
|
||||
<input type="submit" value="Delete" class="btn btn-warning" />
|
||||
@Html.ActionLink("Cancel", "Details", new { id = Model.LogId }, new { @class = "btn" })
|
||||
</p>
|
||||
}
|
||||
|
||||
@@ -5,19 +5,24 @@
|
||||
}
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
<p>
|
||||
@Html.ActionLink("Previous", "PreviousDetails", new { id = Model.LogId }, new { @class = "ui-button" })
|
||||
@Html.ActionLink("Next", "NextDetails", new { id = Model.LogId }, new { @class = "ui-button" })
|
||||
@if(TempData["Message"] != null) {
|
||||
<span class="ui-message ui-state-highlight ui-corner-all">@TempData["Message"]</span>
|
||||
}
|
||||
</p>
|
||||
<div>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
|
||||
@Html.ActionLink("Edit", "Edit", new { id = Model.LogId }, new { @class = "btn" })
|
||||
@Html.ActionLink("Delete", "Delete", new { id = Model.LogId }, new { @class = "btn" })
|
||||
</div>
|
||||
|
||||
<fieldset>
|
||||
<legend>Log</legend>
|
||||
@Html.DisplayForModel()
|
||||
</fieldset>
|
||||
<p>
|
||||
@Html.ActionLink("Edit", "Edit", new { id = Model.LogId }, new { @class = "ui-button" })
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
|
||||
</p>
|
||||
|
||||
<div>
|
||||
<ul class="pager">
|
||||
<li class="previous">
|
||||
@Html.ActionLink("Previous", "PreviousDetails", new { id = Model.LogId })
|
||||
</li>
|
||||
@if(TempData["Message"] != null) {
|
||||
<span class="alert">@TempData["Message"]</span>
|
||||
}
|
||||
<li class="next">
|
||||
@Html.ActionLink("Next", "NextDetails", new { id = Model.LogId })
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -5,6 +5,6 @@
|
||||
}
|
||||
<h5>Previous Log</h5>
|
||||
@Html.DisplayForModel()
|
||||
<p>
|
||||
@Html.ActionLink("Details", "Details", new { id = Model.LogId })
|
||||
</p>
|
||||
<div>
|
||||
@Html.ActionLink("Details", "Details", new { id = Model.LogId }, new { @class = "btn"})
|
||||
</div>
|
||||
@@ -3,13 +3,25 @@
|
||||
@{
|
||||
ViewBag.Title = "Edit Log";
|
||||
}
|
||||
@section Styles
|
||||
{
|
||||
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
|
||||
}
|
||||
@section Scripts
|
||||
{
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
|
||||
}
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
|
||||
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
|
||||
<div>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "btn" })
|
||||
</div>
|
||||
|
||||
@using (Html.BeginForm()) {
|
||||
@using (Html.BeginForm("Edit", "Log", FormMethod.Post, new { @class = "form-horizontal" }))
|
||||
{
|
||||
@Html.ValidationSummary(true)
|
||||
<fieldset>
|
||||
<legend>Log</legend>
|
||||
@@ -21,7 +33,3 @@
|
||||
</p>
|
||||
</fieldset>
|
||||
}
|
||||
|
||||
<p>
|
||||
@Html.ActionLink("Back to List", "Index", null, new { @class = "ui-button" })
|
||||
</p>
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
<div>
|
||||
No logs have been added. @Html.ActionLink("Create Log", "Create", null, new { @class = "ui-button" }).
|
||||
No logs have been added. @Html.ActionLink("Create Log", "Create", null, new { @class = "btn" }).
|
||||
</div>
|
||||
+33
-18
@@ -7,31 +7,40 @@
|
||||
var grid = new WebGrid(Model.Logs, rowsPerPage: 45);
|
||||
}
|
||||
@section Styles {
|
||||
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
|
||||
<link href="@Url.Content("~/Content/jquery.qtip.min.css")" rel="stylesheet" type="text/css" />
|
||||
<link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
|
||||
}
|
||||
@section Scripts
|
||||
{
|
||||
<script src="@Url.Content("~/Scripts/jquery.qtip.min.js")" type="text/javascript"></script>
|
||||
}
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
<h2><img src="/Content/images/glyphicons_026_road.png"/> @ViewBag.Title</h2>
|
||||
|
||||
<p>
|
||||
@using (Html.BeginForm("Index", "Log", FormMethod.Get, new { id = "filter" }))
|
||||
<div class="btn-toolbar">
|
||||
@using (Html.BeginForm("Index", "Log", FormMethod.Get, new { id = "filter", @class = "form-inline" }))
|
||||
{
|
||||
@Html.EditorForModel()
|
||||
<input type="submit" value="Filter" />
|
||||
<div class="input-append pull-right">
|
||||
@Html.EditorForModel()
|
||||
<input type="submit" value="Filter" class="btn" />
|
||||
</div>
|
||||
}
|
||||
</p>
|
||||
<p>
|
||||
<div id="newLog">
|
||||
@Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
|
||||
@Html.ActionLink("Employee Mileage", "MonthlyEmployeeMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
|
||||
@Html.ActionLink("Add New Log", "Create", null, new { @class = "ui-button" })
|
||||
@Html.ActionLink("Export", "Export", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "ui-button" })
|
||||
|
||||
@Html.ActionLink("Add New Log", "Create", null, new { @class = "btn" })
|
||||
@Html.ActionLink("Export", "Export", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType }, new { @class = "btn" })
|
||||
|
||||
<div class="btn-group">
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Report <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
@Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType })
|
||||
</li>
|
||||
<li>
|
||||
@Html.ActionLink("Employee Mileage", "MonthlyEmployeeMileage", new { Year = Model.SelectedYear, Month = Model.SelectedMonth, LogType = Model.SelectedLogType })
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@grid.GetHtml(columns:
|
||||
@@ -52,9 +61,15 @@
|
||||
grid.Column("Date", format: item => item.Date.ToString("d")),
|
||||
grid.Column("CityName", "City Name"),
|
||||
grid.Column("EmployeeName", "Employee Name"),
|
||||
grid.Column(format: item => Html.ActionLink("Edit", "Edit", new { id = item.LogId })),
|
||||
grid.Column(format: item => Html.ActionLink("Details", "Details", new { id = item.LogId })),
|
||||
grid.Column(format: item => Html.ActionLink("Delete", "Delete", new { id = item.LogId }))
|
||||
)
|
||||
grid.Column(format: item =>
|
||||
(new MvcHtmlString("<div class='btn-group'>"))
|
||||
.Concat(Html.ActionLink("Edit", "Edit", new { id = item.LogId }, new { @class = "btn btn-mini" }))
|
||||
.Concat(Html.ActionLink("Details", "Details", new { id = item.LogId }, new { @class = "btn btn-mini" }))
|
||||
.Concat(Html.ActionLink("Delete", "Delete", new { id = item.LogId }, new { @class = "btn btn-mini" }))
|
||||
.Concat("</div>")
|
||||
)
|
||||
),
|
||||
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed"},
|
||||
numericLinksCount: 20
|
||||
)
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@model IEnumerable<Tuple<Log, Log>>
|
||||
|
||||
<div class="report-calculation">
|
||||
<table>
|
||||
<table class="table">
|
||||
<thead><tr><th>Date</th><th>City</th><th>End ODO</th><th>Start ODO</th><th>Miles</th></tr></thead>
|
||||
@foreach (var log in Model)
|
||||
{
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
|
||||
<p class="no-print">
|
||||
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "ui-button" })
|
||||
<p class="no-print btn-group">
|
||||
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "btn" })
|
||||
</p>
|
||||
@Html.DisplayFor(m => m.Query.Year)
|
||||
@Html.DisplayFor(m => m.Query.Month)
|
||||
@@ -21,7 +21,7 @@
|
||||
{
|
||||
@Html.DisplayFor(m => m.Query.LogType)
|
||||
}
|
||||
<table>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>
|
||||
Employee
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
|
||||
<h2>@ViewBag.Title</h2>
|
||||
|
||||
<p class="no-print">
|
||||
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "ui-button" })
|
||||
<p class="no-print btn-group">
|
||||
@Html.ActionLink("Logs", "Index", "Log", Model.Query, new { @class = "btn" })
|
||||
</p>
|
||||
@Html.DisplayFor(m => m.Query.Year)
|
||||
@Html.DisplayFor(m => m.Query.Month)
|
||||
@@ -22,7 +22,7 @@
|
||||
{
|
||||
@Html.DisplayFor(m => m.Query.LogType)
|
||||
}
|
||||
<table>
|
||||
<table class="table">
|
||||
<tr>
|
||||
<th>
|
||||
Vehicle Id
|
||||
|
||||
Reference in New Issue
Block a user