Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-30614: Move all templates to themes/admin #1004

Merged
merged 3 commits into from Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 0 additions & 34 deletions src/bundle/DependencyInjection/Compiler/AdminThemePathPass.php

This file was deleted.

2 changes: 0 additions & 2 deletions src/bundle/EzPlatformAdminUiBundle.php
Expand Up @@ -6,7 +6,6 @@
*/
namespace EzSystems\EzPlatformAdminUiBundle;

use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\AdminThemePathPass;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\ComponentPass;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\SecurityLoginPass;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\SystemInfoTabGroupPass;
Expand Down Expand Up @@ -51,7 +50,6 @@ private function addCompilerPasses(ContainerBuilder $container)
$container->addCompilerPass(new ComponentPass());
$container->addCompilerPass(new SecurityLoginPass());
$container->addCompilerPass(new ViewBuilderRegistryPass());
$container->addCompilerPass(new AdminThemePathPass(), PassConfig::TYPE_BEFORE_OPTIMIZATION, 1);
}

/**
Expand Down

This file was deleted.

@@ -1,4 +1,4 @@
{% extends '@EzPlatformAdminUi/account/notifications/list_item.html.twig' %}
{% extends '@ezdesign/account/notifications/list_item.html.twig' %}

{% trans_default_domain 'notifications' %}

Expand Down
@@ -1,4 +1,4 @@
{% extends '@EzPlatformAdminUi/account/notifications/list_item.html.twig' %}
{% extends '@ezdesign/account/notifications/list_item.html.twig' %}

{% trans_default_domain 'notifications' %}

Expand Down
@@ -0,0 +1,3 @@
{% include '@ezdesign/content/modal/add_translation.html.twig' with {
action : path('ezplatform.content_type.add_translation')
} %}
2 changes: 1 addition & 1 deletion src/lib/Menu/UserMenuBuilder.php
Expand Up @@ -103,7 +103,7 @@ public function createStructure(array $options): ItemInterface
],
'extras' => [
'translation_domain' => 'notifications',
'template' => '@EzPlatformAdminUi/account/notifications/modal.html.twig',
'template' => '@ezdesign/account/notifications/modal.html.twig',
],
]);

Expand Down
4 changes: 2 additions & 2 deletions src/lib/Strategy/NotificationTwigStrategy.php
Expand Up @@ -54,10 +54,10 @@ public function setDefault(string $defaultTemplate)
public function decide($contentId): string
{
if ($this->isContentPermanentlyDeleted($contentId)) {
return '@EzPlatformAdminUi/account/notifications/list_item_deleted.html.twig';
return '@ezdesign/account/notifications/list_item_deleted.html.twig';
}
if ($this->isContentTrashed($contentId)) {
return '@EzPlatformAdminUi/account/notifications/list_item_trashed.html.twig';
return '@ezdesign/account/notifications/list_item_trashed.html.twig';
}
if (!empty($this->defaultTemplate)) {
return $this->defaultTemplate;
Expand Down