fix alert component styles

Author: lovasoa

sqlpage/templates/alert.handlebars

@@ -1,48 +1,41 @@
-<div
-    {{#if id}}id="{{id}}"{{/if}}
-    class="
-        alert
-        alert-{{default color "info"}}
-        {{#if dismissible}}alert-dismissible{{/if}}
-        {{#if important}}alert-important{{/if}}
-        {{class}}
-    " 
-    role="alert"
->
-  <div class="d-flex">
+<div {{~#if id}} id="{{id}}" {{/if}} class="alert alert-{{default color " info"}} {{class}} {{~#if dismissible}}
+  alert-dismissible{{/if~}} {{~#if important}} alert-important{{/if~}} " role=" alert">
 
-    {{#if icon}}
-    <div class="icon alert-icon">
-        {{~icon_img icon~}}
+  {{~#if icon~}}
+  <div class="icon alert-icon">
+    {{~icon_img icon~}}
+  </div>
+  {{~/if~}}
+
+  <div class="overflow-auto">
+    {{~#if title~}}
+    <h4 class="alert-title" {{~#if important~}}style="color:inherit" {{/if~}}>{{title}}</h4>
+    {{~/if~}}
+
+    {{~#if description~}}
+    <div class="alert-description">
+      {{~description~}}
     </div>
-    {{/if}}
+    {{~/if~}}
 
-    <div>
-      {{#if title}}<h4 class="alert-title" {{#if important}}style="color:inherit"{{/if}}>{{title}}</h4>{{/if}}
-      {{~#if description~}}
-          <div class="alert-description">
-            {{~description~}}
-          </div>
-      {{~/if~}}
-      {{~#if description_md~}}
-          <div class="alert-description" style="margin-bottom: -1rem;">
-              {{{~markdown description_md~}}}
-          </div>
-      {{~/if~}}
-      {{#if link}}
-          <a href="{{link}}"
-              class="btn btn-sm alert-link mt-2 px-2 {{#if important}}text-{{default color 'info'}}{{/if}}"
-          >{{default link_text "Ok"}}</a>
-      {{/if}}
-      {{#each_row}}
-          <a href="{{link}}"
-              class="btn btn-sm btn-{{default color 'primary'}} mt-2 px-2"
-          >{{default title "Ok"}}</a>
-      {{/each_row}}
+    {{~#if description_md~}}
+    <div class="alert-description" style="margin-bottom: -1rem;">
+      {{{~markdown description_md~}}}
     </div>
+    {{~/if~}}
 
+    {{~#if link~}}
+    <a href="{{link}}" class="btn btn-sm alert-link mt-2 px-2 {{~#if important~}}text-{{default color 'info'}}{{/if~}}">
+      {{default link_text "Ok"}}
+    </a>
+    {{~/if~}}
+
+    {{~#each_row~}}
+    <a href="{{link}}" class="btn btn-sm btn-{{default color 'primary'}} mt-2 mx-1 px-2">{{default title "Ok"}}</a>
+    {{~/each_row~}}
   </div>
-  {{#if dismissible}}
-    <a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
-  {{/if}}
-</div>
+
+  {{~#if dismissible~}}
+  <a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
+  {{~/if~}}
+</div>

sqlpage/templates/error.handlebars

@@ -2,7 +2,7 @@
     <div class="alert-icon">
         {{icon_img 'alert-hexagon'}}
     </div>
-    <div class="overflow-auto">
+    <div class="overflow-auto w-100">
         <h4 class="alert-title">
             {{#if query_number}}
             Error in query number <strong>{{query_number}}</strong>

src/webserver/content_security_policy.rs

@@ -62,8 +62,8 @@ impl<'de> Deserialize<'de> for ContentSecurityPolicyTemplate {
     where
         D: serde::Deserializer<'de>,
     {
-        let s: &str = Deserialize::deserialize(deserializer)?;
-        Ok(Self::from(s))
+        let s: String = Deserialize::deserialize(deserializer)?;
+        Ok(Self::from(s.as_str()))
     }
 }