dashboard 12 columns

This commit is contained in:
Yuri Kuznetsov
2021-09-14 16:18:40 +03:00
parent 6e8a3fa05d
commit 5ff145ff12
5 changed files with 21 additions and 17 deletions
+1 -1
View File
@@ -23,5 +23,5 @@
</div>
</div>
</div>
<div class="dashlets grid-stack grid-stack-4">{{{dashlets}}}</div>
<div class="dashlets grid-stack grid-stack-12">{{{dashlets}}}</div>
@@ -14,4 +14,4 @@
</div>
<div class="grid-stack grid-stack-4"></div>
<div class="grid-stack grid-stack-12"></div>
@@ -13,4 +13,4 @@
</div>
<div class="grid-stack grid-stack-4"></div>
<div class="grid-stack grid-stack-12"></div>
+9 -7
View File
@@ -36,6 +36,8 @@ define('views/dashboard', ['view', 'lib!gridstack'], function (Dep, Gridstack) {
currentTab: null,
WIDTH_MULTIPLIER: 3,
events: {
'click button[data-action="selectTab"]': function (e) {
var tab = parseInt($(e.currentTarget).data('tab'));
@@ -398,7 +400,7 @@ define('views/dashboard', ['view', 'lib!gridstack'], function (Dep, Gridstack) {
{
cellHeight: this.getThemeManager().getParam('dashboardCellHeight'),
verticalMargin: this.getThemeManager().getParam('dashboardCellMargin'),
column: 4,
column: 12,
handle: '.dashlet-container .panel-heading',
disableDrag: disableDrag,
disableResize: disableResize,
@@ -419,9 +421,9 @@ define('views/dashboard', ['view', 'lib!gridstack'], function (Dep, Gridstack) {
grid.addWidget(
$item.get(0),
{
x: o.x,
x: o.x * this.WIDTH_MULTIPLIER,
y: o.y,
width: o.width,
width: o.width * this.WIDTH_MULTIPLIER,
height: o.height,
}
);
@@ -476,9 +478,9 @@ define('views/dashboard', ['view', 'lib!gridstack'], function (Dep, Gridstack) {
return {
id: $el.data('id'),
name: $el.data('name'),
x: node.x,
x: node.x / this.WIDTH_MULTIPLIER,
y: node.y,
width: node.width,
width: node.width / this.WIDTH_MULTIPLIER,
height: node.height,
};
});
@@ -602,9 +604,9 @@ define('views/dashboard', ['view', 'lib!gridstack'], function (Dep, Gridstack) {
this.grid.addWidget(
$item.get(0),
{
x: 0,
x: 0 * this.WIDTH_MULTIPLIER,
y: 0,
width: 2,
width: 2 * this.WIDTH_MULTIPLIER,
height: 2,
}
);
@@ -36,6 +36,8 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
validationElementSelector: 'button[data-action="addDashlet"]',
WIDTH_MULTIPLIER: 3,
events: {
'click button[data-action="selectTab"]': function (e) {
var tab = parseInt($(e.currentTarget).data('tab'));
@@ -130,9 +132,9 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
this.grid.addWidget(
$item.get(0),
{
x: 0,
x: 0 * this.WIDTH_MULTIPLIER,
y: 0,
width: 2,
width: 2 * this.WIDTH_MULTIPLIER,
height: 2,
}
);
@@ -308,9 +310,9 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
return {
id: $el.data('id'),
name: $el.data('name'),
x: node.x,
x: node.x / this.WIDTH_MULTIPLIER,
y: node.y,
width: node.width,
width: node.width / this.WIDTH_MULTIPLIER,
height: node.height,
};
});
@@ -328,7 +330,7 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
minWidth: 4,
cellHeight: 60,
verticalMargin: 10,
column: 4,
column: 12,
resizable: {
handles: 'se',
helper: false
@@ -347,9 +349,9 @@ define('views/settings/fields/dashboard-layout', ['views/fields/base', 'lib!grid
this.grid.addWidget(
$item.get(0),
{
x: o.x,
x: o.x * this.WIDTH_MULTIPLIER,
y: o.y,
width: o.width,
width: o.width * this.WIDTH_MULTIPLIER,
height: o.height,
}
);