Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Changed displayToast background paramter to type to display error messages for a longer period
givanz2dbff4545392
diff --git a/public/js/admin.js b/public/js/admin.jsindex bd773de..746401a 100755--- a/public/js/admin.js+++ b/public/js/admin.js@@ -71,20 +71,28 @@ function ucFirst(str) {return str[0].toUpperCase() + str.slice(1);}-function displayToast(bg, title, message, position = 'bottom', id = "bottom-toast") {- let toast = document.getElementById(id);+function displayToast(type, title, message, position = 'bottom', id = null) {+ if (!id) {+ id = position + "-toast";+ }+ let toast = document.getElementById(id);let header = toast.querySelector(".toast-header");toast.classList.remove("bottom-0", "top-0");toast.classList.add(position + "-0");toast.querySelector(".toast-body .message").innerHTML = message;header.classList.remove("bg-danger", "bg-success");- header.classList.add(bg);+ header.classList.add("bg-" + type);header.querySelector("strong").textContent = title;let toastDisplay = toast.cloneNode(true);toast.parentNode.appendChild(toastDisplay);- let bsToast = new bootstrap.Toast(toastDisplay, {animation:true});+ let delay = 3000;+ if (type == "danger") {+ delay = 20000;+ }++ let bsToast = new bootstrap.Toast(toastDisplay, {animation:true, delay});toastDisplay.addEventListener('hidden.bs.toast', () => {toastDisplay.remove();});diff --git a/public/js/admin/controller/cache.js b/public/js/admin/controller/cache.jsindex 03ca9d8..77182a9 100644--- a/public/js/admin/controller/cache.js+++ b/public/js/admin/controller/cache.js@@ -11,11 +11,11 @@ class CacheController {.then((data) => {let response = new DOMParser().parseFromString(data, "text/html");let message = response.querySelector(".notifications .alert [data-v-notification-text]")?.innerHTML;- displayToast("bg-success", "Cache", message, "top");+ displayToast("success", "Cache", message, "top");}).catch(error => {- displayToast("bg-danger", "Cache", "Error", "top");- //displayToast("bg-danger", "Error", "Error saving!");+ displayToast("danger", "Cache", "Error", "top");+ //displayToast("danger", "Error", "Error saving!");});e.preventDefault();diff --git a/public/js/admin/controller/update.js b/public/js/admin/controller/update.jsindex 9024e99..81f2a39 100755--- a/public/js/admin/controller/update.js+++ b/public/js/admin/controller/update.js@@ -88,11 +88,11 @@ class UpdateController {})*/.catch(error => {let message = error?.statusText ?? "Error updating!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);if (error.hasOwnProperty('text')) error.text().then( errorMessage => {let message = errorMessage.substr(0, 200);- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);});if (typeof error.json === "function") {diff --git a/public/js/admin/functions.js b/public/js/admin/functions.jsindex 08dd3ce..5ae8770 100644--- a/public/js/admin/functions.js+++ b/public/js/admin/functions.js@@ -182,7 +182,7 @@ function optionTypeChange(element) {}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error saving!");+ displayToast("danger", "Error", "Error saving!");});} else {setValues(optionValues[optionValueId]);diff --git a/public/js/admin/heartbeat.js b/public/js/admin/heartbeat.jsindex 10da4d2..3b4791b 100755--- a/public/js/admin/heartbeat.js+++ b/public/js/admin/heartbeat.js@@ -55,7 +55,7 @@ let HeartBeat = setInterval(function () {document.querySelector('.btn-login .loading').classList.add('d-none');document.querySelector('.btn-login .button-text').classList.remove('d-none');console.log(error.statusText);- displayToast("bg-danger", "Login", "Error!");+ displayToast("danger", "Login", "Error!");});diff --git a/public/js/admin/revisions.js b/public/js/admin/revisions.jsindex 68a49f2..106a2c8 100644--- a/public/js/admin/revisions.js+++ b/public/js/admin/revisions.js@@ -7,7 +7,7 @@ function revisionAction(action, data, callback) {.then(callback).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Revision", "Error!");+ displayToast("danger", "Revision", "Error!");});}@@ -27,7 +27,7 @@ document.querySelector(".revisions")?.addEventListener("click", function (e) {revisionAction("revision", data, function (data) {if (data.content) {contentEditor.setContent(data["content"]);- displayToast("bg-success", "Revision", data["created_at"] + " Revision loaded!");+ displayToast("success", "Revision", data["created_at"] + " Revision loaded!");}});//e.preventDefault();@@ -61,7 +61,7 @@ document.querySelector(".revisions")?.addEventListener("click", function (e) {if (confirm('Are you sure?')) {revisionAction("delete", data, function (data) {- displayToast("bg-success", "Revision", "Revision deleted!");+ displayToast("success", "Revision", "Revision deleted!");item.remove();count.html(Math.max(count.html() - 1, 0));});diff --git a/public/js/app/checkout.js b/public/js/app/checkout.jsindex 3623cf8..d089b53 100644--- a/public/js/app/checkout.js+++ b/public/js/app/checkout.js@@ -160,7 +160,7 @@ document.addEventListener("change", function (e) {}).catch(error => {console.log(error.statusText);- //displayToast("bg-danger", "Revision", "Error!");+ //displayToast("danger", "Revision", "Error!");});}}diff --git a/public/js/libs/oembed.js b/public/js/libs/oembed.jsindex bc1f60a..7132984 100644--- a/public/js/libs/oembed.js+++ b/public/js/libs/oembed.js@@ -23,6 +23,10 @@ const oEmbedProviders = [regex: /https?:\/\/youtu\.be\/.*/,url: "https://www.youtube.com/oembed"},+ {+ regex: /https?:\/\/codepen\.io\/.*/,+ url: "https://codepen.io/api/oembed"+ },{regex: /^(https:\/\/vimeo.com\/(.*)|https:\/\/vimeo.com\/album\/(.*)\/video\/(.*)|https:\/\/vimeo.com\/channels\/(.*)\/(.*)|https:\/\/vimeo.com\/groups\/(.*)\/videos\/(.*)|https:\/\/vimeo.com\/ondemand\/(.*)\/(.*)|https:\/\/player.vimeo.com\/video\/(.*))/,url: "https://vimeo.com/api/oembed.json"@@ -292,7 +296,7 @@ async function getOembed(url, maxwidth = 800, maxheight = 600, silent = false) {if (!silent) {let message = 'Embed error: URL did not match any provider.';- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);}return;@@ -315,14 +319,14 @@ async function getOembed(url, maxwidth = 800, maxheight = 600, silent = false) {if (!remoteResponse || remoteResponse.status !== 200) {let message = `Embed error: Could not fetch embed URL.`;- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);}const json = await remoteResponse.json();if (json.html === undefined) {const message = `Eembed error: ${message}`;- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);return;}diff --git a/public/js/libs/tinymce-dist b/public/js/libs/tinymce-distindex 01d1959..3d62192 160000--- a/public/js/libs/tinymce-dist+++ b/public/js/libs/tinymce-dist@@ -1 +1 @@-Subproject commit 01d1959b1200e0b872ea078e59ea5abfb5c54100+Subproject commit 3d6219296c9a92c87337bb38fb502a469ac1167fdiff --git a/public/js/libs/tinymce-options.js b/public/js/libs/tinymce-options.jsindex ac3bc74..b1359ed 100755--- a/public/js/libs/tinymce-options.js+++ b/public/js/libs/tinymce-options.js@@ -815,7 +815,7 @@ let tinyMceOptions = {}).catch(error => {console.log(error);- displayToast("bg-danger", "Error", "Error renaming page!");+ displayToast("danger", "Error", "Error renaming page!");});});}diff --git a/public/js/vvvebjs/builder.js b/public/js/vvvebjs/builder.jsindex 6e1a92f..d0b8c65 100755--- a/public/js/vvvebjs/builder.js+++ b/public/js/vvvebjs/builder.js@@ -1166,6 +1166,7 @@ Vvveb.Builder = {//insert editor helpers like non editable areasself.frameHead.append(generateElements('<link data-vvveb-helpers href="' + Vvveb.baseUrl + '../../css/vvvebjs-editor-helpers.css" rel="stylesheet">')[0]);+ self.frameHtml.setAttribute("data-vvvebjs-editor","");self._initHighlight();@@ -1863,7 +1864,7 @@ Vvveb.Builder = {}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error loading translations!");+ displayToast("danger", "Error", "Error loading translations!");});@@ -1879,18 +1880,18 @@ Vvveb.Builder = {return response.json()}).then((data) => {- let bg = "bg-success";+ let bg = "success";if (data.success || text == "success") {} else {- bg = "bg-danger";+ bg = "danger";}displayToast(bg, "Save", data.message ?? data);}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error saving translations!");+ displayToast("danger", "Error", "Error saving translations!");});/*Vvveb.Builder.frameBody.querySelectorAll("form").forEach(f => {@@ -2167,7 +2168,7 @@ Vvveb.Builder = {html = html.replace(/\s*data-vvveb-\w+(=["'].*?["'])?\s*/gi, "");}- html = html.replaceAll("vvveb-hidden", "");+ html = html.replaceAll("vvveb-hidden", "").replaceAll("data-vvvebjs-editor", "");return html;},@@ -2277,17 +2278,17 @@ Vvveb.Builder = {}).then((data) => {if (callback) callback(data);- let bg = "bg-success";+ let bg = "success";if (data.success || text == "success") {} else {- bg = "bg-danger";+ bg = "danger";}displayToast(bg, "Save", data.message ?? data);}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error saving!");+ displayToast("danger", "Error", "Error saving!");});},@@ -2321,11 +2322,11 @@ Vvveb.Builder = {.catch((err) => {if (error) error(err);let message = err?.statusText ?? "Error saving!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);if (err.hasOwnProperty('text')) err.text().then( errorMessage => {let message = errorMessage.substr(0, 200);- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);});});},@@ -2476,15 +2477,33 @@ Vvveb.CssEditor = {}}-function displayToast(bg, title, message, id = "top-toast") {- document.querySelector("#" + id + " .toast-body .message").innerHTML = message.replace(/(?:\r\n|\r|\n)/g, '<br>');- let header = document.querySelector("#" + id + " .toast-header");- header.classList.remove("bg-danger", "bg-success")- header.classList.add(bg);- header.querySelector("strong").innerHTML = title;- document.querySelector("#" + id + " .toast").classList.add("show");- delay(() => document.querySelector("#" + id + " .toast").classList.remove("show"), 5000);-}+function displayToast(type, title, message, position = 'bottom', id = null) {+ if (!id) {+ id = position + "-toast";+ }++ let toast = document.getElementById(id);+ let header = toast.querySelector(".toast-header");+ toast.classList.remove("bottom-0", "top-0");+ toast.classList.add(position + "-0");+ toast.querySelector(".toast-body .message").innerHTML = message;+ header.classList.remove("danger", "success");+ header.classList.add("bg-" + type);+ header.querySelector("strong").textContent = title;+ let toastDisplay = toast.cloneNode(true);+ toast.parentNode.appendChild(toastDisplay);++ let delay = 3000;+ if (type == "danger") {+ delay = 10000;+ }++ let bsToast = new bootstrap.Toast(toastDisplay, {animation:true, delay});+ toastDisplay.addEventListener('hidden.bs.toast', () => {+ toastDisplay.remove();+ });+ bsToast.show();+}Vvveb.Gui = {@@ -2616,11 +2635,11 @@ Vvveb.Gui = {return Vvveb.Builder.saveAjax({file}, saveUrl, (data) => {//use toast to show save status- let bg = "bg-success";+ let bg = "success";if (data.success || data == "success") {document.querySelectorAll("#top-panel .save-btn").forEach(e => e.setAttribute("disabled", "true"));} else {- bg = "bg-danger";+ bg = "danger";}displayToast(bg, "Save", data.message ?? data);@@ -2637,7 +2656,7 @@ Vvveb.Gui = {btn.querySelector(".loading").classList.add("d-none");btn.querySelector(".button-text").classList.remove("d-none");let message = error?.statusText ?? "Error saving!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);});},@@ -2762,7 +2781,7 @@ Vvveb.Gui = {bsModal.hide();} else {let message = savedData?.message ?? "Error saving!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);}});};@@ -3817,22 +3836,22 @@ Vvveb.FileManager = {return response.json()}).then((data) => {- let bg = "bg-success";+ let bg = "success";if (data.success) {document.querySelectorAll("#top-panel .save-btn").forEach(e => e.setAttribute("disabled", "true"));} else {- bg = "bg-danger";+ bg = "danger";}displayToast(bg, "Delete", data.message ?? data);}).catch(error => {let message = error.statusText ?? "Error deleting page!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);error.text().then( errorMessage => {let message = errorMessage.substr(0, 200);- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);})});@@ -3873,11 +3892,11 @@ Vvveb.FileManager = {return response.json()}).then((data) => {- let bg = "bg-success";+ let bg = "success";if (data.success) {//document.querySelectorAll("#top-panel .save-btn").forEach(e => e.setAttribute("disabled", "true"));} else {- bg = "bg-danger";+ bg = "danger";}newfile = data.newfile ?? newfile;@@ -3914,11 +3933,11 @@ Vvveb.FileManager = {}).catch(error => {let message = error.statusText ?? "Error renaming page!";- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);error.text().then( errorMessage => {let message = errorMessage.substr(0, 200);- displayToast("bg-danger", "Error", message);+ displayToast("danger", "Error", message);})});}@@ -4145,7 +4164,7 @@ Vvveb.Revisions = {}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error loading revision!");+ displayToast("danger", "Error", "Error loading revision!");});}},@@ -4178,7 +4197,7 @@ Vvveb.Revisions = {}).then((data) => {Vvveb.Builder.setHtml(data);- displayToast("bg-success", "Load", "Revision loaded");+ displayToast("success", "Load", "Revision loaded");Vvveb.Builder.frameBody.querySelectorAll("[data-aos]").forEach(e => e.classList.add("aos-init","aos-animate"));document.querySelectorAll("#top-panel .save-btn").forEach(e => e.removeAttribute("disabled"));@@ -4190,7 +4209,7 @@ Vvveb.Revisions = {}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error loading revisions!");+ displayToast("danger", "Error", "Error loading revisions!");});}}@@ -4217,11 +4236,11 @@ Vvveb.Revisions = {return response.json()}).then((data) => {- let bg = "bg-success";+ let bg = "success";if (data.success) {item.remove();} else {- bg = "bg-danger";+ bg = "danger";}displayToast(bg, "Delete", data.message ?? data);@@ -4231,7 +4250,7 @@ Vvveb.Revisions = {}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error deleting revision!");+ displayToast("danger", "Error", "Error deleting revision!");});}}diff --git a/public/js/vvvebjs/inputs.js b/public/js/vvvebjs/inputs.jsindex c862b7d..fd56b67 100755--- a/public/js/vvvebjs/inputs.js+++ b/public/js/vvvebjs/inputs.js@@ -258,7 +258,7 @@ let HtmlListSelectInput = { ...Input, ...{}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error loading list");+ displayToast("danger", "Error", "Error loading list");});}},@@ -721,23 +721,6 @@ let SectionInput = { ...Input, ...{}}-let PopOverInput = { ...Input, ...{-- events: [- //["click", "onChange", "button" /*'select'*/],- ],--- setValue: function(value) {- return false;- },-- init: function(data) {- return this.render("popoverinput", data);- },- }-}-let ListInput = { ...Input, ...{events: [diff --git a/public/js/vvvebjs/plugin-google-fonts.js b/public/js/vvvebjs/plugin-google-fonts.jsindex 4b529f8..1af99c6 100755--- a/public/js/vvvebjs/plugin-google-fonts.js+++ b/public/js/vvvebjs/plugin-google-fonts.js@@ -67,5 +67,5 @@ fetch(Vvveb.baseUrl + "../../resources/google-fonts.json")}).catch(error => {console.log(error.statusText);- displayToast("bg-danger", "Error", "Error loading google fonts!");+ displayToast("danger", "Error", "Error loading google fonts!");});