Merge pull request #7268 from yguedidi/move-templates

Move templates
This commit is contained in:
Yassine Guedidi 2024-02-19 12:21:29 +01:00 committed by GitHub
commit ca587fb6b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
90 changed files with 119 additions and 118 deletions

View file

@ -43,6 +43,7 @@ framework:
# Twig Configuration # Twig Configuration
twig: twig:
default_path: '%kernel.project_dir%/templates'
debug: "%kernel.debug%" debug: "%kernel.debug%"
strict_variables: "%kernel.debug%" strict_variables: "%kernel.debug%"
form_themes: form_themes:
@ -198,13 +199,13 @@ scheb_two_factor:
google: google:
enabled: true enabled: true
issuer: "%server_name%" issuer: "%server_name%"
template: "@WallabagCore/Authentication/form.html.twig" template: "Authentication/form.html.twig"
email: email:
enabled: true enabled: true
sender_email: "%twofactor_sender%" sender_email: "%twofactor_sender%"
digits: 6 digits: 6
template: "@WallabagCore/Authentication/form.html.twig" template: "Authentication/form.html.twig"
mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer
rulerz: rulerz:

View file

@ -26,7 +26,7 @@ class DeveloperController extends AbstractController
{ {
$clients = $repo->findByUser($this->getUser()->getId()); $clients = $repo->findByUser($this->getUser()->getId());
return $this->render('@WallabagCore/Developer/index.html.twig', [ return $this->render('Developer/index.html.twig', [
'clients' => $clients, 'clients' => $clients,
]); ]);
} }
@ -54,14 +54,14 @@ class DeveloperController extends AbstractController
$translator->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()]) $translator->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
); );
return $this->render('@WallabagCore/Developer/client_parameters.html.twig', [ return $this->render('Developer/client_parameters.html.twig', [
'client_id' => $client->getPublicId(), 'client_id' => $client->getPublicId(),
'client_secret' => $client->getSecret(), 'client_secret' => $client->getSecret(),
'client_name' => $client->getName(), 'client_name' => $client->getName(),
]); ]);
} }
return $this->render('@WallabagCore/Developer/client.html.twig', [ return $this->render('Developer/client.html.twig', [
'form' => $clientForm->createView(), 'form' => $clientForm->createView(),
]); ]);
} }
@ -103,7 +103,7 @@ class DeveloperController extends AbstractController
*/ */
public function howtoFirstAppAction() public function howtoFirstAppAction()
{ {
return $this->render('@WallabagCore/Developer/howto_app.html.twig', [ return $this->render('Developer/howto_app.html.twig', [
'wallabag_url' => $this->getParameter('domain_name'), 'wallabag_url' => $this->getParameter('domain_name'),
]); ]);
} }

View file

