aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-06 09:16:52 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-06 09:16:52 +0200
commitfdef5f460524215d806e244e5546865f4b8e01df (patch)
tree08c697d0a53e5ded2d26a16b512b814831edcc84 /src
parent794dc4ee8adeabb6cf4fa19604b709a53733400e (diff)
parent784bb4c38d4665294108d7de39c85208a6d76001 (diff)
downloadwallabag-fdef5f460524215d806e244e5546865f4b8e01df.tar.gz
wallabag-fdef5f460524215d806e244e5546865f4b8e01df.tar.zst
wallabag-fdef5f460524215d806e244e5546865f4b8e01df.zip
Merge pull request #1461 from wallabag/v2-test-for-www
fix #1433: add test for removeWww Twig Extension
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php17
3 files changed, 21 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index f58d0399..b3f47098 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -1,12 +1,12 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
4 4
5{% block content %} 5{% block content %}
6 <div id="article_toolbar"> 6 <div id="article_toolbar">
7 <ul class="links"> 7 <ul class="links">
8 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li> 8 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
9 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName }}</span></a></li> 9 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
10 <li><a title="{% trans %}Mark as read{% endtrans %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle mark as read{% endtrans %}</span></a></li> 10 <li><a title="{% trans %}Mark as read{% endtrans %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle mark as read{% endtrans %}</span></a></li>
11 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li> 11 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
12 <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li> 12 <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 9fb820b4..7230506c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
4 4
5{% block menu %} 5{% block menu %}
6 <div class="progress"> 6 <div class="progress">
@@ -144,7 +144,7 @@ main {
144 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1> 144 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1>
145 </header> 145 </header>
146 <aside> 146 <aside>
147 <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName }}</span></a> 147 <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a>
148 <div id="list"> 148 <div id="list">
149 {% for tag in entry.tags %} 149 {% for tag in entry.tags %}
150 <div class="chip"> 150 <div class="chip">
diff --git a/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php b/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
new file mode 100644
index 00000000..4945e9a9
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Tests/Twig/WallabagExtensionTest.php
@@ -0,0 +1,17 @@
1<?php
2
3namespace Wallabag\CoreBundle\Tests\Twig;
4
5use Wallabag\CoreBundle\Twig\WallabagExtension;
6
7class WallabagExtensionTest extends \PHPUnit_Framework_TestCase
8{
9 public function testRemoveWww()
10 {
11 $extension = new WallabagExtension();
12
13 $this->assertEquals("lemonde.fr", $extension->removeWww('www.lemonde.fr'));
14 $this->assertEquals("lemonde.fr", $extension->removeWww('lemonde.fr'));
15 $this->assertEquals("gist.github.com", $extension->removeWww('gist.github.com'));
16 }
17}