new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new AppBundle\AppBundle(),
- new WallabagBundle\WallabagBundle(),
+ new Wallabag\CoreBundle\WallabagCoreBundle(),
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
app:
- resource: @WallabagBundle/Controller/
+ resource: @WallabagCoreBundle/Controller/
type: annotation
homepage:
pattern: /
- defaults: { _controller: WallabagBundle:Entry:showUnread }
\ No newline at end of file
+ defaults: { _controller: CoreBundle:Entry:showUnread }
\ No newline at end of file
<?php
-namespace WallabagBundle\Controller;
+namespace Wallabag\CoreBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
-use WallabagBundle\Repository;
-use WallabagBundle\Entity\Entries;
+use Wallabag\CoreBundle\Repository;
+use Wallabag\CoreBundle\Entity\Entries;
use Wallabag\Wallabag\Tools;
use Wallabag\Wallabag\Url;
return $this->redirect($this->generateUrl('homepage'));
}
- return $this->render('WallabagBundle:Entry:new.html.twig', array(
+ return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
'form' => $form->createView(),
));
}
*/
public function showUnreadAction()
{
- $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+ $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
$entries = $repository->findUnreadByUser(1, 0);
return $this->render(
- 'WallabagBundle:Entry:entries.html.twig',
+ 'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
);
}
*/
public function showArchiveAction()
{
- $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+ $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
$entries = $repository->findArchiveByUser(1, 0);
return $this->render(
- 'WallabagBundle:Entry:entries.html.twig',
+ 'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
);
}
*/
public function showStarredAction()
{
- $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+ $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
$entries = $repository->findStarredByUser(1, 0);
return $this->render(
- 'WallabagBundle:Entry:entries.html.twig',
+ 'WallabagCoreBundle:Entry:entries.html.twig',
array('entries' => $entries)
);
}
public function viewAction(Entries $entry)
{
return $this->render(
- 'WallabagBundle:Entry:entry.html.twig',
+ 'WallabagCoreBundle:Entry:entry.html.twig',
array('entry' => $entry)
);
}
<?php
-namespace WallabagBundle\Controller;
+namespace Wallabag\CoreBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
public function aboutAction()
{
return $this->render(
- 'WallabagBundle:Static:about.html.twig',
+ 'WallabagCoreBundle:Static:about.html.twig',
array()
);
}
<?php
-namespace WallabagBundle\DependencyInjection;
+namespace Wallabag\CoreBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\Config\FileLocator;
-class WallabagExtension extends Extension
+class WallabagCoreExtension extends Extension
{
public function load(array $configs, ContainerBuilder $container)
{
public function getAlias()
{
- return 'wallabag';
+ return 'wallabag_core';
}
}
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Component\Validator\Constraints as Assert;
/**
* Entries
*
- * @ORM\Entity(repositoryClass="WallabagBundle\Repository\EntriesRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntriesRepository")
* @ORM\Table(name="entries")
*/
class Entries
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
<?php
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
<?php
-namespace WallabagBundle\Repository;
+namespace Wallabag\CoreBundle\Repository;
use Doctrine\ORM\Query;
use Doctrine\ORM\EntityRepository;
--- /dev/null
+_wllbg:
+ resource: "@WallabagCoreBundle/Controller/EntryController.php"
+ type: annotation
\ No newline at end of file
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<services>
- <service id="wallabag.twig.extension.wallabag_extension" class="WallabagBundle\Twig\Extension\WallabagExtension">
+ <service id="wallabag_core.twig.wallabag" class="Wallabag\CoreBundle\Twig\Extension\WallabagExtension">
<tag name="twig.extension" />
</service>
</services>
+
+
+
</container>
+
+
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title "Unread" %}
{% block menu %}
- {% include "WallabagBundle::_menu.html.twig" %}
+ {% include "WallabagCoreBundle::_menu.html.twig" %}
{% endblock %}
{% block content %}
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
{% block menu %}
- {% include "WallabagBundle::_menu.html.twig" %}
+ {% include "WallabagCoreBundle::_menu.html.twig" %}
{% endblock %}
{% block content %}
{# {% 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 %} #}
{% 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 %}
{% 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 %}
- {% if export_epub %}<li><a href="./?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
- {% if export_mobi %}<li><a href="./?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
- {% if export_pdf %}<li><a href="./?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
+ {% if export_epub %}<li><a href="?epub&method=id&value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
+ {% if export_mobi %}<li><a href="?mobi&method=id&value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
+ {% if export_pdf %}<li><a href="?pdf&method=id&value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
<li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&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>
</ul>
</div>
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
{% block menu %}
- {% include "WallabagBundle::_menu.html.twig" %}
+ {% include "WallabagCoreBundle::_menu.html.twig" %}
{% endblock %}
{% block content %}
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}About{% endtrans %}{% endblock %}
{% block menu %}
-{% include "WallabagBundle::_menu.html.twig" %}
+{% include "WallabagCoreBundle::_menu.html.twig" %}
{% endblock %}
{% block content %}
<h2>{% trans %}About wallabag{% endtrans %}</h2>
<li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
<li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
<li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
- <li><a href="./?view=tags">{% trans %}tags{% endtrans %}</a></li>
+ <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
<li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
<li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
- {% include "WallabagBundle::_search_form.html.twig" %}
+ {% include "WallabagCoreBundle::_search_form.html.twig" %}
</li>
- <li><a href="./?view=config">{% trans %}config{% endtrans %}</a></li>
+ <li><a href="?view=config">{% trans %}config{% endtrans %}</a></li>
<li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
- <li><a class="icon icon-power" href="./?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+ <li><a class="icon icon-power" href="?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>
<meta http-equiv="X-UA-Compatible" content="IE=10">
<![endif]-->
<title>{% block title %}{% endblock %} - wallabag</title>
- {% include "WallabagBundle::_head.html.twig" %}
- {% include "WallabagBundle::_bookmarklet.html.twig" %}
+ {% include "WallabagCoreBundle::_head.html.twig" %}
+ {% include "WallabagCoreBundle::_bookmarklet.html.twig" %}
</head>
<body>
-{% include "WallabagBundle::_top.html.twig" %}
+{% include "WallabagCoreBundle::_top.html.twig" %}
<div id="main">
{% block menu %}{% endblock %}
{% block precontent %}{% endblock %}
{% block content %}{% endblock %}
</div>
</div>
-{% include "WallabagBundle::_footer.html.twig" %}
+{% include "WallabagCoreBundle::_footer.html.twig" %}
</body>
</html>
\ No newline at end of file
<?php
-namespace WallabagBundle\Tests\Controller;
+namespace Wallabag\CoreBundle\Tests\Controller;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
<?php
-namespace WallabagBundle\Twig\Extension;
+namespace Wallabag\CoreBundle\Twig\Extension;
class WallabagExtension extends \Twig_Extension
{
--- /dev/null
+<?php
+
+namespace Wallabag\CoreBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class WallabagCoreBundle extends Bundle
+{
+}
namespace Wallabag\Wallabag;
use \PDO;
-use WallabagBundle\Entity;
+use CoreBundle\Entity;
class Database {
+++ /dev/null
-_wllbg:
- resource: "@WallabagBundle/Controller/EntryController.php"
- type: annotation
+++ /dev/null
-<?php
-
-namespace WallabagBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class WallabagBundle extends Bundle
-{
-}
projects / github / wallabag / wallabag.git / commitdiff
