Skip to content

Commit

Permalink
move to new bundle structure (#200)
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat authored Aug 4, 2023
1 parent c7a8a1d commit 2bac64b
Show file tree
Hide file tree
Showing 358 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ The Toolbox provides a lot of [ready-to-use Bricks](docs/11_ElementsOverview.md)
- [Headless Mode](docs/90_Headless.md)

## Pimcore Fixes / Overrides
- Fix the pimcore iframe [maskFrames](src/ToolboxBundle/Resources/public/js/document/edit.js) bug (in some cases the iframe overlay field does not apply to the right position)
- Fix the pimcore iframe [maskFrames](public/js/document/edit.js) bug (in some cases the iframe overlay field does not apply to the right position)
- Transforms all the brick config buttons (`pimcore_area_edit_button_*`) to more grateful ones.

## Copyright and license
Expand Down
1 change: 1 addition & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [Headless Mode](./docs/90_Headless.md)

### Global Changes
- Recommended folder structure by symfony adopted
- All folders and sub-folders in views are lowercase/underscore now (areas/accordion/accordion_tab, areas/google_map, areas/iframe, areas/link_list, areas/parallax_container, areas/parallax_container_section, areas/parallax_container_section, areas/slide_columns)
- All snippet views are underscore now (snippet_layout.html.twig, snippet/teaser_default, snippet/layout/teaser_layout) - check your views for includes!
- All views are lowercase/underscore now (areas/video/type_*, areas/google_map/info_window, parallax_container/partial/*, parallax_container/wrapper/container_wrapper)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"autoload": {
"psr-4": {
"ToolboxBundle\\": "src/ToolboxBundle"
"ToolboxBundle\\": "src/"
}
},
"autoload-dev": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:

ToolboxBundle\Controller\:
resource: '../../Controller'
resource: '../../src/Controller'
public: true
autowire: true
autoconfigure: true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/11_ElementsOverview.md
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ Create a sliding column element.

### Dependency
We basically designed this element in combination with the [slick slider](http://kenwheeler.github.io/slick/) plugin.
Since we want to avoid specific markup in a most possible way, there are still some references if your looking at the toolbox [backend style](https://github.com/dachcom-digital/pimcore-toolbox/blob/master/src/ToolboxBundle/Resources/public/css/admin.css#L47).
Since we want to avoid specific markup in a most possible way, there are still some references if your looking at the toolbox [backend style](https://github.com/dachcom-digital/pimcore-toolbox/blob/master/public/css/admin.css#L47).
This is just a hint if you're going to use a different javascript extension: Be sure this element works in your backend too. :)

> Note: You need to implement your own javascript logic. Get some hints [here](50_FrontendTips.md).
Expand Down
2 changes: 1 addition & 1 deletion docs/14_ImageThumbnails.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Image Thumbnails

To stay organized, the ToolboxBundle provides a dedicated configuration and a simple helper for image thumbnails.
Every required thumbnail size is defined in the [toolbox configuration](https://github.com/dachcom-digital/pimcore-toolbox/blob/master/src/ToolboxBundle/Resources/config/pimcore/image_thumbnails.yaml).
Every required thumbnail size is defined in the [toolbox configuration](https://github.com/dachcom-digital/pimcore-toolbox/blob/master/config/pimcore/image_thumbnails.yaml).
So it's easy for you to simplify or change the [Image Thumbnail](https://www.pimcore.org/docs/5.0.0/Assets/Working_with_Thumbnails/Image_Thumbnails.html) reference.

Although this is just an optional feature, it makes sense to use the view helper in your project and custom bricks.
Expand Down
2 changes: 1 addition & 1 deletion docs/30_ToolboxTheme.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ toolbox:
- {tag: 'div', class: 'col 12-columns'}
```

From now on, the Toolbox Bundle will search every element view in `@ToolboxBundle/Resources/views/Toolbox/YourGridSystem/*`.
From now on, the Toolbox Bundle will search every element view in `ToolboxBundle/templates/toolbox/YourGridSystem/*`.
Now implement the calculators (don't forget the tags):

```yaml
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function prepend(ContainerBuilder $container): void
$wysiwygEditor = 'tiny_mce';
}

$coreLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$coreLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
$coreLoader->load('config.yaml');

$loaded = [];
Expand Down Expand Up @@ -72,7 +72,7 @@ public function load(array $configs, ContainerBuilder $container): void
$contextResolver = $config['context_resolver'];
unset($config['context_resolver']);

$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config'));
$loader->load('services.yaml');

$configManagerDefinition = $container->getDefinition(ConfigManager::class);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function install(): void

private function installTranslations(): void
{
$csvAdmin = __DIR__ . '/../Resources/install//admin-translations/data.csv';
$csvAdmin = __DIR__ . '/../../config/install/admin-translations/data.csv';

try {
Translation::importTranslationsFromFile($csvAdmin, Translation::DOMAIN_ADMIN, true, \Pimcore\Tool\Admin::getLanguages());
Expand Down
5 changes: 5 additions & 0 deletions src/ToolboxBundle/ToolboxBundle.php → src/ToolboxBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ public function build(ContainerBuilder $container): void
$container->addCompilerPass(new NormalizerRegistryPass());
}

public function getPath(): string
{
return \dirname(__DIR__);
}

public function getInstaller(): Install
{
return $this->container->get(Install::class);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 2bac64b

Please sign in to comment.