@saltcorn/sbadmin2 0.8.8-beta.6 → 0.8.9

package/index.js

@@ -25,7 +25,7 @@ const {
 const renderLayout = require("@saltcorn/markup/layout");
 const { renderForm, link } = require("@saltcorn/markup");
 const {
-  alert,
+  toast,
   headersInHead,
   headersInBody,
 } = require("@saltcorn/markup/layout_utils");
@@ -46,6 +46,7 @@ const subItem = (currentUrl) => (item) =>
             item.class,
           ],
           href: text(item.link),
+          target: item.target_blank ? "_blank" : undefined,
         },
         item.icon ? i({ class: `fa-fw mr-05 ${item.icon}` }) : "",
         item.label
@@ -127,7 +128,11 @@ const sideBarItem = (currentUrl) => (item) => {
         ]
       : item.link
       ? a(
-          { class: "nav-link", href: text(item.link) },
+          {
+            class: "nav-link",
+            href: text(item.link),
+            target: item.target_blank ? "_blank" : undefined,
+          },
           item.icon ? i({ class: `fa-fw ${item.icon}` }) : "",
           span(text(item.label))
         )
@@ -403,13 +408,11 @@ const authWrap = ({
       <div class="row justify-content-center">
         <div class="col-xl-10 col-lg-12 col-md-9">
           <div class="card o-hidden border-0 shadow-lg my-5">
-            <div class="card-body p-0">
+            <div class="card-body p-2">
               <div class="row">
                 <div class="col">
                   <div class="p-5">
-                  <div id="alerts-area">
-                    ${alerts.map((a) => alert(a.type, a.msg)).join("")}
-                  </div>                  
+                  <div id="alerts-area">${/* deprecated */ ""}</div>
                     <div class="text-center">
                       <h1 class="h4 text-gray-900 mb-4">${title}</h1>
                     </div>
@@ -423,6 +426,17 @@ const authWrap = ({
           </div>
         </div>
       </div>
+      <div 
+        id="toasts-area"
+        class="toast-container position-fixed p-2 top-0 ${
+          isNode() ? "end-0" : "start-50"
+        }
+        style: "z-index: 999;"
+        aria-live="polite" 
+        aria-atomic="true"
+      >
+        ${alerts.map((a) => toast(a.type, a.msg)).join("")}
+      </div>
     </div>`
   );
 
@@ -460,15 +474,24 @@ const wrap = ({
       <div id="content-wrapper" class="d-flex flex-column">
         <div id="content">
           <div id="page-inner-content" class="container-fluid px-2">
-            <div id="alerts-area">
-              ${alerts.map((a) => alert(a.type, a.msg)).join("")}
-            </div>
-            <div >
+            <div id="alerts-area">${/* deprecated */ ""}</div>
+            <div>
               ${renderBody(title, body, role, req)}
             <div>
           </div>
         </div>
       </div>
+      <div 
+        id="toasts-area"
+        class="toast-container position-fixed ${
+          isNode() ? "top-0 end-0 p-2" : "bottom-0 start-50 p-0"
+        } end-0 p-2"
+        style: "z-index: 999; ${!isNode() ? "margin-bottom: 1.0rem" : ""}"
+        aria-live="polite"
+        aria-atomic="true"
+      >
+        ${alerts.map((a) => toast(a.type, a.msg)).join("")}
+      </div>
     </div>`
   );
 
@@ -481,12 +504,21 @@ const wrap = ({
  * @returns {string}
  */
 const exportRenderBody = ({ title, body, alerts, role, req }) =>
-  `<div id="alerts-area">
-    ${alerts.map((a) => alert(a.type, a.msg)).join("")}
-  </div>
+  `<div id="alerts-area">${/* deprecated */ ""}</div>
   <div >
     ${renderBody(title, body, role, req)}
-  <div>`;
+  <div>
+  <div 
+    id="toasts-area"
+    class="toast-container position-fixed ${
+      isNode() ? "top-0 end-0 p-2" : "bottom-0 start-50 p-0"
+    }"
+    style: "z-index: 999; ${!isNode() ? "margin-bottom: 1.0rem" : ""}"
+    aria-live="polite"
+    aria-atomic="true"
+  >
+    ${alerts.map((a) => toast(a.type, a.msg)).join("")}
+  </div>`;
 
 module.exports = {
   /** @type {number} */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/sbadmin2",
-  "version": "0.8.8-beta.6",
+  "version": "0.8.9",
   "description": "SB Admin 2 layout plugin",
   "main": "index.js",
   "scripts": {
@@ -9,8 +9,8 @@
     "clean": "echo \"Error: no TypeScript support yet\""
   },
   "dependencies": {
-    "@saltcorn/data": "0.8.8-beta.6",
-    "@saltcorn/markup": "0.8.8-beta.6",
+    "@saltcorn/data": "0.8.9",
+    "@saltcorn/markup": "0.8.9",
     "startbootstrap-sb-admin-2-bs5": "^4.1.5-beta.8",
     "nunito-fontface": "0.7.3"
   },