aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Filter/EntryFilterType.php2
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php4
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml13
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig40
-rw-r--r--src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php1
-rw-r--r--src/Wallabag/CoreBundle/Twig/WallabagExtension.php2
7 files changed, 21 insertions, 45 deletions
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index f40c1c2d..2e6d6ff7 100644
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -15,7 +15,7 @@ class EntryFilterType extends AbstractType
15 private $repository; 15 private $repository;
16 16
17 /** 17 /**
18 * Repository & user are used to get a list of language entries for this user 18 * Repository & user are used to get a list of language entries for this user.
19 * 19 *
20 * @param EntityRepository $entryRepository 20 * @param EntityRepository $entryRepository
21 * @param User $user 21 * @param User $user
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 2286317c..57bf8024 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -163,9 +163,9 @@ class EntryRepository extends EntityRepository
163 } 163 }
164 164
165 /** 165 /**
166 * Used only in test case to get the right entry associated to the right user 166 * Used only in test case to get the right entry associated to the right user.
167 * 167 *
168 * @param string $username 168 * @param string $username
169 * 169 *
170 * @return Entry 170 * @return Entry
171 */ 171 */
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 4946344d..aced4d83 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -24,6 +24,7 @@ Add a new entry: 'Sauvegarder un nouvel article'
24Search: 'Rechercher' 24Search: 'Rechercher'
25Filter entries: 'Filtrer les articles' 25Filter entries: 'Filtrer les articles'
26Enter your search here: 'Saisissez votre terme de recherche' 26Enter your search here: 'Saisissez votre terme de recherche'
27Save new entry: 'Sauvegarder un nouvel article'
27 28
28# Config screen 29# Config screen
29Settings: 'Paramètres' 30Settings: 'Paramètres'
@@ -115,3 +116,15 @@ Entry unstarred: "Article retiré des favoris"
115Entry archived: "Article marqué comme lu" 116Entry archived: "Article marqué comme lu"
116Entry unarchived: "Article marqué comme non lu" 117Entry unarchived: "Article marqué comme non lu"
117Entry deleted: "Article supprimé" 118Entry deleted: "Article supprimé"
119
120# Entry
121Mark as read: 'Marquer comme lu'
122Favorite: 'Mettre en favori'
123back: 'Retour'
124original article: 'Article original'
125Add a tag: 'Ajouter un tag'
126Share: 'Partager'
127Download: 'Télécharger'
128Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
129Problems?: 'Un problème ?'
130Edit title: "Modifier le titre"
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 3b4c7053..d3cef895 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
@@ -54,7 +54,7 @@
54 <li class="bold hide-on-med-and-down"> 54 <li class="bold hide-on-med-and-down">
55 <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead"> 55 <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
56 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i> 56 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
57 <span>{% trans %}Toggle mark as read{% endtrans %}</span> 57 <span>{% trans %}Mark as read{% endtrans %}</span>
58 </a> 58 </a>
59 <div class="collapsible-body"></div> 59 <div class="collapsible-body"></div>
60 </li> 60 </li>
@@ -62,7 +62,7 @@
62 <li class="bold hide-on-med-and-down"> 62 <li class="bold hide-on-med-and-down">
63 <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav"> 63 <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
64 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i> 64 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
65 <span>{% trans %}Toggle favorite{% endtrans %}</span> 65 <span>{% trans %}Favorite{% endtrans %}</span>
66 </a> 66 </a>
67 <div class="collapsible-body"></div> 67 <div class="collapsible-body"></div>
68 </li> 68 </li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 7614fcd3..22d00a1e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -42,10 +42,11 @@
42 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 42 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
43 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li> 43 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
44 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> 44 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
45 <li class="bold {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li> 45 <li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
46 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> 46 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
47 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> 47 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
48 <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li> 48 <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
49 <li class="bold border-bottom {% if currentRoute == 'about' %}active{% endif %}"><a class="waves-effect" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a></li>
49 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li> 50 <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
50 </ul> 51 </ul>
51 <div class="nav-wrapper nav-panels"> 52 <div class="nav-wrapper nav-panels">
@@ -76,40 +77,3 @@
76 </div> 77 </div>
77 </nav> 78 </nav>
78{% endblock %} 79{% endblock %}
79
80{% block footer %}
81 <footer class="page-footer cyan darken-2">
82 <div class="container">
83 <div class="row">
84 <div class="col l6 s12">
85 <h5 class="white-text">{% trans %}Take wallabag with you{% endtrans %}</h5>
86 <p class="grey-text text-lighten-4">
87 {% trans %}We are available at{% endtrans %}
88 <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">android</a> (<a target="_blank" class="grey-text text-lighten-3" href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.InThePoche">f-droid</a>)
89 {% trans %}and{% endtrans %}
90 <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015">iOS</a>.<br>
91 {% trans %}Install add-ons for{% endtrans %}
92 <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/">firefox</a>
93 {% trans %}and{% endtrans %}
94 <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm">chrome</a>.
95 </p>
96 </div>
97 <div class="col l4 offset-l2 s12">
98 <h5 class="white-text">{% trans %}Social{% endtrans %}</h5>
99 <ul>
100 <li><a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp">twitter</a></li>
101 <li><a target="_blank" class="grey-text text-lighten-3" href="https://framasphere.org/u/wallabag">diaspora*</a></li>
102 <li><a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts">Google+</a></li>
103 <li><a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag">Facebook</a></li>
104 </ul>
105 </div>
106 </div>
107 </div>
108 <div class="footer-copyright">
109 <div class="container">
110 <p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
111 <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
112 </div>
113 </div>
114 </footer>
115{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
index e9c85a17..2862417e 100644
--- a/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
@@ -3,7 +3,6 @@
3namespace Wallabag\CoreBundle\Tests\Controller; 3namespace Wallabag\CoreBundle\Tests\Controller;
4 4
5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; 5use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
6use Doctrine\ORM\AbstractQuery;
7 6
8class EntryControllerTest extends WallabagCoreTestCase 7class EntryControllerTest extends WallabagCoreTestCase
9{ 8{
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
index f8328860..6b860c96 100644
--- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
@@ -13,7 +13,7 @@ class WallabagExtension extends \Twig_Extension
13 13
14 public function removeWww($url) 14 public function removeWww($url)
15 { 15 {
16 return preg_replace('/^www\./i', '',$url); 16 return preg_replace('/^www\./i', '', $url);
17 } 17 }
18 18
19 public function getName() 19 public function getName()