Merge pull request #1292 from wallabag/v2-tags-route

Add tags list display

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 49714d0249cb9330e119bdf896212ed14b700bef..29e0ffb0d9e37c1882ad8f5873c047434d8914e2 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -99,6 +99,7 @@ class EntryController extends Controller
             ->getRepository('WallabagCoreBundle:Entry')
             ->findUnreadByUser($this->getUser()->getId());
 
+        $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
         $entries->setCurrentPage($page);
 
         return $this->render(
@@ -123,6 +124,7 @@ class EntryController extends Controller
             ->getRepository('WallabagCoreBundle:Entry')
             ->findArchiveByUser($this->getUser()->getId());
 
+        $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
         $entries->setCurrentPage($page);
 
         return $this->render(
@@ -147,6 +149,7 @@ class EntryController extends Controller
             ->getRepository('WallabagCoreBundle:Entry')
             ->findStarredByUser($this->getUser()->getId());
 
+        $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
         $entries->setCurrentPage($page);
 
         return $this->render(

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index 5f8363ca92ea79d1a16d7ec3d26dcf112697caa7..7070a399349f4b1f44d01901d1099dbf5c9b0baf 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@ -63,7 +63,7 @@
                     <ul id="slide-out" class="side-nav fixed">
                         {% block logo %}
                             <li class="logo border-bottom">
-                                <a class="waves-effect" href="{{ path('unread') }}">
+                                <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
                                     <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
                                 </a>
                             </li>
@@ -72,7 +72,7 @@
                         {% set currentRoute = app.request.attributes.get('_route') %}
 
                         <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
-                        <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+                        <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
                         <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
                         <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
                         <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>

diff --git a/src/Wallabag/CoreBundle/Service/Extractor.php b/src/Wallabag/CoreBundle/Service/Extractor.php
index 6d43a1da5c3e522e446ade423cf315fc5092e910..961ac20ad7ab3c779f2bd836ae684fd40034c41a 100644 (file)
--- a/src/Wallabag/CoreBundle/Service/Extractor.php
+++ b/src/Wallabag/CoreBundle/Service/Extractor.php
@@ -10,7 +10,7 @@ final class Extractor
     public static function extract($url)
     {
         $pageContent = self::getPageContent(new Url(base64_encode($url)));
-        $title = $pageContent['rss']['channel']['item']['title'] ?: 'Untitled';
+        $title = $pageContent['rss']['channel']['item']['title'] ?: parse_url($url, PHP_URL_HOST);
         $body = $pageContent['rss']['channel']['item']['description'];
 
         $content = new Content();