aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php (renamed from src/WallabagBundle/Controller/EntryController.php)22
-rw-r--r--src/Wallabag/CoreBundle/Controller/StaticController.php (renamed from src/WallabagBundle/Controller/StaticController.php)4
-rw-r--r--src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php (renamed from src/WallabagBundle/DependencyInjection/WallabagExtension.php)6
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php (renamed from src/WallabagBundle/Entity/Config.php)2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php~ (renamed from src/WallabagBundle/Entity/Config.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entries.php (renamed from src/WallabagBundle/Entity/Entries.php)4
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entries.php~ (renamed from src/WallabagBundle/Entity/Entries.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php~ (renamed from src/WallabagBundle/Entity/Entry.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/Tags.php (renamed from src/WallabagBundle/Entity/Tags.php)2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Tags.php~ (renamed from src/WallabagBundle/Entity/Tags.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/TagsEntries.php (renamed from src/WallabagBundle/Entity/TagsEntries.php)2
-rw-r--r--src/Wallabag/CoreBundle/Entity/TagsEntries.php~ (renamed from src/WallabagBundle/Entity/TagsEntries.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/Users.php (renamed from src/WallabagBundle/Entity/Users.php)2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Users.php~ (renamed from src/WallabagBundle/Entity/Users.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Entity/UsersConfig.php (renamed from src/WallabagBundle/Entity/UsersConfig.php)2
-rw-r--r--src/Wallabag/CoreBundle/Entity/UsersConfig.php~ (renamed from src/WallabagBundle/Entity/UsersConfig.php~)0
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntriesRepository.php (renamed from src/WallabagBundle/Repository/EntriesRepository.php)2
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/routing.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.xml (renamed from src/WallabagBundle/Resources/config/services.xml)7
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig (renamed from src/WallabagBundle/Resources/views/Entry/entries.html.twig)4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig (renamed from src/WallabagBundle/Resources/views/Entry/entry.html.twig)10
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig (renamed from src/WallabagBundle/Resources/views/Entry/new.html.twig)4
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/Static/about.html.twig (renamed from src/WallabagBundle/Resources/views/Static/about.html.twig)4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig (renamed from src/WallabagBundle/Resources/views/_bookmarklet.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_footer.html.twig (renamed from src/WallabagBundle/Resources/views/_footer.html.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_head.html.twig (renamed from src/WallabagBundle/Resources/views/_head.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_menu.html.twig (renamed from src/WallabagBundle/Resources/views/_menu.html.twig)8
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_messages.html.twig (renamed from src/WallabagBundle/Resources/views/_messages.html.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_save_form.html.twig (renamed from src/WallabagBundle/Resources/views/_save_form.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig (renamed from src/WallabagBundle/Resources/views/_search_form.html.twig)0
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/_top.html.twig (renamed from src/WallabagBundle/Resources/views/_top.html.twig)0
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/layout.html.twig (renamed from src/WallabagBundle/Resources/views/layout.html.twig)8
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php (renamed from src/WallabagBundle/Tests/Controller/DefaultControllerTest.php)2
-rw-r--r--src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php (renamed from src/WallabagBundle/Twig/Extension/WallabagExtension.php)2
-rw-r--r--src/Wallabag/CoreBundle/WallabagCoreBundle.php9
-rwxr-xr-xsrc/Wallabag/Wallabag/Database.php2
-rw-r--r--src/WallabagBundle/Resources/config/routing.yml3
-rw-r--r--src/WallabagBundle/WallabagBundle.php9
38 files changed, 64 insertions, 59 deletions
diff --git a/src/WallabagBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index dc1876fa..2ebb416c 100644
--- a/src/WallabagBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -1,12 +1,12 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Controller; 3namespace Wallabag\CoreBundle\Controller;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
7use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use WallabagBundle\Repository; 8use Wallabag\CoreBundle\Repository;
9use WallabagBundle\Entity\Entries; 9use Wallabag\CoreBundle\Entity\Entries;
10use Wallabag\Wallabag\Tools; 10use Wallabag\Wallabag\Tools;
11use Wallabag\Wallabag\Url; 11use Wallabag\Wallabag\Url;
12 12
@@ -47,7 +47,7 @@ class EntryController extends Controller
47 return $this->redirect($this->generateUrl('homepage')); 47 return $this->redirect($this->generateUrl('homepage'));
48 } 48 }
49 49
50 return $this->render('WallabagBundle:Entry:new.html.twig', array( 50 return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
51 'form' => $form->createView(), 51 'form' => $form->createView(),
52 )); 52 ));
53 } 53 }
@@ -60,11 +60,11 @@ class EntryController extends Controller
60 */ 60 */
61 public function showUnreadAction() 61 public function showUnreadAction()
62 { 62 {
63 $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries'); 63 $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
64 $entries = $repository->findUnreadByUser(1, 0); 64 $entries = $repository->findUnreadByUser(1, 0);
65 65
66 return $this->render( 66 return $this->render(
67 'WallabagBundle:Entry:entries.html.twig', 67 'WallabagCoreBundle:Entry:entries.html.twig',
68 array('entries' => $entries) 68 array('entries' => $entries)
69 ); 69 );
70 } 70 }
@@ -77,11 +77,11 @@ class EntryController extends Controller
77 */ 77 */
78 public function showArchiveAction() 78 public function showArchiveAction()
79 { 79 {
80 $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries'); 80 $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
81 $entries = $repository->findArchiveByUser(1, 0); 81 $entries = $repository->findArchiveByUser(1, 0);
82 82
83 return $this->render( 83 return $this->render(
84 'WallabagBundle:Entry:entries.html.twig', 84 'WallabagCoreBundle:Entry:entries.html.twig',
85 array('entries' => $entries) 85 array('entries' => $entries)
86 ); 86 );
87 } 87 }
@@ -94,11 +94,11 @@ class EntryController extends Controller
94 */ 94 */
95 public function showStarredAction() 95 public function showStarredAction()
96 { 96 {
97 $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries'); 97 $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
98 $entries = $repository->findStarredByUser(1, 0); 98 $entries = $repository->findStarredByUser(1, 0);
99 99
100 return $this->render( 100 return $this->render(
101 'WallabagBundle:Entry:entries.html.twig', 101 'WallabagCoreBundle:Entry:entries.html.twig',
102 array('entries' => $entries) 102 array('entries' => $entries)
103 ); 103 );
104 } 104 }
@@ -113,7 +113,7 @@ class EntryController extends Controller
113 public function viewAction(Entries $entry) 113 public function viewAction(Entries $entry)
114 { 114 {
115 return $this->render( 115 return $this->render(
116 'WallabagBundle:Entry:entry.html.twig', 116 'WallabagCoreBundle:Entry:entry.html.twig',
117 array('entry' => $entry) 117 array('entry' => $entry)
118 ); 118 );
119 } 119 }
diff --git a/src/WallabagBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index aee2bb7e..0fd19d65 100644
--- a/src/WallabagBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Controller; 3namespace Wallabag\CoreBundle\Controller;
4 4
5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; 5use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
6use Symfony\Bundle\FrameworkBundle\Controller\Controller; 6use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -13,7 +13,7 @@ class StaticController extends Controller
13 public function aboutAction() 13 public function aboutAction()
14 { 14 {
15 return $this->render( 15 return $this->render(
16 'WallabagBundle:Static:about.html.twig', 16 'WallabagCoreBundle:Static:about.html.twig',
17 array() 17 array()
18 ); 18 );
19 } 19 }
diff --git a/src/WallabagBundle/DependencyInjection/WallabagExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index cfdb21fc..7cc4165e 100644
--- a/src/WallabagBundle/DependencyInjection/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -1,13 +1,13 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\DependencyInjection; 3namespace Wallabag\CoreBundle\DependencyInjection;
4 4
5use Symfony\Component\DependencyInjection\ContainerBuilder; 5use Symfony\Component\DependencyInjection\ContainerBuilder;
6use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; 6use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
7use Symfony\Component\HttpKernel\DependencyInjection\Extension; 7use Symfony\Component\HttpKernel\DependencyInjection\Extension;
8use Symfony\Component\Config\FileLocator; 8use Symfony\Component\Config\FileLocator;
9 9
10class WallabagExtension extends Extension 10class WallabagCoreExtension extends Extension
11{ 11{
12 public function load(array $configs, ContainerBuilder $container) 12 public function load(array $configs, ContainerBuilder $container)
13 { 13 {
@@ -17,6 +17,6 @@ class WallabagExtension extends Extension
17 17
18 public function getAlias() 18 public function getAlias()
19 { 19 {
20 return 'wallabag'; 20 return 'wallabag_core';
21 } 21 }
22} 22}
diff --git a/src/WallabagBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 8b692cef..d60b2df0 100644
--- a/src/WallabagBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6 6
diff --git a/src/WallabagBundle/Entity/Config.php~ b/src/Wallabag/CoreBundle/Entity/Config.php~
index 8b692cef..8b692cef 100644
--- a/src/WallabagBundle/Entity/Config.php~
+++ b/src/Wallabag/CoreBundle/Entity/Config.php~
diff --git a/src/WallabagBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php
index 5849a216..712ff126 100644
--- a/src/WallabagBundle/Entity/Entries.php
+++ b/src/Wallabag/CoreBundle/Entity/Entries.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6use Symfony\Component\Validator\Constraints as Assert; 6use Symfony\Component\Validator\Constraints as Assert;
@@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
8/** 8/**
9 * Entries 9 * Entries
10 * 10 *
11 * @ORM\Entity(repositoryClass="WallabagBundle\Repository\EntriesRepository") 11 * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntriesRepository")
12 * @ORM\Table(name="entries") 12 * @ORM\Table(name="entries")
13 */ 13 */
14class Entries 14class Entries
diff --git a/src/WallabagBundle/Entity/Entries.php~ b/src/Wallabag/CoreBundle/Entity/Entries.php~
index 69c6be0d..69c6be0d 100644
--- a/src/WallabagBundle/Entity/Entries.php~
+++ b/src/Wallabag/CoreBundle/Entity/Entries.php~
diff --git a/src/WallabagBundle/Entity/Entry.php~ b/src/Wallabag/CoreBundle/Entity/Entry.php~
index ebcdf53a..ebcdf53a 100644
--- a/src/WallabagBundle/Entity/Entry.php~
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php~
diff --git a/src/WallabagBundle/Entity/Tags.php b/src/Wallabag/CoreBundle/Entity/Tags.php
index c0c78ee5..6fe16a53 100644
--- a/src/WallabagBundle/Entity/Tags.php
+++ b/src/Wallabag/CoreBundle/Entity/Tags.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6 6
diff --git a/src/WallabagBundle/Entity/Tags.php~ b/src/Wallabag/CoreBundle/Entity/Tags.php~
index c0c78ee5..c0c78ee5 100644
--- a/src/WallabagBundle/Entity/Tags.php~
+++ b/src/Wallabag/CoreBundle/Entity/Tags.php~
diff --git a/src/WallabagBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
index 448c54fa..ad01cf57 100644
--- a/src/WallabagBundle/Entity/TagsEntries.php
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6 6
diff --git a/src/WallabagBundle/Entity/TagsEntries.php~ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php~
index 448c54fa..448c54fa 100644
--- a/src/WallabagBundle/Entity/TagsEntries.php~
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php~
diff --git a/src/WallabagBundle/Entity/Users.php b/src/Wallabag/CoreBundle/Entity/Users.php
index a48f2240..3db4a3fd 100644
--- a/src/WallabagBundle/Entity/Users.php
+++ b/src/Wallabag/CoreBundle/Entity/Users.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6 6
diff --git a/src/WallabagBundle/Entity/Users.php~ b/src/Wallabag/CoreBundle/Entity/Users.php~
index a48f2240..a48f2240 100644
--- a/src/WallabagBundle/Entity/Users.php~
+++ b/src/Wallabag/CoreBundle/Entity/Users.php~
diff --git a/src/WallabagBundle/Entity/UsersConfig.php b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
index 8af283cc..26fb44ee 100644
--- a/src/WallabagBundle/Entity/UsersConfig.php
+++ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Entity; 3namespace Wallabag\CoreBundle\Entity;
4 4
5use Doctrine\ORM\Mapping as ORM; 5use Doctrine\ORM\Mapping as ORM;
6 6
diff --git a/src/WallabagBundle/Entity/UsersConfig.php~ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php~
index 8af283cc..8af283cc 100644
--- a/src/WallabagBundle/Entity/UsersConfig.php~
+++ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php~
diff --git a/src/WallabagBundle/Repository/EntriesRepository.php b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
index 3eb1733d..5a71b9ef 100644
--- a/src/WallabagBundle/Repository/EntriesRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Repository; 3namespace Wallabag\CoreBundle\Repository;
4 4
5use Doctrine\ORM\Query; 5use Doctrine\ORM\Query;
6use Doctrine\ORM\EntityRepository; 6use Doctrine\ORM\EntityRepository;
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing.yml b/src/Wallabag/CoreBundle/Resources/config/routing.yml
new file mode 100644
index 00000000..327d49d8
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/config/routing.yml
@@ -0,0 +1,3 @@
1_wllbg:
2 resource: "@WallabagCoreBundle/Controller/EntryController.php"
3 type: annotation \ No newline at end of file
diff --git a/src/WallabagBundle/Resources/config/services.xml b/src/Wallabag/CoreBundle/Resources/config/services.xml
index 02d82643..02308e6a 100644
--- a/src/WallabagBundle/Resources/config/services.xml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.xml
@@ -5,8 +5,13 @@
5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> 5 xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6 6
7 <services> 7 <services>
8 <service id="wallabag.twig.extension.wallabag_extension" class="WallabagBundle\Twig\Extension\WallabagExtension"> 8 <service id="wallabag_core.twig.wallabag" class="Wallabag\CoreBundle\Twig\Extension\WallabagExtension">
9 <tag name="twig.extension" /> 9 <tag name="twig.extension" />
10 </service> 10 </service>
11 </services> 11 </services>
12
13
14
12</container> 15</container>
16
17
diff --git a/src/WallabagBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index de343aa2..2f8423d7 100644
--- a/src/WallabagBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -1,9 +1,9 @@
1{% extends "WallabagBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title "Unread" %} 3{% block title "Unread" %}
4 4
5{% block menu %} 5{% block menu %}
6 {% include "WallabagBundle::_menu.html.twig" %} 6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %} 7{% endblock %}
8 8
9{% block content %} 9{% block content %}
diff --git a/src/WallabagBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 8c08b2ef..78dfa7c0 100644
--- a/src/WallabagBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -1,9 +1,9 @@
1{% extends "WallabagBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
4 4
5{% block menu %} 5{% block menu %}
6 {% include "WallabagBundle::_menu.html.twig" %} 6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %} 7{% endblock %}
8 8
9{% block content %} 9{% block content %}
@@ -21,9 +21,9 @@
21 {# {% if flattr %}{% if flattr.status == flattrable %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}"><span>{% trans %}flattr{% endtrans %}</span></a></li>{% elseif flattr.status == flattred %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}><span>{% trans %}flattr{% endtrans %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} #} 21 {# {% if flattr %}{% if flattr.status == flattrable %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}"><span>{% trans %}flattr{% endtrans %}</span></a></li>{% elseif flattr.status == flattred %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}><span>{% trans %}flattr{% endtrans %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} #}
22 {% if carrot %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %} 22 {% if carrot %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %}
23 {% if show_printlink %}<li><a title="{% trans %}Print{% endtrans %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans %}Print{% endtrans %}</span></a></li>{% endif %} 23 {% if show_printlink %}<li><a title="{% trans %}Print{% endtrans %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans %}Print{% endtrans %}</span></a></li>{% endif %}
24 {% if export_epub %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %} 24 {% if export_epub %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
25 {% if export_mobi %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %} 25 {% if export_mobi %}<li><a href="?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
26 {% if export_pdf %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %} 26 {% if export_pdf %}<li><a href="?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
27 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li> 27 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
28 </ul> 28 </ul>
29 </div> 29 </div>
diff --git a/src/WallabagBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index 78da791f..df6926a0 100644
--- a/src/WallabagBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -1,9 +1,9 @@
1{% extends "WallabagBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} 3{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
4 4
5{% block menu %} 5{% block menu %}
6 {% include "WallabagBundle::_menu.html.twig" %} 6 {% include "WallabagCoreBundle::_menu.html.twig" %}
7{% endblock %} 7{% endblock %}
8 8
9{% block content %} 9{% block content %}
diff --git a/src/WallabagBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index 752526e1..0585ecca 100755
--- a/src/WallabagBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -1,8 +1,8 @@
1{% extends "WallabagBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}About{% endtrans %}{% endblock %} 3{% block title %}{% trans %}About{% endtrans %}{% endblock %}
4{% block menu %} 4{% block menu %}
5{% include "WallabagBundle::_menu.html.twig" %} 5{% include "WallabagCoreBundle::_menu.html.twig" %}
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans %}About wallabag{% endtrans %}</h2> 8 <h2>{% trans %}About wallabag{% endtrans %}</h2>
diff --git a/src/WallabagBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
index d432909a..d432909a 100644
--- a/src/WallabagBundle/Resources/views/_bookmarklet.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
diff --git a/src/WallabagBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
index c897a97e..c897a97e 100644
--- a/src/WallabagBundle/Resources/views/_footer.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
diff --git a/src/WallabagBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
index 7ef79a2f..7ef79a2f 100755
--- a/src/WallabagBundle/Resources/views/_head.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
diff --git a/src/WallabagBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
index 419a676b..d4560e84 100644
--- a/src/WallabagBundle/Resources/views/_menu.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
@@ -3,13 +3,13 @@
3 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 3 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
4 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> 4 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
5 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> 5 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
6 <li><a href="./?view=tags">{% trans %}tags{% endtrans %}</a></li> 6 <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
7 <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li> 7 <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
8 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> 8 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
9 {% include "WallabagBundle::_search_form.html.twig" %} 9 {% include "WallabagCoreBundle::_search_form.html.twig" %}
10 </li> 10 </li>
11 <li><a href="./?view=config">{% trans %}config{% endtrans %}</a></li> 11 <li><a href="?view=config">{% trans %}config{% endtrans %}</a></li>
12 <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li> 12 <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
13 <li><a class="icon icon-power" href="./?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> 13 <li><a class="icon icon-power" href="?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
14 </ul> 14 </ul>
15 15
diff --git a/src/WallabagBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
index e69de29b..e69de29b 100644
--- a/src/WallabagBundle/Resources/views/_messages.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
diff --git a/src/WallabagBundle/Resources/views/_save_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
index acaa5dbc..acaa5dbc 100755
--- a/src/WallabagBundle/Resources/views/_save_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
diff --git a/src/WallabagBundle/Resources/views/_search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
index 7eb1b67d..7eb1b67d 100644
--- a/src/WallabagBundle/Resources/views/_search_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
diff --git a/src/WallabagBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
index 34d925df..34d925df 100755
--- a/src/WallabagBundle/Resources/views/_top.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
diff --git a/src/WallabagBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index 34d9b1b0..83830a4a 100644
--- a/src/WallabagBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -11,11 +11,11 @@
11 <meta http-equiv="X-UA-Compatible" content="IE=10"> 11 <meta http-equiv="X-UA-Compatible" content="IE=10">
12 <![endif]--> 12 <![endif]-->
13 <title>{% block title %}{% endblock %} - wallabag</title> 13 <title>{% block title %}{% endblock %} - wallabag</title>
14 {% include "WallabagBundle::_head.html.twig" %} 14 {% include "WallabagCoreBundle::_head.html.twig" %}
15 {% include "WallabagBundle::_bookmarklet.html.twig" %} 15 {% include "WallabagCoreBundle::_bookmarklet.html.twig" %}
16</head> 16</head>
17<body> 17<body>
18{% include "WallabagBundle::_top.html.twig" %} 18{% include "WallabagCoreBundle::_top.html.twig" %}
19<div id="main"> 19<div id="main">
20 {% block menu %}{% endblock %} 20 {% block menu %}{% endblock %}
21 {% block precontent %}{% endblock %} 21 {% block precontent %}{% endblock %}
@@ -28,6 +28,6 @@
28 {% block content %}{% endblock %} 28 {% block content %}{% endblock %}
29 </div> 29 </div>
30</div> 30</div>
31{% include "WallabagBundle::_footer.html.twig" %} 31{% include "WallabagCoreBundle::_footer.html.twig" %}
32</body> 32</body>
33</html> \ No newline at end of file 33</html> \ No newline at end of file
diff --git a/src/WallabagBundle/Tests/Controller/DefaultControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php
index 64b389bb..af20f31f 100644
--- a/src/WallabagBundle/Tests/Controller/DefaultControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Tests\Controller; 3namespace Wallabag\CoreBundle\Tests\Controller;
4 4
5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; 5use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
6 6
diff --git a/src/WallabagBundle/Twig/Extension/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
index 741fb191..0b004a30 100644
--- a/src/WallabagBundle/Twig/Extension/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
@@ -1,6 +1,6 @@
1<?php 1<?php
2 2
3namespace WallabagBundle\Twig\Extension; 3namespace Wallabag\CoreBundle\Twig\Extension;
4 4
5class WallabagExtension extends \Twig_Extension 5class WallabagExtension extends \Twig_Extension
6{ 6{
diff --git a/src/Wallabag/CoreBundle/WallabagCoreBundle.php b/src/Wallabag/CoreBundle/WallabagCoreBundle.php
new file mode 100644
index 00000000..f5899e39
--- /dev/null
+++ b/src/Wallabag/CoreBundle/WallabagCoreBundle.php
@@ -0,0 +1,9 @@
1<?php
2
3namespace Wallabag\CoreBundle;
4
5use Symfony\Component\HttpKernel\Bundle\Bundle;
6
7class WallabagCoreBundle extends Bundle
8{
9}
diff --git a/src/Wallabag/Wallabag/Database.php b/src/Wallabag/Wallabag/Database.php
index 47fa99aa..29073108 100755
--- a/src/Wallabag/Wallabag/Database.php
+++ b/src/Wallabag/Wallabag/Database.php
@@ -11,7 +11,7 @@
11namespace Wallabag\Wallabag; 11namespace Wallabag\Wallabag;
12 12
13use \PDO; 13use \PDO;
14use WallabagBundle\Entity; 14use CoreBundle\Entity;
15 15
16class Database { 16class Database {
17 17
diff --git a/src/WallabagBundle/Resources/config/routing.yml b/src/WallabagBundle/Resources/config/routing.yml
deleted file mode 100644
index ad79b1f0..00000000
--- a/src/WallabagBundle/Resources/config/routing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
1_wllbg:
2 resource: "@WallabagBundle/Controller/EntryController.php"
3 type: annotation
diff --git a/src/WallabagBundle/WallabagBundle.php b/src/WallabagBundle/WallabagBundle.php
deleted file mode 100644
index ddfb13f9..00000000
--- a/src/WallabagBundle/WallabagBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
1<?php
2
3namespace WallabagBundle;
4
5use Symfony\Component\HttpKernel\Bundle\Bundle;
6
7class WallabagBundle extends Bundle
8{
9}