Move Import templates to Core

src/Wallabag/CoreBundle/Controller/Import/ChromeController.php

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

src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php

@@ -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,
         ]);

src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php

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

src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php

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

src/Wallabag/CoreBundle/Controller/Import/ImportController.php

@@ -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,

src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php

@@ -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,
         ]);

src/Wallabag/CoreBundle/Controller/Import/PinboardController.php

@@ -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,
         ]);

src/Wallabag/CoreBundle/Controller/Import/PocketController.php

@@ -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(),

src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php

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

src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php

@@ -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,
         ]);

src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php

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

src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php

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

src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php

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

src/Wallabag/CoreBundle/Resources/views/Import/Chrome/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans|raw }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Delicious/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Elcurator/index.html.twig

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

src/Wallabag/CoreBundle/Resources/views/Import/Firefox/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans|raw }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Instapaper/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Pinboard/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Pocket/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             {% if not has_consumer_key %}
                 <div class="card-panel red white-text">

src/Wallabag/CoreBundle/Resources/views/Import/PocketHtml/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans|raw }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Readability/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/Shaarli/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans|raw }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/WallabagV1/index.html.twig

@@ -6,7 +6,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             <div class="row">
                 <blockquote>{{ import.description|trans }}</blockquote>

src/Wallabag/CoreBundle/Resources/views/Import/WallabagV2/index.html.twig

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

src/Wallabag/CoreBundle/Resources/views/Import/index.html.twig

@@ -12,7 +12,7 @@
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-            {% include '@WallabagImport/Import/_information.html.twig' %}
+            {% include '@WallabagCore/Import/_information.html.twig' %}
 
             {{ 'import.page_description'|trans }}
             <ul>