From fbe55081f56247359adbc48cdbd29284d043c65f Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Sun, 16 Dec 2012 13:45:01 -0500 Subject: [PATCH] Format the criteria for the reports --- Web/Content/Site.admin.css | 8 +++++++ Web/Content/Site.css | 4 ++++ Web/Views/Log/MonthlyEmployeeMileage.cshtml | 23 ++++++++++++++------ Web/Views/Log/MonthlyVehicleMileage.cshtml | 24 +++++++++++++++------ 4 files changed, 47 insertions(+), 12 deletions(-) diff --git a/Web/Content/Site.admin.css b/Web/Content/Site.admin.css index d988eb3..38d80d8 100644 --- a/Web/Content/Site.admin.css +++ b/Web/Content/Site.admin.css @@ -66,6 +66,14 @@ footer { background-position: 0 0; } +dl.inline, dl.inline dt, dl.inline dd { + float: left; +} + +dl.inline { + margin-right: 30px; +} + @media print { header, footer, diff --git a/Web/Content/Site.css b/Web/Content/Site.css index 3dcfd2d..8c66bfa 100644 --- a/Web/Content/Site.css +++ b/Web/Content/Site.css @@ -53,4 +53,8 @@ body { .employeeName input { width: 120px; } + + .form-horizontal .control-group.endOdometer { + margin-bottom: 0; + } } \ No newline at end of file diff --git a/Web/Views/Log/MonthlyEmployeeMileage.cshtml b/Web/Views/Log/MonthlyEmployeeMileage.cshtml index 331e896..d9a23dd 100644 --- a/Web/Views/Log/MonthlyEmployeeMileage.cshtml +++ b/Web/Views/Log/MonthlyEmployeeMileage.cshtml @@ -14,12 +14,23 @@

@ViewBag.Title

-@Html.DisplayFor(m => m.Query.Year) -@Html.DisplayFor(m => m.Query.Month) -@if (Model.Query.LogType.HasValue) -{ - @Html.DisplayFor(m => m.Query.LogType) -} +
+
+
Year
+
@Html.Encode(Model.Query.Year)
+
+
+
Month
+
@Html.Encode(Model.Query.Month)
+
+ @if (Model.Query.LogType.HasValue) + { +
+
Type
+
@Html.Encode(Model.Query.LogType)
+
+ } +
diff --git a/Web/Views/Log/MonthlyVehicleMileage.cshtml b/Web/Views/Log/MonthlyVehicleMileage.cshtml index 9b44ab2..3145f39 100644 --- a/Web/Views/Log/MonthlyVehicleMileage.cshtml +++ b/Web/Views/Log/MonthlyVehicleMileage.cshtml @@ -15,12 +15,24 @@

@ViewBag.Title

- @Html.DisplayFor(m => m.Query.Year) - @Html.DisplayFor(m => m.Query.Month) - @if (Model.Query.LogType.HasValue) - { - @Html.DisplayFor(m => m.Query.LogType) - } +
+
+
Year
+
@Html.Encode(Model.Query.Year)
+
+
+
Month
+
@Html.Encode(Model.Query.Month)
+
+ @if (Model.Query.LogType.HasValue) + { +
+
Type
+
@Html.Encode(Model.Query.LogType)
+
+ } +
+