diff --git a/Web/Content/Site.admin.css b/Web/Content/Site.admin.css new file mode 100644 index 0000000..73992e2 --- /dev/null +++ b/Web/Content/Site.admin.css @@ -0,0 +1,466 @@ +body +{ + background-image: url('/Content/images/Background.png'); + background-repeat: repeat-x; + background-color: #b4eff6; + font-size: 85%; + font-family: "lucida grande",tahoma,verdana,arial,sans-serif; + margin: 0; + padding: 0; + color: #696969; +} + +a:link { + color: #2f3569; + text-decoration: underline; +} + +a:visited { + color: #1f2346; + text-decoration: underline; +} + +a:hover { + color: #b76d00; + text-decoration: none; +} + +a:active { + color: #d57f00; +} + +p, ul { + margin-bottom: 20px; + line-height: 1.6em; +} + +header, +footer, +nav, +section { + display: block; +} + +/* HEADINGS +----------------------------------------------------------*/ +h1, h2, h3, h4, h5, h6 { + font-size: 1.5em; + color: #000; +} + +h1 { + font-size: 2em; + padding-bottom: 0; + margin-bottom: 0; +} + +h2 { + padding: 0 0 5px 0; +} + +h3 { + font-size: 1.2em; +} + +h4 { + font-size: 1.1em; +} + +h5, h6 { + font-size: 1em; +} + +/* PRIMARY LAYOUT ELEMENTS +----------------------------------------------------------*/ + +/* you can specify a greater or lesser percentage for the +page width. Or, you can specify an exact pixel width. */ +.page { + width: 90%; + margin-left: auto; + margin-right: auto; +} + +header, #header { + position: relative; + margin-bottom: 0; + color: #000; + padding: 0; +} + +header h1, #header h1 { + font-weight: bold; + padding: 5px 0; + margin: 0; + color: #fff; + border: none; + line-height: 2em; + font-size: 32px !important; +} + +#header h1 a +{ + color: #fff; + text-decoration: none; +} + +#main +{ + clear: both; + padding: 30px 30px 15px 30px; + background-color: #fff; + border-radius: 4px 0 0 0; + -webkit-border-radius: 4px 0 0 0; + -moz-border-radius: 4px 0 0 0; +} + +footer, +#footer { + background-color: #777; + color: #444; + padding: 10px 0; + text-align: center; + line-height: normal; + margin: 0 0 30px 0; + font-size: .9em; + border-radius: 0 0 4px 4px; + -webkit-border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; +} + +/* TAB MENU +----------------------------------------------------------*/ +ul#menu { + border-bottom: 1px #73acb3 solid; + padding: 0 0 2px; + position: relative; + margin: 0; + text-align: right; +} + +ul#menu li { + display: inline; + list-style: none; +} + +ul#menu li#greeting { + padding: 10px 20px; + font-weight: bold; + text-decoration: none; + line-height: 2.8em; + color: #fff; +} + +ul#menu li a { + padding: 10px 20px; + font-weight: bold; + text-decoration: none; + line-height: 2.8em; + background-color: #d0d9c2; + color: #d57f00; + border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; +} + +ul#menu li a:hover { + background-color: #f1fff8; + text-decoration: none; +} + +ul#menu li a:active { + background-color: #f1fff8; + text-decoration: none; +} + +ul#menu li.selected a { + background-color: #fff; + color: #000; +} + +/* FORM LAYOUT ELEMENTS +----------------------------------------------------------*/ + +fieldset +{ + border: 2px solid #81B3B3; + width: 675px; + padding: 0 1.4em 1.4em 1.4em; + margin-right: auto; +} + +legend { + font-size: 1.2em; + font-weight: bold; +} + +textarea { + min-height: 75px; +} + +input[type="text"], +input[type="password"] { + border: 1px solid #ccc; + color: #444; + width: 200px; + width: 100px; +} + +select { + border: 1px solid #ccc; + padding: 2px; + color: #444; +} + +/* TABLE +----------------------------------------------------------*/ + +table { + border: solid 1px #e4f2f2; + border-collapse: collapse; +} + +table td { + padding: 4px; + border: solid 1px #e4f2f2; +} + +table th { + padding: 6px 4px; + text-align: left; + background-color: #e4f2f2; + border: solid 1px #e4f2f2; +} + +tbody td:nth-of-type(odd), +tbody tr:nth-of-type(odd) { + background:#e8eef4; + background:rgba(232, 238, 244, 0.25); +} + +table tfoot td { + background-color: #e4f2f2; + border: solid 1px #e4f2f2; +} + + +/* MISC +----------------------------------------------------------*/ +.clear { + clear: both; +} + +.error { + color: Red; +} + +nav, +#menucontainer { + margin-top: 5px; + clear: both; + float: left; +} + +div#title { + display: block; + float: left; + text-align: left; +} + +div#title a +{ + border-width: 0; +} + +form#filter +{ + display: inline-block; +} +div#newLog +{ + display: inline-block; +} + + +/* Styles for validation helpers +-----------------------------------------------------------*/ +.field-validation-error { + color: #AA5755; + display: block; +} + +.field-validation-valid { + display: none; +} + +.input-validation-error { + border: 1px solid #6E1E1C; + background-color: #F3E2E2; +} + +.validation-summary-errors { + font-weight: bold; + color: #ff0000; +} + +.validation-summary-valid { + display: none; +} + +/* Styles for editor and display helpers +----------------------------------------------------------*/ +.display-field-container, .editor-field-container +{ + display: inline-block; + vertical-align: top; + padding-right: 15px; + padding-bottom: 10px; +} + +.display-label, +.editor-label +{ + color: #7F6F50; + margin: 1em 0 0 0; +} + +.display-field, +.editor-field { + margin: 0.5em 0 0 0; + font-weight: bold; +} + +.text-box { + width: 30em; +} + +.text-box.multi-line { + height: 6.5em; +} + +.tri-state { + width: 6em; +} + +.format-hint +{ + color: #806F50; + font-size: .8em; + font-style: italic; + margin-top: 2px; + padding-left: 5px; +} + + +/* Input types */ + +.vehicleId input +{ + width: 60px; +} + +.endOdometer input +{ + width: 60px; +} + +.gasPurchased input +{ + width: 45px; +} + +.date input +{ + width: 70px; +} + +.units +{ + font-size: .9em; +} + +.employeeName input +{ + width: 135px; +} + +.cityName input +{ + width: 125px; +} + +.logType .radiobutton +{ + display: block; +} + +.modelYear input +{ + width: 40px; +} + +.make input +{ + width: 80px +} + +.key input +{ + width: 30px +} + +.model input +{ + width: 80px +} + +.vin input +{ + width: 150px +} + +.report-miles +{ + text-decoration: underline; +} + +.report-calculation +{ + display: none; +} + +.report-calculation table +{ + width: 100%; +} + +.ui-icon +{ +display: inline-block !important; +} + +.qtip-content h5 +{ + margin-top: 3px; + margin-bottom: 3px; +} + +.qtip-content p +{ + margin-top: 3px; + margin-bottom: 3px; +} + +.ui-message +{ + display: block; + margin-top: 10px; + padding: 3px; +} + +@media print { + #header, + #footer, + .no-print + { display:none } +} \ No newline at end of file diff --git a/Web/Content/Site.css b/Web/Content/Site.css index 9056c93..fe033a9 100644 --- a/Web/Content/Site.css +++ b/Web/Content/Site.css @@ -1,216 +1,29 @@ -body +body { - background-image: url('/Content/Background.png'); - background-repeat: repeat-x; - background-color: #b4eff6; - font-size: 85%; + font-size: 75%; font-family: "lucida grande",tahoma,verdana,arial,sans-serif; - margin: 0; - padding: 0; - color: #696969; + color: #232323; + background-color: #fff; } -a:link { - color: #2f3569; - text-decoration: underline; -} - -a:visited { - color: #1f2346; - text-decoration: underline; -} - -a:hover { - color: #b76d00; - text-decoration: none; -} - -a:active { - color: #d57f00; -} - -p, ul { - margin-bottom: 20px; - line-height: 1.6em; -} - -header, -footer, -nav, -section { - display: block; -} - -/* HEADINGS -----------------------------------------------------------*/ -h1, h2, h3, h4, h5, h6 { - font-size: 1.5em; - color: #000; -} - -h1 { - font-size: 2em; - padding-bottom: 0; - margin-bottom: 0; -} - -h2 { - padding: 0 0 5px 0; -} - -h3 { - font-size: 1.2em; -} - -h4 { - font-size: 1.1em; -} - -h5, h6 { - font-size: 1em; -} - -/* PRIMARY LAYOUT ELEMENTS -----------------------------------------------------------*/ - -/* you can specify a greater or lesser percentage for the -page width. Or, you can specify an exact pixel width. */ -.page { - width: 90%; +#header +{ + width: 452px; margin-left: auto; margin-right: auto; } -header, #header { - position: relative; - margin-bottom: 0px; - color: #000; - padding: 0; -} - -header h1, #header h1 { - font-weight: bold; - padding: 5px 0; - margin: 0; - color: #fff; - border: none; - line-height: 2em; - font-size: 32px !important; -} - -#header h1 a +input[type="radio"] { - color: #fff; - text-decoration: none; + margin-left: 3px; } -#main +h4 { - clear: both; - padding: 30px 30px 15px 30px; - background-color: #fff; - border-radius: 4px 0 0 0; - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; + color: #366; + margin: 3px; } -footer, -#footer { - background-color: #777; - color: #444; - padding: 10px 0; - text-align: center; - line-height: normal; - margin: 0 0 30px 0; - font-size: .9em; - border-radius: 0 0 4px 4px; - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; -} - -/* TAB MENU -----------------------------------------------------------*/ -ul#menu { - border-bottom: 1px #73acb3 solid; - padding: 0 0 2px; - position: relative; - margin: 0; - text-align: right; -} - -ul#menu li { - display: inline; - list-style: none; -} - -ul#menu li#greeting { - padding: 10px 20px; - font-weight: bold; - text-decoration: none; - line-height: 2.8em; - color: #fff; -} - -ul#menu li a { - padding: 10px 20px; - font-weight: bold; - text-decoration: none; - line-height: 2.8em; - background-color: #d0d9c2; - color: #d57f00; - border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; -} - -ul#menu li a:hover { - background-color: #f1fff8; - text-decoration: none; -} - -ul#menu li a:active { - background-color: #f1fff8; - text-decoration: none; -} - -ul#menu li.selected a { - background-color: #fff; - color: #000; -} - -/* FORM LAYOUT ELEMENTS -----------------------------------------------------------*/ - -fieldset -{ - border: 2px solid #81B3B3; - width: 675px; - padding: 0 1.4em 1.4em 1.4em; - margin-right: auto; -} - -legend { - font-size: 1.2em; - font-weight: bold; -} - -textarea { - min-height: 75px; -} - -input[type="text"], -input[type="password"] { - border: 1px solid #ccc; - color: #444; - width: 200px; - width: 100px; -} - -select { - border: 1px solid #ccc; - padding: 2px; - color: #444; -} /* TABLE ----------------------------------------------------------*/ @@ -225,7 +38,9 @@ table td { border: solid 1px #e4f2f2; } -table th { +table th +{ + color: #7F6F50; padding: 6px 4px; text-align: left; background-color: #e4f2f2; @@ -233,8 +48,9 @@ table th { } tbody td:nth-of-type(odd), -tbody tr:nth-of-type(odd){ - background:rgba(232, 238, 244, 0.25); +tbody tr:nth-of-type(odd) { + background:#e4f2f2; + background:rgba(228,242,242, 0.25); } table tfoot td { @@ -242,115 +58,84 @@ table tfoot td { border: solid 1px #e4f2f2; } +/* Styles for basic forms http://colorschemedesigner.com/#3i31Sg0llw0w0 +-----------------------------------------------------------*/ -/* MISC -----------------------------------------------------------*/ -.clear { - clear: both; -} - -.error { - color: Red; -} - -nav, -#menucontainer { - margin-top: 5px; - clear: both; - float: left; -} - -div#title { - display: block; - float: left; - text-align: left; -} - -div#title a +fieldset { - border-width: 0px; + border:2px solid #81B3B3; + padding:0 1.4em 1.4em 1.4em; + margin:0 0 1.5em 0; } -form#filter +legend { - display: inline-block; + color: #366; + font-size:1.2em; + font-weight: bold; } -div#newLog + +textarea { - display: inline-block; + min-height: 75px; +} + +.editor-label +{ + color: #7F6F50; + margin: 1em 0 0 0; + font-weight: bold; +} + +.editor-field +{ + margin:0.2em 0 0 0; +} + + +.display-label +{ + color: #7F6F50; + margin: 1em 0 0 0; + font-weight: bold; +} + +.display-field +{ + margin:0.2em 0 0 0; } /* Styles for validation helpers -----------------------------------------------------------*/ -.field-validation-error { +.field-validation-error +{ color: #AA5755; display: block; } -.field-validation-valid { +.field-validation-valid +{ display: none; } -.input-validation-error { +.input-validation-error +{ border: 1px solid #6E1E1C; background-color: #F3E2E2; } -.validation-summary-errors { +.validation-summary-errors +{ font-weight: bold; - color: #ff0000; + color: #AA5755; } -.validation-summary-valid { +.validation-summary-valid +{ display: none; } -/* Styles for editor and display helpers -----------------------------------------------------------*/ -.display-field-container, .editor-field-container -{ - display: inline-block; - vertical-align: top; - padding-right: 15px; - padding-bottom: 10px; -} - -.display-label, -.editor-label -{ - color: #7F6F50; - margin: 1em 0 0 0; -} - -.display-field, -.editor-field { - margin: 0.5em 0 0 0; - font-weight: bold; -} - -.text-box { - width: 30em; -} - -.text-box.multi-line { - height: 6.5em; -} - -.tri-state { - width: 6em; -} - -.format-hint -{ - color: #806F50; - font-size: .8em; - font-style: italic; - margin-top: 2px; - padding-left: 5px; -} - - /* Input types */ .vehicleId input @@ -393,73 +178,77 @@ div#newLog display: block; } -.modelYear input +/* Errors */ + + +.vehicle-id .field-validation-error { - width: 40px; + width: 60px; } -.make input +.odometer .field-validation-error { - width: 80px + width: 80px; } -.key input +.gas .field-validation-error { - width: 30px + width: 45px; } -.model input +.date .field-validation-error { - width: 80px + width: 70px; } -.vin input +.employeeName .field-validation-error { - width: 150px + width: 135px; } -.report-miles +.cityName .field-validation-error { - text-decoration: underline; + width: 125px; } -.report-calculation +/* hint! */ + +.format-hint { - display: none; + color: #806F50; + font-size: .8em; + font-style: italic; + margin-top: 2px; + padding-left: 5px; } -.report-calculation table +.subscript { - width: 100%; + font-size: .8em; + font-style: italic; } -.ui-icon +.warning { -display: inline-block !important; + background-color: yellow; } -.qtip-content h5 +span#icon-employee-history { - margin-top: 3px; - margin-bottom: 3px; + position: relative; + display: inline-block; + left: -20px; + bottom: -3px; + margin-right: -20px; } -.qtip-content p -{ - margin-top: 3px; - margin-bottom: 3px; +.transparent { + opacity: 0.1; } -.ui-message -{ - display: block; - margin-top: 10px; - padding: 3px; -} - -@media print { - #header, - #footer, - .no-print - { display:none } +.loading { + background-image: url('/Content/images/spinner.gif'); + background-repeat: no-repeat; + background-position: right; + padding-right: 20px; } \ No newline at end of file diff --git a/Web/Content/Site.min.css b/Web/Content/Site.min.css deleted file mode 100644 index 4bcfdc3..0000000 --- a/Web/Content/Site.min.css +++ /dev/null @@ -1,253 +0,0 @@ -body -{ - font-size: 75%; - font-family: "lucida grande",tahoma,verdana,arial,sans-serif; - color: #232323; - background-color: #fff; -} - -#header -{ - width: 452px; - margin-left: auto; - margin-right: auto; -} - -input[type="radio"] -{ - margin-left: 3px; -} - -h4 -{ - color: #366; - margin: 3px; -} - - -/* TABLE -----------------------------------------------------------*/ - -table { - border: solid 1px #e4f2f2; - border-collapse: collapse; -} - -table td { - padding: 4px; - border: solid 1px #e4f2f2; -} - -table th -{ - color: #7F6F50; - padding: 6px 4px; - text-align: left; - background-color: #e4f2f2; - border: solid 1px #e4f2f2; -} - -tbody td:nth-of-type(odd), -tbody tr:nth-of-type(odd){ - background:rgba(228,242,242, 0.25); -} - -table tfoot td { - background-color: #e4f2f2; - border: solid 1px #e4f2f2; -} - -/* Styles for basic forms http://colorschemedesigner.com/#3i31Sg0llw0w0 ------------------------------------------------------------*/ - -fieldset -{ - border:2px solid #81B3B3; - padding:0 1.4em 1.4em 1.4em; - margin:0 0 1.5em 0; -} - -legend -{ - color: #366; - font-size:1.2em; - font-weight: bold; -} - -textarea -{ - min-height: 75px; -} - -.editor-label -{ - color: #7F6F50; - margin: 1em 0 0 0; - font-weight: bold; -} - -.editor-field -{ - margin:0.2em 0 0 0; -} - - -.display-label -{ - color: #7F6F50; - margin: 1em 0 0 0; - font-weight: bold; -} - -.display-field -{ - margin:0.2em 0 0 0; -} - - -/* Styles for validation helpers ------------------------------------------------------------*/ -.field-validation-error -{ - color: #AA5755; - display: block; -} - -.field-validation-valid -{ - display: none; -} - -.input-validation-error -{ - border: 1px solid #6E1E1C; - background-color: #F3E2E2; -} - -.validation-summary-errors -{ - font-weight: bold; - color: #AA5755; -} - -.validation-summary-valid -{ - display: none; -} - -/* Input types */ - -.vehicleId input -{ - width: 60px; -} - -.endOdometer input -{ - width: 60px; -} - -.gasPurchased input -{ - width: 45px; -} - -.date input -{ - width: 70px; -} - -.units -{ - font-size: .9em; -} - -.employeeName input -{ - width: 135px; -} - -.cityName input -{ - width: 125px; -} - -.logType .radiobutton -{ - display: block; -} - -/* Errors */ - - -.vehicle-id .field-validation-error -{ - width: 60px; -} - -.odometer .field-validation-error -{ - width: 80px; -} - -.gas .field-validation-error -{ - width: 45px; -} - -.date .field-validation-error -{ - width: 70px; -} - -.employeeName .field-validation-error -{ - width: 135px; -} - -.cityName .field-validation-error -{ - width: 125px; -} - -/* hint! */ - -.format-hint -{ - color: #806F50; - font-size: .8em; - font-style: italic; - margin-top: 2px; - padding-left: 5px; -} - -.subscript -{ - font-size: .8em; - font-style: italic; -} - -.warning -{ - background-color: yellow; -} - -span#icon-employee-history -{ - position: relative; - display: inline-block; - left: -20px; - bottom: -3px; - margin-right: -20px; -} - -.transparent { - opacity: 0.1; -} - -.loading { - background-image: url('/Content/spinner.gif'); - background-repeat: no-repeat; - background-position: right; - padding-right: 20px; -} \ No newline at end of file diff --git a/Web/Content/VehicleColors.css b/Web/Content/VehicleColors.css index fab6326..3c6e419 100644 --- a/Web/Content/VehicleColors.css +++ b/Web/Content/VehicleColors.css @@ -80,5 +80,5 @@ .Unknown { color: Black; - background-image: url('/Content/Rainbow.png'); + background-image: url('/Content/images/Rainbow.png'); } \ No newline at end of file diff --git a/Web/Content/Background.png b/Web/Content/images/Background.png similarity index 100% rename from Web/Content/Background.png rename to Web/Content/images/Background.png diff --git a/Web/Content/Header.png b/Web/Content/images/Header.png similarity index 100% rename from Web/Content/Header.png rename to Web/Content/images/Header.png diff --git a/Web/Content/Header_white.png b/Web/Content/images/Header_white.png similarity index 100% rename from Web/Content/Header_white.png rename to Web/Content/images/Header_white.png diff --git a/Web/Content/Rainbow.png b/Web/Content/images/Rainbow.png similarity index 100% rename from Web/Content/Rainbow.png rename to Web/Content/images/Rainbow.png diff --git a/Web/Content/spinner.gif b/Web/Content/images/spinner.gif similarity index 100% rename from Web/Content/spinner.gif rename to Web/Content/images/spinner.gif diff --git a/Web/Global.asax.cs b/Web/Global.asax.cs index 0b76488..f02d9db 100644 --- a/Web/Global.asax.cs +++ b/Web/Global.asax.cs @@ -20,13 +20,7 @@ namespace MileageTraker.Web public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - - //routes.MapRoute( - // "Export Vehicles", - // "ETHRAVehicles{year}-{month}-{day}.xls", - // new { controller = "Vehicle", action = "Export" } - // ); - + routes.MapRoute( "Default", // Route name "{controller}/{action}/{id}", // URL with parameters diff --git a/Web/Views/CreateLog/Confirm.cshtml b/Web/Views/CreateLog/Confirm.cshtml index 5cc8393..8fec9bf 100644 --- a/Web/Views/CreateLog/Confirm.cshtml +++ b/Web/Views/CreateLog/Confirm.cshtml @@ -3,7 +3,7 @@ @{ ViewBag.Title = "Confirm"; ViewBag.PageStyle = "~/Content/CreateLog/Index.css"; - Layout = "~/Views/Shared/_Layout.min.cshtml"; + Layout = "~/Views/Shared/_Layout.cshtml"; var endOdometerStyle = Model.PreviousOdometer != null ? "style=padding-bottom:0px;" : ""; } @section Styles diff --git a/Web/Views/CreateLog/Index.cshtml b/Web/Views/CreateLog/Index.cshtml index 522310a..8438645 100644 --- a/Web/Views/CreateLog/Index.cshtml +++ b/Web/Views/CreateLog/Index.cshtml @@ -3,7 +3,7 @@ ViewBag.Title = "Enter Mileage Log"; ViewBag.PageStyle = "~/Content/CreateLog/Index.css"; - Layout = "~/Views/Shared/_Layout.min.cshtml"; + Layout = "~/Views/Shared/_Layout.cshtml"; } @section Styles { diff --git a/Web/Views/CreateLog/Success.cshtml b/Web/Views/CreateLog/Success.cshtml index 8d4e4b0..b01e5ea 100644 --- a/Web/Views/CreateLog/Success.cshtml +++ b/Web/Views/CreateLog/Success.cshtml @@ -3,7 +3,7 @@ ViewBag.Title = "Success"; ViewBag.PageStyle = "~/Content/CreateLog/Index.css"; - Layout = "~/Views/Shared/_Layout.min.cshtml"; + Layout = "~/Views/Shared/_Layout.cshtml"; } @{ @:
diff --git a/Web/Views/Shared/Error.cshtml b/Web/Views/Shared/Error.cshtml index d3bcd71..1bcaf5f 100644 --- a/Web/Views/Shared/Error.cshtml +++ b/Web/Views/Shared/Error.cshtml @@ -4,7 +4,7 @@ ViewBag.Title = "Error"; if (Model.ControllerName == "CreateLog") { - Layout = "~/Views/Shared/_Layout.min.cshtml"; + Layout = "~/Views/Shared/_Layout.cshtml"; } } diff --git a/Web/Views/Shared/_Layout.admin.cshtml b/Web/Views/Shared/_Layout.admin.cshtml new file mode 100644 index 0000000..b13b6a6 --- /dev/null +++ b/Web/Views/Shared/_Layout.admin.cshtml @@ -0,0 +1,38 @@ + + + + Mileage Traker - ETHRA - @ViewBag.Title + + + @RenderSection("Styles", false) + + +
+ +
+ @RenderBody() +
+ +
+ + + + + + @RenderSection("Scripts", false) + + diff --git a/Web/Views/Shared/_Layout.cshtml b/Web/Views/Shared/_Layout.cshtml index 4dc8efb..f2d1735 100644 --- a/Web/Views/Shared/_Layout.cshtml +++ b/Web/Views/Shared/_Layout.cshtml @@ -2,36 +2,25 @@ Mileage Traker - ETHRA - @ViewBag.Title + @RenderSection("Styles", false) + @if (ViewBag.PageStyle != null) + { + + } + -
- -
- @RenderBody() -
- + + @RenderBody() - + @RenderSection("Scripts", false) diff --git a/Web/Views/Shared/_Layout.min.cshtml b/Web/Views/Shared/_Layout.min.cshtml deleted file mode 100644 index 9f1035a..0000000 --- a/Web/Views/Shared/_Layout.min.cshtml +++ /dev/null @@ -1,27 +0,0 @@ - - - - Mileage Traker - ETHRA - @ViewBag.Title - - - - @RenderSection("Styles", false) - @if (ViewBag.PageStyle != null) - { - - } - - - - - @RenderBody() - - - - - - @RenderSection("Scripts", false) - - diff --git a/Web/Views/_ViewStart.cshtml b/Web/Views/_ViewStart.cshtml index efda124..2012a8f 100644 --- a/Web/Views/_ViewStart.cshtml +++ b/Web/Views/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "~/Views/Shared/_Layout.cshtml"; + Layout = "~/Views/Shared/_Layout.admin.cshtml"; } \ No newline at end of file diff --git a/Web/Web.csproj b/Web/Web.csproj index cc39016..833915b 100644 --- a/Web/Web.csproj +++ b/Web/Web.csproj @@ -133,14 +133,14 @@ - + - - + + - - - + + + @@ -183,7 +183,7 @@ Web.config - + @@ -191,7 +191,7 @@ - + @@ -209,7 +209,7 @@ - +