pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move Import templates to Core

Browse Source
This commit is contained in:
Yassine Guedidi
2023-12-31 22:07:37 +01:00
parent 057dbf0066
commit 8b13631e3d
28 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/Import/ChromeController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php
View File

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

6
src/Wallabag/CoreBundle/Controller/Import/ImportController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/PocketController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php
View File

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

2
src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php
View File

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

45
src/Wallabag/CoreBundle/Resources/views/Import/Chrome/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.chrome.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.chrome.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/Delicious/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.delicious.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.delicious.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

3
src/Wallabag/CoreBundle/Resources/views/Import/Elcurator/index.html.twig Normal file
View File

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

45
src/Wallabag/CoreBundle/Resources/views/Import/Firefox/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.firefox.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.firefox.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/Instapaper/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.instapaper.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.instapaper.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/Pinboard/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.pinboard.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.pinboard.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

37
src/Wallabag/CoreBundle/Resources/views/Import/Pocket/index.html.twig Normal file
View File

@ -0,0 +1,37 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.pocket.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
{% if not has_consumer_key %}
<div class="card-panel red white-text">
{{ 'import.pocket.config_missing.description'|trans }}
{{ 'import.pocket.config_missing.admin_message'|trans({'%keyurls%': '<a href="' ~ path('config') ~ '" class="white-text"><strong>', '%keyurle%': '</strong></a>'})|raw }}
</div>
{% endif %}
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.pocket.authorize_message'|trans }}</p>
<form method="post" action="{{ path('import_pocket_auth') }}">
<div class="row">
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
<button class="btn waves-effect waves-light" type="submit" name="action" {% if not has_consumer_key %}disabled="disabled"{% endif %}>
{{ 'import.pocket.connect_to_pocket'|trans }}
</button>
</form>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/PocketHtml/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.pocket_html.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.pocket_html.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/Readability/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.readability.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.readability.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/Shaarli/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.shaarli.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p>{{ 'import.shaarli.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

45
src/Wallabag/CoreBundle/Resources/views/Import/WallabagV1/index.html.twig Normal file
View File

@ -0,0 +1,45 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
<div class="row">
<blockquote>{{ import.description|trans }}</blockquote>
<p>{{ 'import.wallabag_v1.how_to'|trans }}</p>
<div class="col s12">
{{ form_start(form, {'method': 'POST'}) }}
{{ form_errors(form) }}
<div class="row">
<div class="file-field input-field col s12">
{{ form_errors(form.file) }}
<div class="btn">
<span>{{ form.file.vars.label|trans }}</span>
{{ form_widget(form.file) }}
</div>
<div class="file-path-wrapper">
<input class="file-path validate" type="text">
</div>
</div>
<div class="input-field col s6 with-checkbox">
<h6>{{ 'import.form.mark_as_read_title'|trans }}</h6>
{{ form_widget(form.mark_as_read) }}
{{ form_label(form.mark_as_read) }}
</div>
</div>
{{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
{{ form_rest(form) }}
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}

3
src/Wallabag/CoreBundle/Resources/views/Import/WallabagV2/index.html.twig Normal file
View File

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

15
src/Wallabag/CoreBundle/Resources/views/Import/_information.html.twig Normal file
View File

@ -0,0 +1,15 @@
{% set redis = craue_setting('import_with_redis') %}
{% set rabbit = craue_setting('import_with_rabbitmq') %}
{% set download_images = craue_setting('download_images_enabled') %}
{% if redis or rabbit %}
<div class="card-panel yellow darken-1 black-text">
{{ 'import.worker.enabled'|trans }} <strong>{% if rabbit %}RabbitMQ{% elseif redis %}Redis{% endif %}</strong>
</div>
{% endif %}
{% if not redis and not rabbit and download_images %}
<div class="card-panel orange darken-1 black-text">
{{ 'import.worker.download_images_warning'|trans|raw }}
</div>
{% endif %}

23
src/Wallabag/CoreBundle/Resources/views/Import/check_queue.html.twig Normal file
View File

@ -0,0 +1,23 @@
{% if nbRedisMessages is defined and nbRedisMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRedisMessages }}', 4000);
</script>
{% endif %}
{% if nbRabbitMessages is defined and nbRabbitMessages > 0 %}
<script>
Materialize.toast('Messages in queue: {{ nbRabbitMessages }}', 4000);
</script>
{% endif %}
{% if redisNotInstalled is defined and redisNotInstalled %}
<div class="card-panel red darken-1 white-text">
{{ 'flashes.import.error.redis_enabled_not_installed'|trans|raw }}
</div>
{% endif %}
{% if rabbitNotInstalled is defined and rabbitNotInstalled %}
<div class="card-panel red darken-1 white-text">
{{ 'flashes.import.error.rabbit_enabled_not_installed'|trans|raw }}
</div>
{% endif %}

30
src/Wallabag/CoreBundle/Resources/views/Import/index.html.twig Normal file
View File

@ -0,0 +1,30 @@
{% extends "@WallabagCore/layout.html.twig" %}
{% block title %}{{ 'import.page_title'|trans }}{% endblock %}
{% block messages %}
{{ render(controller('Wallabag\\CoreBundle\\Controller\\Import\\ImportController::checkQueueAction')) }}
{{ parent() }}
{% endblock %}
{% block content %}
<div class="row">
<div class="col s12">
<div class="card-panel settings">
{% include '@WallabagCore/Import/_information.html.twig' %}
{{ 'import.page_description'|trans }}
<ul>
{% for import in imports %}
<li>
<h5>{{ import.name }}</h5>
<blockquote>{{ import.description|trans|raw }}</blockquote>
<p><a class="waves-effect waves-light btn" href="{{ path(import.url) }}">{{ 'import.action.import_contents'|trans }}</a></p>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endblock %}