@saltcorn/server 0.8.7-beta.5 → 0.8.7-beta.6

package/locales/en.json

@@ -1191,5 +1191,7 @@
 	"Do not allow the following fields to have a value set from the query string or state": "Do not allow the following fields to have a value set from the query string or state",
 	"Action configuration saved": "Action configuration saved",
 	"Prevent any deletion of parent rows": "Prevent any deletion of parent rows",
-	"If the parent row is deleted, set key fields on child rows to null": "If the parent row is deleted, set key fields on child rows to null"
+	"If the parent row is deleted, set key fields on child rows to null": "If the parent row is deleted, set key fields on child rows to null",
+	"Link out?": "Link out?",
+	"Show a link to open popup contents in new tab": "Show a link to open popup contents in new tab"
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.7-beta.5",
+  "version": "0.8.7-beta.6",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.7-beta.5",
-    "@saltcorn/builder": "0.8.7-beta.5",
-    "@saltcorn/data": "0.8.7-beta.5",
-    "@saltcorn/admin-models": "0.8.7-beta.5",
-    "@saltcorn/filemanager": "0.8.7-beta.5",
-    "@saltcorn/markup": "0.8.7-beta.5",
-    "@saltcorn/sbadmin2": "0.8.7-beta.5",
+    "@saltcorn/base-plugin": "0.8.7-beta.6",
+    "@saltcorn/builder": "0.8.7-beta.6",
+    "@saltcorn/data": "0.8.7-beta.6",
+    "@saltcorn/admin-models": "0.8.7-beta.6",
+    "@saltcorn/filemanager": "0.8.7-beta.6",
+    "@saltcorn/markup": "0.8.7-beta.6",
+    "@saltcorn/sbadmin2": "0.8.7-beta.6",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn.css

@@ -464,3 +464,6 @@ div.unread-notify {
   grid-column: 3;
   grid-row: 3;
 }
+.sc-modal-linkout {
+  color: inherit;
+}

package/public/saltcorn.js

@@ -149,6 +149,8 @@ function pjax_to(href, e) {
       success: function (res, textStatus, request) {
         if (!inModal && !localizer.length)
           window.history.pushState({ url: href }, "", href);
+        if (inModal && !localizer.length)
+          $(".sc-modal-linkout").attr("href", href);
         setTimeout(() => {
           loadPage = true;
         }, 0);
@@ -258,11 +260,14 @@ function ensure_modal_exists_and_closed() {
       <div class="modal-content">
         <div class="modal-header">
           <h5 class="modal-title">Modal title</h5>
-          <span class="sc-ajax-indicator-wrapper">
-            <span class="sc-ajax-indicator ms-2" style="display: none;"><i class="fas fa-save"></i></span>
-          </span>
-          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">            
-          </button>
+          <div class="">
+            <span class="sc-ajax-indicator-wrapper">
+              <span class="sc-ajax-indicator ms-2" style="display: none;"><i class="fas fa-save"></i></span>
+            </span>
+            <a class="sc-modal-linkout ms-2" href="" target="_blank"><i class="fas fa-expand-alt"></i></a>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">            
+            </button>
+          </div>
         </div>
         <div class="modal-body">
           <p>Modal body text goes here.</p>
@@ -300,6 +305,9 @@ function ajax_modal(url, opts = {}) {
       );
       if (saveIndicate) $(".sc-ajax-indicator-wrapper").show();
       else $(".sc-ajax-indicator-wrapper").hide();
+      var linkOut = !!request.getResponseHeader("SaltcornModalLinkOut");
+      if (linkOut) $(".sc-modal-linkout").show().attr("href", url);
+      else $(".sc-modal-linkout").hide();
       if (width) $(".modal-dialog").css("max-width", width);
       else $(".modal-dialog").css("max-width", "");
       if (title) $("#scmodal .modal-title").html(decodeURIComponent(title));

package/routes/view.js

@@ -83,6 +83,8 @@ router.get(
       );
     if (isModal && view.attributes?.popup_save_indicator)
       res.set("SaltcornModalSaveIndicator", `true`);
+    if (isModal && view.attributes?.popup_link_out)
+      res.set("SaltcornModalLinkOut", `true`);
     if (tic) {
       const tock = new Date();
       const ms = tock.getTime() - tic.getTime();

package/routes/viewedit.js

@@ -250,6 +250,14 @@ const viewForm = async (req, tableOptions, roles, pages, values) => {
         parent_field: "attributes",
         tab: "Popup settings",
       },
+      {
+        name: "popup_link_out",
+        label: req.__("Link out?"),
+        sublabel: req.__("Show a link to open popup contents in new tab"),
+        type: "Bool",
+        parent_field: "attributes",
+        tab: "Popup settings",
+      },
       ...(isEdit
         ? [
             new Field({