Merge pull request #6 from pimcore/pimcore-5.4.0-dev

updated for pimcore 5.4

README.md

@@ -74,6 +74,14 @@ See example: [toc.js](https://github.com/pimcore/web2print-tools/blob/master/Res
 See full documentation and examples: [pdfreactor-manual](http://www.pdfreactor.com/product/doc/manual.pdf)
 
 
+## Running with Pimcore < 5.4
+With Pimcore 5.4 the location of static Pimcore files like icons has changed. In order to make this bundle work 
+with Pimcore < 5.4, please add following rewrite rule to your `.htaccess`.
+```
+    # rewrite rule for pre pimcore 5.4 core static files
+    RewriteRule ^bundles/pimcoreadmin/(.*) /pimcore/static6/$1 [PT,L]
+``` 
+
 # Migration from Pimcore 4
 - change table name from `plugin_web2print_favorite_outputdefinitions` to `bundle_web2print_favorite_outputdefinitions`
 ```sql

composer.json

@@ -6,7 +6,7 @@
     "sort-packages": true
   },
   "require": {
-    "pimcore/core-version": ">=5.2.0 <5.4",
+    "pimcore/core-version": ">=5.2.0 <5.5",
     "pimcore/output-data-config-toolkit-bundle": "~2"
   },
   "autoload": {

src/Resources/public/css/admin.css

@@ -1,62 +1,62 @@
-/**
- * Pimcore
- *
- * This source file is available under two different licenses:
- * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
- * Full copyright and license information is available in
- * LICENSE.md which is distributed with this source code.
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
- */
-
-
-.bundle_outputdataconfig_icon {
-    background: url("/pimcore/static6/img/flat-color-icons/grid.svg") center center no-repeat !important;
-}
-.bundle_outputdataconfig_icon_overlay:before {
-    position: absolute;
-    width: 12px;
-    height: 12px;
-    bottom: 0px;
-    right: 0px;
-    content: "";
-    background: url(/pimcore/static6/img/flat-color-icons/go.svg) center center no-repeat !important;
-}
-
-#pimcore_menu_web2print {
-    background-image: url("/pimcore/static6/img/flat-color-icons/news.svg") !important;
-}
-
-.bundle_web2print_custom_areas {
-    background: url("/pimcore/static6/img/flat-color-icons/area.svg") center center no-repeat !important;
-}
-.bundle_web2print_custom_areas_overlay:before {
-    position: absolute;
-    width: 12px;
-    height: 12px;
-    bottom: 0px;
-    right: 0px;
-    content: "";
-    background: url(/pimcore/static6/img/flat-color-icons/star.svg) center center no-repeat !important;
-}
-
-
-
-
-.bundle_web2print_customAreas_config, .bundle_web2print_custom_area_icon {
-    background: url(/pimcore/static6/img/icon/layout_content.png) left center no-repeat !important;
-}
-
-
-
-
-.bundle_web2print_customarea_file_css {
-    background: url(/pimcore/static6/img/icon/css.png) left center no-repeat !important;
-}
-
-.bundle_web2print_customarea_file_php {
-    background: url(/pimcore/static6/img/icon/html.png) left center no-repeat !important;
-}
-
+/**
+ * Pimcore
+ *
+ * This source file is available under two different licenses:
+ * - GNU General Public License version 3 (GPLv3)
+ * - Pimcore Enterprise License (PEL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ */
+
+
+.bundle_outputdataconfig_icon {
+    background: url("/bundles/pimcoreadmin/img/flat-color-icons/grid.svg") center center no-repeat !important;
+}
+.bundle_outputdataconfig_icon_overlay:before {
+    position: absolute;
+    width: 12px;
+    height: 12px;
+    bottom: 0px;
+    right: 0px;
+    content: "";
+    background: url(/bundles/pimcoreadmin/img/flat-color-icons/go.svg) center center no-repeat !important;
+}
+
+#pimcore_menu_web2print {
+    background-image: url("/bundles/pimcoreadmin/img/flat-color-icons/news.svg") !important;
+}
+
+.bundle_web2print_custom_areas {
+    background: url("/bundles/pimcoreadmin/img/flat-color-icons/area.svg") center center no-repeat !important;
+}
+.bundle_web2print_custom_areas_overlay:before {
+    position: absolute;
+    width: 12px;
+    height: 12px;
+    bottom: 0px;
+    right: 0px;
+    content: "";
+    background: url(/bundles/pimcoreadmin/img/flat-color-icons/star.svg) center center no-repeat !important;
+}
+
+
+
+
+.bundle_web2print_customAreas_config, .bundle_web2print_custom_area_icon {
+    background: url(/bundles/pimcoreadmin/img/icon/layout_content.png) left center no-repeat !important;
+}
+
+
+
+
+.bundle_web2print_customarea_file_css {
+    background: url(/bundles/pimcoreadmin/img/icon/css.png) left center no-repeat !important;
+}
+
+.bundle_web2print_customarea_file_php {
+    background: url(/bundles/pimcoreadmin/img/icon/html.png) left center no-repeat !important;
+}
+