Remove LiipThemeBundle

As baggy theme was removed and material is the only remaining theme, we don't need a theme switched anymore.
So:
- move all `*.twig` files from the material theme folder to the root
- remove useless translations
This commit is contained in:
Jeremy Benoist
2022-11-23 14:49:52 +01:00
parent 827ba15255
commit 1d3935fbd3
89 changed files with 78 additions and 396 deletions

View File

@ -8,7 +8,6 @@ use Doctrine\Persistence\ManagerRegistry;
use FOS\UserBundle\Model\UserManagerInterface;
use JMS\Serializer\SerializationContext;
use JMS\Serializer\SerializerBuilder;
use Liip\ThemeBundle\ActiveTheme;
use PragmaRX\Recovery\Recovery as BackupCodes;
use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@ -55,25 +54,11 @@ class ConfigController extends Controller
$configForm->handleRequest($request);
if ($configForm->isSubmitted() && $configForm->isValid()) {
// force theme to material to avoid using baggy
if ('baggy' === $config->getTheme()) {
$config->setTheme('material');
$this->addFlash(
'notice',
'Baggy is gone, forced to Material theme.'
);
}
$em->persist($config);
$em->flush();
$request->getSession()->set('_locale', $config->getLanguage());
// switch active theme
$activeTheme = $this->get(ActiveTheme::class);
$activeTheme->setName($config->getTheme());
$this->addFlash(
'notice',
'flashes.config.notice.config_saved'

View File

@ -579,7 +579,7 @@ class EntryController extends Controller
}
return $this->render(
'@WallabagCore/themes/common/Entry/share.html.twig',
'@WallabagCore/Entry/share.html.twig',
['entry' => $entry]
);
}

View File

@ -144,7 +144,7 @@ class FeedController extends Controller
}
return $this->render(
'@WallabagCore/themes/common/Entry/entries.xml.twig',
'@WallabagCore/Entry/entries.xml.twig',
[
'type' => 'tag',
'url' => $url,
@ -228,7 +228,7 @@ class FeedController extends Controller
}
}
return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [
return $this->render('@WallabagCore/Entry/entries.xml.twig', [
'type' => $type,
'url' => $url,
'entries' => $entries,

View File

@ -15,7 +15,7 @@ class StaticController extends Controller
$addonsUrl = $this->container->getParameter('addons_url');
return $this->render(
'@WallabagCore/themes/common/Static/howto.html.twig',
'@WallabagCore/Static/howto.html.twig',
[
'addonsUrl' => $addonsUrl,
]
@ -28,7 +28,7 @@ class StaticController extends Controller
public function aboutAction()
{
return $this->render(
'@WallabagCore/themes/common/Static/about.html.twig',
'@WallabagCore/Static/about.html.twig',
[
'version' => $this->getParameter('wallabag_core.version'),
'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
@ -42,7 +42,7 @@ class StaticController extends Controller
public function quickstartAction()
{
return $this->render(
'@WallabagCore/themes/common/Static/quickstart.html.twig'
'@WallabagCore/Static/quickstart.html.twig'
);
}
}