@ -243,7 +243,7 @@ class ConfigController extends AbstractController
return $this->redirect($this->generateUrl('config') . '#set6'); return $this->redirect($this->generateUrl('config') . '#set6');
} }
return $this->render('@WallabagCore/Config/index.html.twig', [ return $this->render('Config/index.html.twig', [
'form' => [ 'form' => [
'config' => $configForm->createView(), 'config' => $configForm->createView(),
'feed' => $feedForm->createView(), 'feed' => $feedForm->createView(),
@ -373,7 +373,7 @@ class ConfigController extends AbstractController
'flashes.config.notice.otp_enabled' 'flashes.config.notice.otp_enabled'
); );
return $this->render('@WallabagCore/Config/otp_app.html.twig', [ return $this->render('Config/otp_app.html.twig', [
'backupCodes' => $backupCodes, 'backupCodes' => $backupCodes,
'qr_code' => $googleAuthenticator->getQRContent($user), 'qr_code' => $googleAuthenticator->getQRContent($user),
'secret' => $secret, 'secret' => $secret,

View file

@ -156,7 +156,7 @@ class EntryController extends AbstractController
return $this->showEntries('search', $request, $page); return $this->showEntries('search', $request, $page);
} }
return $this->render('@WallabagCore/Entry/search_form.html.twig', [ return $this->render('Entry/search_form.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'currentRoute' => $currentRoute, 'currentRoute' => $currentRoute,
]); ]);
@ -198,7 +198,7 @@ class EntryController extends AbstractController
return $this->redirect($this->generateUrl('homepage')); return $this->redirect($this->generateUrl('homepage'));
} }
return $this->render('@WallabagCore/Entry/new_form.html.twig', [ return $this->render('Entry/new_form.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
} }
@ -233,7 +233,7 @@ class EntryController extends AbstractController
*/ */
public function addEntryAction() public function addEntryAction()
{ {
return $this->render('@WallabagCore/Entry/new.html.twig'); return $this->render('Entry/new.html.twig');
} }
/** /**
@ -263,7 +263,7 @@ class EntryController extends AbstractController
return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
} }
return $this->render('@WallabagCore/Entry/edit.html.twig', [ return $this->render('Entry/edit.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
} }
@ -390,7 +390,7 @@ class EntryController extends AbstractController
$this->checkUserAction($entry); $this->checkUserAction($entry);
return $this->render( return $this->render(
'@WallabagCore/Entry/entry.html.twig', 'Entry/entry.html.twig',
['entry' => $entry] ['entry' => $entry]
); );
} }
@ -581,7 +581,7 @@ class EntryController extends AbstractController
} }
return $this->render( return $this->render(
'@WallabagCore/Entry/share.html.twig', 'Entry/share.html.twig',
['entry' => $entry] ['entry' => $entry]
); );
} }
@ -671,7 +671,7 @@ class EntryController extends AbstractController
} }
return $this->render( return $this->render(
'@WallabagCore/Entry/entries.html.twig', [ 'Entry/entries.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'entries' => $entries, 'entries' => $entries,
'currentPage' => $page, 'currentPage' => $page,

View file

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

View file

@ -39,7 +39,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController
{ {
$rules = $repository->findAll(); $rules = $repository->findAll();
return $this->render('@WallabagCore/IgnoreOriginInstanceRule/index.html.twig', [ return $this->render('IgnoreOriginInstanceRule/index.html.twig', [
'rules' => $rules, 'rules' => $rules,
]); ]);
} }
@ -70,7 +70,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController
return $this->redirectToRoute('ignore_origin_instance_rules_index'); return $this->redirectToRoute('ignore_origin_instance_rules_index');
} }
return $this->render('@WallabagCore/IgnoreOriginInstanceRule/new.html.twig', [ return $this->render('IgnoreOriginInstanceRule/new.html.twig', [
'rule' => $ignoreOriginInstanceRule, 'rule' => $ignoreOriginInstanceRule,
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
@ -101,7 +101,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController
return $this->redirectToRoute('ignore_origin_instance_rules_index'); return $this->redirectToRoute('ignore_origin_instance_rules_index');
} }
return $this->render('@WallabagCore/IgnoreOriginInstanceRule/edit.html.twig', [ return $this->render('IgnoreOriginInstanceRule/edit.html.twig', [
'rule' => $ignoreOriginInstanceRule, 'rule' => $ignoreOriginInstanceRule,
'edit_form' => $editForm->createView(), 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(), 'delete_form' => $deleteForm->createView(),

View file

@ -46,6 +46,6 @@ class ChromeController extends BrowserController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/Chrome/index.html.twig'; return 'Import/Chrome/index.html.twig';
} }
} }

View file

@ -76,7 +76,7 @@ class DeliciousController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file'); $this->addFlash('notice', 'flashes.import.notice.failed_on_file');
} }
return $this->render('@WallabagCore/Import/Delicious/index.html.twig', [ return $this->render('Import/Delicious/index.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'import' => $delicious, 'import' => $delicious,
]); ]);

View file

@ -46,6 +46,6 @@ class ElcuratorController extends WallabagController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/Elcurator/index.html.twig'; return 'Import/Elcurator/index.html.twig';
} }
} }

View file

@ -46,6 +46,6 @@ class FirefoxController extends BrowserController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/Firefox/index.html.twig'; return 'Import/Firefox/index.html.twig';
} }
} }

View file

@ -24,7 +24,7 @@ class ImportController extends AbstractController
*/ */
public function importAction(ImportChain $importChain) public function importAction(ImportChain $importChain)
{ {
return $this->render('@WallabagCore/Import/index.html.twig', [ return $this->render('Import/index.html.twig', [
'imports' => $importChain->getAll(), 'imports' => $importChain->getAll(),
]); ]);
} }
@ -41,7 +41,7 @@ class ImportController extends AbstractController
$rabbitNotInstalled = false; $rabbitNotInstalled = false;
if (!$authorizationChecker->isGranted('ROLE_SUPER_ADMIN')) { if (!$authorizationChecker->isGranted('ROLE_SUPER_ADMIN')) {
return $this->render('@WallabagCore/Import/check_queue.html.twig'); return $this->render('Import/check_queue.html.twig');
} }
if ($craueConfig->get('import_with_rabbitmq')) { if ($craueConfig->get('import_with_rabbitmq')) {
@ -85,7 +85,7 @@ class ImportController extends AbstractController
} }
} }
return $this->render('@WallabagCore/Import/check_queue.html.twig', [ return $this->render('Import/check_queue.html.twig', [
'nbRedisMessages' => $nbRedisMessages, 'nbRedisMessages' => $nbRedisMessages,
'nbRabbitMessages' => $nbRabbitMessages, 'nbRabbitMessages' => $nbRabbitMessages,
'redisNotInstalled' => $redisNotInstalled, 'redisNotInstalled' => $redisNotInstalled,

View file

@ -76,7 +76,7 @@ class InstapaperController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file'); $this->addFlash('notice', 'flashes.import.notice.failed_on_file');
} }
return $this->render('@WallabagCore/Import/Instapaper/index.html.twig', [ return $this->render('Import/Instapaper/index.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'import' => $instapaper, 'import' => $instapaper,
]); ]);

View file

@ -76,7 +76,7 @@ class PinboardController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file'); $this->addFlash('notice', 'flashes.import.notice.failed_on_file');
} }
return $this->render('@WallabagCore/Import/Pinboard/index.html.twig', [ return $this->render('Import/Pinboard/index.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'import' => $pinboard, 'import' => $pinboard,
]); ]);

