@schneideress/dashboardframework 0.0.257 → 0.0.258

package/bundles/schneideress-dashboardframework.umd.js

@@ -413,7 +413,7 @@
     var GridsterConfigDefaultSettings = {
         gridType: 'scrollVertical',
         compactType: 'none',
-        margin: 0,
+        margin: 10,
         outerMargin: true,
         outerMarginTop: 10,
         outerMarginRight: 0,
@@ -570,7 +570,7 @@
                 widget.settings = JSON.parse(widget.widgetSettings);
             }
             if (widget.templateSettings) {
-                widget.templateSettings = JSON.parse(widget.templateSettings);
+                widget.templateWidgetSettings = JSON.parse(widget.templateSettings);
             }
             var gridsterItem = {
                 cols: this.getWidth(widget.width),
@@ -1808,11 +1808,11 @@
             var html = '<div id="ra-db-widget-menu"' + 'style="' + style + '" class="download-content dropdown-content widget-config-item dropdown-click" style="z-index: 1002;">';
             var settings = '';
             if (this.isWidgetMgmnt) {
-                if (!this.data.widgetInfo.templateSettings.hideEdit)
+                if (!this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideEdit)
                     settings += this.getHtmlForButton('wcEditWidget', 'fal fa-edit', this.editText);
-                if (!this.data.widgetInfo.templateSettings.hideCopy)
+                if (!this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideCopy)
                     settings += this.getHtmlForButton('wcCopyWidget', 'fal fa-copy', this.copyText);
-                if (!this.data.widgetInfo.templateSettings.hideMove)
+                if (!this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideMove)
                     settings += this.getHtmlForButton('wcMoveWidget', 'fal fa-arrows-alt', this.moveText);
             }
             var customPageParams = false;
@@ -1822,14 +1822,14 @@
                     customPageParams = true;
                 }
             }
-            if (!this.data.widgetInfo.templateSettings.hideVisitPage && (this.detailPageUrl || customPageParams) && this.checkVisitLinkVisiblity()) {
+            if (!this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideVisitPage && (this.detailPageUrl || customPageParams) && this.checkVisitLinkVisiblity()) {
                 settings += '<a style="max-height: 30px;align-items: center;align-content: center; display: flex;" id="wcVisitWidget">';
                 settings += '<i style="padding-left: 4px;font-size: 27px !important;" class="fal fa-angle-right"></i> ';
                 settings += '<span style="padding-left: 11px;margin-top: 2px;" style="padding-left: 6px;">';
                 settings += this.translateService.translate('Common.visitpage');
                 settings += '</span></a>';
             }
-            if (!this.data.widgetInfo.templateSettings.hideVisitPage && (this.detailPageUrl && this.checkVisitLinkVisiblity()) || this.isWidgetMgmnt) {
+            if (!this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideVisitPage && (this.detailPageUrl && this.checkVisitLinkVisiblity()) || this.isWidgetMgmnt) {
                 html += '<div style="color: #9FA0A4;font-size: 12px;padding-top: 8px;padding-left: 12px;">';
                 html += this.translateService.translate('Common.settings') + '</div>';
                 html += settings;
@@ -1861,7 +1861,7 @@
             if (this.isDownloadIconVisible && this.isWidgetMgmnt && this.showExcell) {
                 html += this.getHr();
             }
-            if (this.isWidgetMgmnt && !this.data.widgetInfo.templateSettings.hideDelete) {
+            if (this.isWidgetMgmnt && !this.data.widgetInfo.templateWidgetSettings && !this.data.widgetInfo.templateWidgetSettings.hideDelete) {
                 html += '<a id="wcWidgetDelete"><i class="fal fa-times" style="padding-left: 3px;color: red;"></i><span>';
                 html += this.deleteText;
                 html += '</span></a>';
@@ -2714,7 +2714,7 @@
             else {
                 var x = Math.round(this.gridster.curColWidth * item.x);
                 var y = Math.round(this.gridster.curRowHeight * item.y);
-                var width = this.gridster.curColWidth * item.cols - this.gridster.$options.margin;
+                var width = this.gridster.curColWidth * item.cols - this.gridster.$options.margin - 7;
                 var height = (this.gridster.curRowHeight * item.rows - this.gridster.$options.margin);
                 // set the cell style
                 this.setCellPosition(renderer, el, x, y);