Skip to content

Commit 174c017

Browse files
committed
support Pimcore 6
1 parent 679ccd2 commit 174c017

4 files changed

Lines changed: 32 additions & 9 deletions

File tree

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
}
1818
],
1919
"require": {
20-
"coreshop/resource-bundle": "^2.0",
20+
"coreshop/resource-bundle": "^2.1",
21+
"pimcore/pimcore": "^5.8 | ^6.0",
2122
"dragonmantank/cron-expression": "^2.0"
2223
},
2324
"autoload": {
@@ -32,7 +33,7 @@
3233
]
3334
},
3435
"branch-alias": {
35-
"dev-master": "2.4-dev"
36+
"dev-master": "2.5-dev"
3637
}
3738
}
3839
}
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
.processmanager_icon_processes {
2-
background: url(..//img/process.svg) center center no-repeat !important;
1+
.processmanager_icon_processes, .processmanager_nav_icon_processes {
2+
background: url(../img/process.svg) center center no-repeat !important;
3+
}
4+
5+
body.pimcore_version_6 .processmanager_nav_icon_processes {
6+
background: url(../img/process_white.svg) center center no-repeat !important;
37
}
48

59
.processmanager_icon_executable {
6-
background: url(..//img/executable.svg) center center no-repeat !important;
10+
background: url(../img/executable.svg) center center no-repeat !important;
711
}
812

913
.processmanager_icon_executable_add {
10-
background: url(..//img/executable_add.svg) center center no-repeat !important;
14+
background: url(../img/executable_add.svg) center center no-repeat !important;
1115
}
1216

1317
.processmanager_icon_executable_type_cli {
14-
background: url(..//img/type_cli.svg) center center no-repeat !important;
18+
background: url(../img/type_cli.svg) center center no-repeat !important;
1519
}
1620

1721
.processmanager_icon_executable_type_pimcore {
@@ -20,4 +24,4 @@
2024

2125
.processmanager_icon_executable_run {
2226
background: url(/bundles/pimcoreadmin/img/flat-color-icons/advance.svg) center center no-repeat !important;
23-
}
27+
}
Lines changed: 18 additions & 0 deletions
Loading

src/ProcessManagerBundle/Resources/public/pimcore/js/startup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pimcore.plugin.processmanager = Class.create(pimcore.plugin.admin, {
3030

3131
var exportMenu = new Ext.Action({
3232
text: t('processmanager'),
33-
iconCls: 'processmanager_icon_processes',
33+
iconCls: 'processmanager_nav_icon_processes',
3434
handler:this.openProcesses
3535
});
3636

0 commit comments

Comments
 (0)