View file

@ -43,7 +43,7 @@ class PocketController extends AbstractController
]) ])
->getForm(); ->getForm();
return $this->render('@WallabagCore/Import/Pocket/index.html.twig', [ return $this->render('Import/Pocket/index.html.twig', [
'import' => $pocket, 'import' => $pocket,
'has_consumer_key' => '' === trim($this->getUser()->getConfig()->getPocketConsumerKey()) ? false : true, 'has_consumer_key' => '' === trim($this->getUser()->getConfig()->getPocketConsumerKey()) ? false : true,
'form' => $form->createView(), 'form' => $form->createView(),

View file

@ -46,6 +46,6 @@ class PocketHtmlController extends HtmlController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/PocketHtml/index.html.twig'; return 'Import/PocketHtml/index.html.twig';
} }
} }

View file

@ -76,7 +76,7 @@ class ReadabilityController extends AbstractController
$this->addFlash('notice', 'flashes.import.notice.failed_on_file'); $this->addFlash('notice', 'flashes.import.notice.failed_on_file');
} }
return $this->render('@WallabagCore/Import/Readability/index.html.twig', [ return $this->render('Import/Readability/index.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'import' => $readability, 'import' => $readability,
]); ]);

View file

@ -46,6 +46,6 @@ class ShaarliController extends HtmlController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/Shaarli/index.html.twig'; return 'Import/Shaarli/index.html.twig';
} }
} }

View file

@ -46,6 +46,6 @@ class WallabagV1Controller extends WallabagController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/WallabagV1/index.html.twig'; return 'Import/WallabagV1/index.html.twig';
} }
} }

View file

@ -46,6 +46,6 @@ class WallabagV2Controller extends WallabagController
protected function getImportTemplate() protected function getImportTemplate()
{ {
return '@WallabagCore/Import/WallabagV2/index.html.twig'; return 'Import/WallabagV2/index.html.twig';
} }
} }

