diff --git a/Helper/StaticHelper.cs b/Helper/StaticHelper.cs index e994dcb..2039967 100644 --- a/Helper/StaticHelper.cs +++ b/Helper/StaticHelper.cs @@ -19,6 +19,7 @@ namespace CarCareTracker.Helper public static string SponsorsPath = "https://hargata.github.io/hargata/sponsors.json"; public static string TranslationPath = "https://hargata.github.io/lubelog_translations"; public static string TranslationDirectoryPath = $"{TranslationPath}/directory.json"; + public const string ReportNote = "Report generated by LubeLogger, a Free and Open Source Vehicle Maintenance Tracker - LubeLogger.com"; public static string GetTitleCaseReminderUrgency(ReminderUrgency input) { switch (input) diff --git a/Views/Home/Index.cshtml b/Views/Home/Index.cshtml index 886cd2c..dd8b6fd 100644 --- a/Views/Home/Index.cshtml +++ b/Views/Home/Index.cshtml @@ -5,7 +5,6 @@ var userConfig = config.GetUserConfig(User); var enableAuth = userConfig.EnableAuth; var userLanguage = userConfig.UserLanguage; - var logoUrl = config.GetLogoUrl(); } @model string @{ @@ -62,7 +61,7 @@
- +
diff --git a/Views/Login/ForgotPassword.cshtml b/Views/Login/ForgotPassword.cshtml index 8f04d79..aa73ae4 100644 --- a/Views/Login/ForgotPassword.cshtml +++ b/Views/Login/ForgotPassword.cshtml @@ -2,7 +2,6 @@ @inject IConfigHelper config @inject ITranslationHelper translator @{ - var logoUrl = config.GetLogoUrl(); var userLanguage = config.GetServerLanguage(); } @{ @@ -14,7 +13,7 @@
- +
diff --git a/Views/Login/Index.cshtml b/Views/Login/Index.cshtml index c525ae0..0ae0483 100644 --- a/Views/Login/Index.cshtml +++ b/Views/Login/Index.cshtml @@ -3,7 +3,6 @@ @inject ITranslationHelper translator @model string @{ - var logoUrl = config.GetLogoUrl(); var userLanguage = config.GetServerLanguage(); var registrationDisabled = config.GetServerDisabledRegistration(); var openIdConfigName = config.GetOpenIDConfig().Name; @@ -17,7 +16,7 @@
- +
diff --git a/Views/Login/OpenIDRegistration.cshtml b/Views/Login/OpenIDRegistration.cshtml index f049337..42b2fd5 100644 --- a/Views/Login/OpenIDRegistration.cshtml +++ b/Views/Login/OpenIDRegistration.cshtml @@ -2,7 +2,6 @@ @inject IConfigHelper config @inject ITranslationHelper translator @{ - var logoUrl = config.GetLogoUrl(); var userLanguage = config.GetServerLanguage(); } @model string @@ -15,7 +14,7 @@
- +
diff --git a/Views/Login/Registration.cshtml b/Views/Login/Registration.cshtml index ac576bb..5f24494 100644 --- a/Views/Login/Registration.cshtml +++ b/Views/Login/Registration.cshtml @@ -2,7 +2,6 @@ @inject IConfigHelper config @inject ITranslationHelper translator @{ - var logoUrl = config.GetLogoUrl(); var userLanguage = config.GetServerLanguage(); } @{ @@ -14,7 +13,7 @@
- +
diff --git a/Views/Login/ResetPassword.cshtml b/Views/Login/ResetPassword.cshtml index cb4cdb4..a07b7b4 100644 --- a/Views/Login/ResetPassword.cshtml +++ b/Views/Login/ResetPassword.cshtml @@ -2,7 +2,6 @@ @inject IConfigHelper config @inject ITranslationHelper translator @{ - var logoUrl = config.GetLogoUrl(); var userLanguage = config.GetServerLanguage(); } @{ @@ -14,7 +13,7 @@
- +
diff --git a/Views/Vehicle/_CollisionRecords.cshtml b/Views/Vehicle/_CollisionRecords.cshtml index f3bffd6..9818fbc 100644 --- a/Views/Vehicle/_CollisionRecords.cshtml +++ b/Views/Vehicle/_CollisionRecords.cshtml @@ -101,7 +101,7 @@
- +
@@ -145,6 +145,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_Gas.cshtml b/Views/Vehicle/_Gas.cshtml index 1478354..5cc3173 100644 --- a/Views/Vehicle/_Gas.cshtml +++ b/Views/Vehicle/_Gas.cshtml @@ -165,7 +165,7 @@
- +
@@ -215,6 +215,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_Notes.cshtml b/Views/Vehicle/_Notes.cshtml index bc56e47..ca84ac4 100644 --- a/Views/Vehicle/_Notes.cshtml +++ b/Views/Vehicle/_Notes.cshtml @@ -31,7 +31,7 @@
- +
@@ -55,6 +55,11 @@ } + + +
@StaticHelper.TruncateStrings(note.NoteText, 100)
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml index 0691618..842b09b 100644 --- a/Views/Vehicle/_OdometerRecords.cshtml +++ b/Views/Vehicle/_OdometerRecords.cshtml @@ -101,7 +101,7 @@
- +
@@ -145,6 +145,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_PlanRecords.cshtml b/Views/Vehicle/_PlanRecords.cshtml index f12ebe0..14714ec 100644 --- a/Views/Vehicle/_PlanRecords.cshtml +++ b/Views/Vehicle/_PlanRecords.cshtml @@ -44,7 +44,7 @@
- +
diff --git a/Views/Vehicle/_ReminderRecords.cshtml b/Views/Vehicle/_ReminderRecords.cshtml index 483858f..0d23c88 100644 --- a/Views/Vehicle/_ReminderRecords.cshtml +++ b/Views/Vehicle/_ReminderRecords.cshtml @@ -36,7 +36,7 @@
- +
@@ -105,6 +105,11 @@ } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_ServiceRecords.cshtml b/Views/Vehicle/_ServiceRecords.cshtml index 2e632d8..cb23ce8 100644 --- a/Views/Vehicle/_ServiceRecords.cshtml +++ b/Views/Vehicle/_ServiceRecords.cshtml @@ -101,7 +101,7 @@
- +
@@ -143,6 +143,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_SupplyRecords.cshtml b/Views/Vehicle/_SupplyRecords.cshtml index cbb6cac..e4586eb 100644 --- a/Views/Vehicle/_SupplyRecords.cshtml +++ b/Views/Vehicle/_SupplyRecords.cshtml @@ -113,7 +113,7 @@
- +
@@ -161,6 +161,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_TaxRecords.cshtml b/Views/Vehicle/_TaxRecords.cshtml index b081f15..46b11b6 100644 --- a/Views/Vehicle/_TaxRecords.cshtml +++ b/Views/Vehicle/_TaxRecords.cshtml @@ -95,7 +95,7 @@
- +
@@ -137,6 +137,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_UpgradeRecords.cshtml b/Views/Vehicle/_UpgradeRecords.cshtml index 7bf74a8..20048a5 100644 --- a/Views/Vehicle/_UpgradeRecords.cshtml +++ b/Views/Vehicle/_UpgradeRecords.cshtml @@ -101,7 +101,7 @@
- +
@@ -145,6 +145,11 @@ } } + + +
+ @StaticHelper.ReportNote +
diff --git a/Views/Vehicle/_VehicleHistory.cshtml b/Views/Vehicle/_VehicleHistory.cshtml index 794e99f..3d3b8bc 100644 --- a/Views/Vehicle/_VehicleHistory.cshtml +++ b/Views/Vehicle/_VehicleHistory.cshtml @@ -10,7 +10,7 @@
- + @translator.Translate(userLanguage, "Vehicle Maintenance Report")
@@ -107,19 +107,19 @@ - - - - - - + + + + + + @foreach (GenericReportModel reportData in Model.VehicleHistory) { - - - - - - + + + + + } + + +
@translator.Translate(userLanguage, "Type")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")@translator.Translate(userLanguage, "Type")@translator.Translate(userLanguage, "Date")@translator.Translate(userLanguage, "Odometer")@translator.Translate(userLanguage, "Description")@translator.Translate(userLanguage, "Cost")@translator.Translate(userLanguage, "Notes")
+ @if (reportData.DataType == ImportMode.ServiceRecord) { @translator.Translate(userLanguage, "Service") @@ -137,13 +137,18 @@ @translator.Translate(userLanguage, "Tax") } @reportData.Date.ToShortDateString()@(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0"))@reportData.Description@((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C"))@StaticHelper.TruncateStrings(reportData.Notes, 100)@reportData.Date.ToShortDateString()@(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0"))@reportData.Description@((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C"))@StaticHelper.TruncateStrings(reportData.Notes, 100)
+ @StaticHelper.ReportNote +
diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css index 196aeb0..01ca0be 100644 --- a/wwwroot/css/site.css +++ b/wwwroot/css/site.css @@ -107,25 +107,6 @@ html { background-color: #fff !important; } - td.col-1 { - width: 10%; - } - - td.col-4.text-wrap { - width: 30%; - } - - .col-2.servicehistorytype { - width: 13%; - } - .col-1.servicehistorydate{ - width: 13%; - } - - th.col-1 { - width: 10%; - } - th { color: #000 !important; background-color: #fff !important; @@ -467,6 +448,17 @@ html[data-bs-theme="light"] .api-method:hover { padding: 0rem; } +.lubelogger-logo { + height: 48px; + object-fit: scale-down; + pointer-events: none; +} + ::-ms-reveal { display: none; +} + +.lubelogger-report-banner { + border-top: thin solid black; + text-align: center; } \ No newline at end of file