mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-18 05:36:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1471 from wallabag/v2-bookmarklet

Browse source 
implement bookmarklet
This commit is contained in:
Jeremy Benoist 2015-10-08 13:43:53 +02:00
commit 9dbcf9d418
6 changed files with 65 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -14,6 +14,23 @@ use Pagerfanta\Pagerfanta;
class EntryController extends Controller
{
/**
* @param Entry $entry
*/
private function updateEntry(Entry $entry)
{
try {
$entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
} catch (\Exception $e) {
return false;
}
return true;
}
/**
* @param Request $request
*
@ -30,12 +47,7 @@ class EntryController extends Controller
$form->handleRequest($request);
if ($form->isValid()) {
$entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
$this->updateEntry($entry);
$this->get('session')->getFlashBag()->add(
'notice',
'Entry saved'
@ -49,6 +61,22 @@ class EntryController extends Controller
));
}
/**
* @param Request $request
*
* @Route("/bookmarklet", name="bookmarklet")
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function addEntryViaBookmarklet(Request $request)
{
$entry = new Entry($this->getUser());
$entry->setUrl($request->get('url'));
$this->updateEntry($entry);
return $this->redirect($this->generateUrl('homepage'));
}
/**
* @param Request $request
*

1
src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig Normal file
View file

@ -0,0 +1 @@
<a id="bookmarklet" ondragend="this.click();" href="javascript:var url=location.href||url;var wllbg=window.open('{{ url('bookmarklet') }}?url=' + encodeURI(url),'_blank');wllbg.close();void(0);">{% trans %}bag it!{% endtrans %}</a>

4
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig
View file

@ -22,7 +22,7 @@
</ul>
<h3>{% trans %}Bookmarklet{% endtrans %}</h3>
<p>
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %}
</p>
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
{% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
{% endblock %}

1
src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
View file

@ -51,6 +51,7 @@
</div>
</li>
<li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
<li><a href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
<li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
<li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>

3
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
View file

@ -42,7 +42,8 @@
<div id="set4" class="col s12">
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %}
{% trans %}Drag &amp; drop this link to your bookmarks bar:{% endtrans %}
{% include 'WallabagCoreBundle::_bookmarklet.html.twig' %}
</div>
</div>

25
src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
View file

@ -31,6 +31,31 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertCount(1, $crawler->filter('button[type=submit]'));
}
public function testPostNewViaBookmarklet()
{
$this->logInAs('admin');
$client = $this->getClient();
$crawler = $client->request('GET', '/');
$this->assertCount(4, $crawler->filter('div[class=entry]'));
// Good URL
$crawler = $client->request('GET', '/bookmarklet', array('url' => $this->url));
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$crawler = $client->followRedirect();
$crawler = $client->request('GET', '/');
$this->assertCount(5, $crawler->filter('div[class=entry]'));
$em = $client->getContainer()
->get('doctrine.orm.entity_manager');
$entry = $em
->getRepository('WallabagCoreBundle:Entry')
->findOneByUrl($this->url);
$em->remove($entry);
$em->flush();
}
public function testPostNewEmpty()
{
$this->logInAs('admin');