View file

@ -48,7 +48,7 @@ class SiteCredentialController extends AbstractController
$credentials = $repository->findByUser($this->getUser()); $credentials = $repository->findByUser($this->getUser());
return $this->render('@WallabagCore/SiteCredential/index.html.twig', [ return $this->render('SiteCredential/index.html.twig', [
'credentials' => $credentials, 'credentials' => $credentials,
]); ]);
} }
@ -84,7 +84,7 @@ class SiteCredentialController extends AbstractController
return $this->redirectToRoute('site_credentials_index'); return $this->redirectToRoute('site_credentials_index');
} }
return $this->render('@WallabagCore/SiteCredential/new.html.twig', [ return $this->render('SiteCredential/new.html.twig', [
'credential' => $credential, 'credential' => $credential,
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
@ -122,7 +122,7 @@ class SiteCredentialController extends AbstractController
return $this->redirectToRoute('site_credentials_index'); return $this->redirectToRoute('site_credentials_index');
} }
return $this->render('@WallabagCore/SiteCredential/edit.html.twig', [ return $this->render('SiteCredential/edit.html.twig', [
'credential' => $siteCredential, 'credential' => $siteCredential,
'edit_form' => $editForm->createView(), 'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(), 'delete_form' => $deleteForm->createView(),

View file

@ -14,7 +14,7 @@ class StaticController extends AbstractController
$addonsUrl = $this->getParameter('addons_url'); $addonsUrl = $this->getParameter('addons_url');
return $this->render( return $this->render(
'@WallabagCore/Static/howto.html.twig', 'Static/howto.html.twig',
[ [
'addonsUrl' => $addonsUrl, 'addonsUrl' => $addonsUrl,
] ]
@ -27,7 +27,7 @@ class StaticController extends AbstractController
public function aboutAction() public function aboutAction()
{ {
return $this->render( return $this->render(
'@WallabagCore/Static/about.html.twig', 'Static/about.html.twig',
[ [
'version' => $this->getParameter('wallabag_core.version'), 'version' => $this->getParameter('wallabag_core.version'),
'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'),
@ -41,7 +41,7 @@ class StaticController extends AbstractController
public function quickstartAction() public function quickstartAction()
{ {
return $this->render( return $this->render(
'@WallabagCore/Static/quickstart.html.twig' 'Static/quickstart.html.twig'
); );
} }
} }

View file

@ -77,7 +77,7 @@ class TagController extends AbstractController
return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()])); return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
} }
return $this->render('@WallabagCore/Tag/new_form.html.twig', [ return $this->render('Tag/new_form.html.twig', [
'form' => $form->createView(), 'form' => $form->createView(),
'entry' => $entry, 'entry' => $entry,
]); ]);
@ -125,7 +125,7 @@ class TagController extends AbstractController
$renameForms[$tag['id']] = $this->createForm(RenameTagType::class, new Tag())->createView(); $renameForms[$tag['id']] = $this->createForm(RenameTagType::class, new Tag())->createView();
} }
return $this->render('@WallabagCore/Tag/tags.html.twig', [ return $this->render('Tag/tags.html.twig', [
'tags' => $tags, 'tags' => $tags,
'renameForms' => $renameForms, 'renameForms' => $renameForms,
'nbEntriesUntagged' => $nbEntriesUntagged, 'nbEntriesUntagged' => $nbEntriesUntagged,
@ -162,7 +162,7 @@ class TagController extends AbstractController
} }
} }
return $this->render('@WallabagCore/Entry/entries.html.twig', [ return $this->render('Entry/entries.html.twig', [
'form' => null, 'form' => null,
'entries' => $entries, 'entries' => $entries,
'currentPage' => $page, 'currentPage' => $page,

View file

@ -67,7 +67,7 @@ class UserController extends AbstractController
return $this->redirectToRoute('user_edit', ['id' => $user->getId()]); return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
} }
return $this->render('@WallabagCore/User/new.html.twig', [ return $this->render('User/new.html.twig', [
'user' => $user, 'user' => $user,
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);
@ -108,7 +108,7 @@ class UserController extends AbstractController
return $this->redirectToRoute('user_edit', ['id' => $user->getId()]); return $this->redirectToRoute('user_edit', ['id' => $user->getId()]);
} }
return $this->render('@WallabagCore/User/edit.html.twig', [ return $this->render('User/edit.html.twig', [
'user' => $user, 'user' => $user,
'edit_form' => $form->createView(), 'edit_form' => $form->createView(),
'delete_form' => $deleteForm->createView(), 'delete_form' => $deleteForm->createView(),
@ -173,7 +173,7 @@ class UserController extends AbstractController
} }
} }
return $this->render('@WallabagCore/User/index.html.twig', [ return $this->render('User/index.html.twig', [
'searchForm' => $form->createView(), 'searchForm' => $form->createView(),
'users' => $pagerFanta, 'users' => $pagerFanta,
]); ]);

View file

@ -78,7 +78,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
*/ */
public function sendAuthCode(TwoFactorInterface $user): void public function sendAuthCode(TwoFactorInterface $user): void
{ {
$template = $this->twig->load('@WallabagCore/TwoFactor/email_auth_code.html.twig'); $template = $this->twig->load('TwoFactor/email_auth_code.html.twig');
$subject = $template->renderBlock('subject', []); $subject = $template->renderBlock('subject', []);
$bodyHtml = $template->renderBlock('body_html', [ $bodyHtml = $template->renderBlock('body_html', [

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'config.page_title'|trans }}{% endblock %} {% block title %}{{ 'config.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'config.page_title'|trans }} > {{ 'config.otp.page_title'|trans }}{% endblock %} {% block title %}{{ 'config.page_title'|trans }} > {{ 'config.otp.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %} {% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %} {% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %} {% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'developer.page_title'|trans }}{% endblock %} {% block title %}{{ 'developer.page_title'|trans }}{% endblock %}

View file

@ -9,9 +9,9 @@
<div class="{{ subClass|default('original grey-text') }}"> <div class="{{ subClass|default('original grey-text') }}">
<a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a> <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
{% if withMetadata is defined %} {% if withMetadata is defined %}
{% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %} {% include "Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
<div class="reading-time grey-text"> <div class="reading-time grey-text">
<div class="card-reading-time">{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div> <div class="card-reading-time">{% include "Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
</div> </div>
{% endif %} {% endif %}
</div> </div>

View file

@ -1,6 +1,6 @@
<div class="card-action"> <div class="card-action">
<div class="reading-time grey-text"> <div class="reading-time grey-text">
<div class="card-reading-time">{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div> <div class="card-reading-time">{% include "Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
<div class="card-created-at"> <div class="card-created-at">
<i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i> <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
<span>&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span> <span>&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>

View file

@ -12,8 +12,8 @@
</a> </a>
{% endif %} {% endif %}
</div> </div>
{% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry} only %} {% include "Entry/Card/_content.html.twig" with {'entry': entry} only %}
</div> </div>
{% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %} {% include "Entry/_card_actions.html.twig" with {'entry': entry} only %}
</div> </div>

View file

@ -1,5 +1,5 @@
<div class="card-stacked{% if currentRoute in routes and entry.isArchived %} archived{% endif %}"> <div class="card-stacked{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
{% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %} {% include "Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
{% if app.user.config.displayThumbnails %} {% if app.user.config.displayThumbnails %}
<div class="card-preview"> <div class="card-preview">
<a href="{{ path('view', {'id': entry.id}) }}"> <a href="{{ path('view', {'id': entry.id}) }}">
@ -8,7 +8,7 @@
</a> </a>
</div> </div>
{% endif %} {% endif %}
{% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %} {% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
{% set current_path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %} {% set current_path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}

View file

@ -1,5 +1,5 @@
<div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}"> <div class="card entry-card{% if currentRoute in routes and entry.isArchived %} archived{% endif %}">
{% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %} {% include "Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
<div class="card-body"> <div class="card-body">
<div class="{% if app.user.config.displayThumbnails %}card-image{% endif %} waves-effect waves-block waves-light"> <div class="{% if app.user.config.displayThumbnails %}card-image{% endif %} waves-effect waves-block waves-light">
<ul class="card-entry-labels"> <ul class="card-entry-labels">
@ -14,7 +14,7 @@
</a> </a>
{% endif %} {% endif %}
</div> </div>
{% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %} {% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
</div> </div>
<div class="card-reveal"> <div class="card-reveal">
@ -34,5 +34,5 @@
</ul> </ul>
</div> </div>
{% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %} {% include "Entry/_card_actions.html.twig" with {'entry': entry} only %}
</div> </div>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %} {% block title %}{{ 'entry.edit.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block head %} {% block head %}
{{ parent() }} {{ parent() }}
@ -15,7 +15,7 @@
{% if searchTerm is defined and searchTerm is not empty %} {% if searchTerm is defined and searchTerm is not empty %}
{% set filter = searchTerm %} {% set filter = searchTerm %}
{% endif %} {% endif %}
{% include "@WallabagCore/Entry/_title.html.twig" with {'filter': filter} %} {% include "Entry/_title.html.twig" with {'filter': filter} %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@ -37,7 +37,7 @@
<label for="mass-action-inputs-displayed" class="mass-action-toggle results-item tooltipped" data-position="right" data-delay="50" data-tooltip="{{ 'entry.list.toggle_mass_action'|trans }}"><i class="material-icons">library_add_check</i></label> <label for="mass-action-inputs-displayed" class="mass-action-toggle results-item tooltipped" data-position="right" data-delay="50" data-tooltip="{{ 'entry.list.toggle_mass_action'|trans }}"><i class="material-icons">library_add_check</i></label>
{% endif %} {% endif %}
{% if app.user.config.feedToken %} {% if app.user.config.feedToken %}
{% include "@WallabagCore/Entry/_feed_link.html.twig" %} {% include "Entry/_feed_link.html.twig" %}
{% endif %} {% endif %}
</div> </div>
{% if current_route == 'search' %}<div><a href="{{ path('tag_this_search', {'filter': searchTerm, 'currentRoute': app.request.get('currentRoute'), redirect: current_path}) }}" title="{{ 'entry.list.assign_search_tag'|trans }}">{{ 'entry.list.assign_search_tag'|trans }}</a></div>{% endif %} {% if current_route == 'search' %}<div><a href="{{ path('tag_this_search', {'filter': searchTerm, 'currentRoute': app.request.get('currentRoute'), redirect: current_path}) }}" title="{{ 'entry.list.assign_search_tag'|trans }}">{{ 'entry.list.assign_search_tag'|trans }}</a></div>{% endif %}
@ -67,11 +67,11 @@
{% for entry in entries %} {% for entry in entries %}
<li id="entry-{{ entry.id|e }}" class="{% if list_mode != 0 %}col collection-item{% endif %} s12" data-entry-id="{{ entry.id|e }}" data-test="entry"> <li id="entry-{{ entry.id|e }}" class="{% if list_mode != 0 %}col collection-item{% endif %} s12" data-entry-id="{{ entry.id|e }}" data-test="entry">
{% if list_mode == 1 %} {% if list_mode == 1 %}
{% include "@WallabagCore/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% include "Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
{% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %} {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
{% include "@WallabagCore/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% include "Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
{% else %} {% else %}
{% include "@WallabagCore/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% include "Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %}
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ entry.title|striptags|default('entry.default_title'|trans)|raw }} ({{ entry.domainName|removeWww }}){% endblock %} {% block title %}{{ entry.title|striptags|default('entry.default_title'|trans)|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
@ -241,7 +241,7 @@
<div class="tools entry-tools grey-text" dir="auto"> <div class="tools entry-tools grey-text" dir="auto">
<ul class="stats"> <ul class="stats">
<li> <li>
{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %} {% include "Entry/_reading_time.html.twig" with {'entry': entry} only %}
</li> </li>
<li> <li>
<i class="material-icons grey-text" title="{{ 'entry.view.created_at'|trans }}">today</i> <i class="material-icons grey-text" title="{{ 'entry.view.created_at'|trans }}">today</i>
@ -282,7 +282,7 @@
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %} {% include "Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %}
</div> </div>
<div class="input-field nav-panel-add-tag" style="display: none"> <div class="input-field nav-panel-add-tag" style="display: none">

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %} {% block title %}{{ 'entry.new.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %} {% block title %}{{ 'ignore_origin_instance_rule.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.chrome.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.chrome.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.delicious.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.delicious.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -1,3 +1,3 @@
{% extends "@WallabagCore/Import/WallabagV1/index.html.twig" %} {% extends "Import/WallabagV1/index.html.twig" %}
{% block title %}{{ 'import.elcurator.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.elcurator.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.firefox.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.firefox.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.instapaper.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.instapaper.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.pinboard.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.pinboard.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.pocket.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.pocket.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
{% if not has_consumer_key %} {% if not has_consumer_key %}
<div class="card-panel red white-text"> <div class="card-panel red white-text">

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.pocket_html.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.pocket_html.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.readability.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.readability.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.shaarli.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.shaarli.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote> <blockquote>{{ import.description|trans|raw }}</blockquote>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %}
@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
<div class="row"> <div class="row">
<blockquote>{{ import.description|trans }}</blockquote> <blockquote>{{ import.description|trans }}</blockquote>

View file

@ -1,3 +1,3 @@
{% extends "@WallabagCore/Import/WallabagV1/index.html.twig" %} {% extends "Import/WallabagV1/index.html.twig" %}
{% block title %}{{ 'import.wallabag_v2.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.wallabag_v2.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'import.page_title'|trans }}{% endblock %} {% block title %}{{ 'import.page_title'|trans }}{% endblock %}
@ -12,7 +12,7 @@
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
<div class="card-panel settings"> <div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %} {% include 'Import/_information.html.twig' %}
{{ 'import.page_description'|trans }} {{ 'import.page_description'|trans }}
<ul> <ul>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %} {% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'about.page_title'|trans }}{% endblock %} {% block title %}{{ 'about.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'howto.page_title'|trans }}{% endblock %} {% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
@ -46,7 +46,7 @@
<div class="col s12"> <div class="col s12">
<h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5> <h5>{{ 'howto.top_menu.bookmarklet'|trans }}</h5>
{{ 'howto.bookmarklet.description'|trans }} {{ 'howto.bookmarklet.description'|trans }}
{% include '@WallabagCore/Static/_bookmarklet.html.twig' %} {% include 'Static/_bookmarklet.html.twig' %}
</div> </div>
</div> </div>

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %} {% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'tag.page_title'|trans }}{% endblock %} {% block title %}{{ 'tag.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %} {% block title %}{{ 'user.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %} {% block title %}{{ 'user.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %} {% block title %}{{ 'user.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %} {% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'security.login.page_title'|trans }}{% endblock %} {% block title %}{{ 'security.login.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/layout.html.twig" %} {% extends "layout.html.twig" %}
{% block title %}{{ 'error.page_title'|trans }}{% endblock %} {% block title %}{{ 'error.page_title'|trans }}{% endblock %}

View file

@ -1,4 +1,4 @@
{% extends "@WallabagCore/base.html.twig" %} {% extends "base.html.twig" %}
{% block css %} {% block css %}
{{ parent() }} {{ parent() }}

View file

Before

Width:  |  Height:  |  Size: 334 KiB

After

Width:  |  Height:  |  Size: 334 KiB

View file

@ -22,7 +22,7 @@ class AuthCodeMailerTest extends TestCase
{% block body_text %}text body {{ support_url }}{% endblock %} {% block body_text %}text body {{ support_url }}{% endblock %}
TWIG; TWIG;
$this->twig = new Environment(new ArrayLoader(['@WallabagCore/TwoFactor/email_auth_code.html.twig' => $twigTemplate])); $this->twig = new Environment(new ArrayLoader(['TwoFactor/email_auth_code.html.twig' => $twigTemplate]));
} }
public function testSendEmail() public function testSendEmail()