From f3a160598f6b7b58914e8c18647cf96016797524 Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Sat, 25 Jan 2025 22:40:23 +0000 Subject: [PATCH 1/3] Refactor view.tpl for admin/logs: Use class variable for log rows to eliminate whitespace from indentation in tr class attribute" --- view/theme/frio/templates/admin/logs/view.tpl | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl index 8f43a6b7e2..650cee9bc0 100644 --- a/view/theme/frio/templates/admin/logs/view.tpl +++ b/view/theme/frio/templates/admin/logs/view.tpl @@ -70,17 +70,17 @@ aria-label="{{$l10n.View_details}}" aria-haspopup="true" aria-expanded="false" data-data="{{$row->data}}" data-source="{{$row->source}}"> {{$row->date}} - level == "ALERT"}}bg-danger - {{elseif $row->level == "CRITICAL"}}bg-danger - {{elseif $row->level == "ERROR"}}bg-danger - {{elseif $row->level == "WARNING"}}bg-warning - {{elseif $row->level == "NOTICE"}}bg-info - {{elseif $row->level == "INFO"}}bg-info - {{else}}text-muted - {{/if}} - ">{{$row->level}} + {{assign var="class" value="bg-info"}} + {{if $row->level == "EMERGENCY" || $row->level == "ALERT" || $row->level == "CRITICAL" || $row->level == "ERROR"}} + {{assign var="class" value="bg-danger"}} + {{elseif $row->level == "WARNING"}} + {{assign var="class" value="bg-warning"}} + {{elseif $row->level == "NOTICE" || $row->level == "INFO"}} + {{assign var="class" value="bg-info"}} + {{else}} + {{ assign var="class" value="text-muted"}} + {{/if}} + {{$row->level}} {{$row->context}} {{$row->message}} From 2e472f84a77e9624aa95bcd31b57b00e9893f5c4 Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Sat, 25 Jan 2025 22:53:42 +0000 Subject: [PATCH 2/3] Refactor view.tpl for admin/logs: Assign bootstrap.css bg and text classes dynamically for log rows --- view/theme/frio/templates/admin/logs/view.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl index 650cee9bc0..2e27ce025e 100644 --- a/view/theme/frio/templates/admin/logs/view.tpl +++ b/view/theme/frio/templates/admin/logs/view.tpl @@ -70,13 +70,13 @@ aria-label="{{$l10n.View_details}}" aria-haspopup="true" aria-expanded="false" data-data="{{$row->data}}" data-source="{{$row->source}}"> {{$row->date}} - {{assign var="class" value="bg-info"}} + {{assign var="class" value="bg-info text-info"}} {{if $row->level == "EMERGENCY" || $row->level == "ALERT" || $row->level == "CRITICAL" || $row->level == "ERROR"}} - {{assign var="class" value="bg-danger"}} + {{assign var="class" value="bg-danger text-danger"}} {{elseif $row->level == "WARNING"}} - {{assign var="class" value="bg-warning"}} + {{assign var="class" value="bg-warning text-warning"}} {{elseif $row->level == "NOTICE" || $row->level == "INFO"}} - {{assign var="class" value="bg-info"}} + {{assign var="class" value="bg-info text-info"}} {{else}} {{ assign var="class" value="text-muted"}} {{/if}} From dc0d0946109dca7ab7fb01d7a0a7c02db553f700 Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Sat, 25 Jan 2025 23:07:17 +0000 Subject: [PATCH 3/3] Refactor view.tpl for admin/logs: Assign bootstrap.css text classes only (no bg adjustment) --- view/theme/frio/templates/admin/logs/view.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/view/theme/frio/templates/admin/logs/view.tpl b/view/theme/frio/templates/admin/logs/view.tpl index 2e27ce025e..ce0babdb04 100644 --- a/view/theme/frio/templates/admin/logs/view.tpl +++ b/view/theme/frio/templates/admin/logs/view.tpl @@ -70,13 +70,13 @@ aria-label="{{$l10n.View_details}}" aria-haspopup="true" aria-expanded="false" data-data="{{$row->data}}" data-source="{{$row->source}}"> {{$row->date}} - {{assign var="class" value="bg-info text-info"}} + {{assign var="class" value="text-info"}} {{if $row->level == "EMERGENCY" || $row->level == "ALERT" || $row->level == "CRITICAL" || $row->level == "ERROR"}} - {{assign var="class" value="bg-danger text-danger"}} + {{assign var="class" value="text-danger"}} {{elseif $row->level == "WARNING"}} - {{assign var="class" value="bg-warning text-warning"}} + {{assign var="class" value="text-warning"}} {{elseif $row->level == "NOTICE" || $row->level == "INFO"}} - {{assign var="class" value="bg-info text-info"}} + {{assign var="class" value="text-info"}} {{else}} {{ assign var="class" value="text-muted"}} {{/if}}