aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Service/Extractor.php2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 49714d02..29e0ffb0 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -99,6 +99,7 @@ class EntryController extends Controller
99 ->getRepository('WallabagCoreBundle:Entry') 99 ->getRepository('WallabagCoreBundle:Entry')
100 ->findUnreadByUser($this->getUser()->getId()); 100 ->findUnreadByUser($this->getUser()->getId());
101 101
102 $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
102 $entries->setCurrentPage($page); 103 $entries->setCurrentPage($page);
103 104
104 return $this->render( 105 return $this->render(
@@ -123,6 +124,7 @@ class EntryController extends Controller
123 ->getRepository('WallabagCoreBundle:Entry') 124 ->getRepository('WallabagCoreBundle:Entry')
124 ->findArchiveByUser($this->getUser()->getId()); 125 ->findArchiveByUser($this->getUser()->getId());
125 126
127 $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
126 $entries->setCurrentPage($page); 128 $entries->setCurrentPage($page);
127 129
128 return $this->render( 130 return $this->render(
@@ -147,6 +149,7 @@ class EntryController extends Controller
147 ->getRepository('WallabagCoreBundle:Entry') 149 ->getRepository('WallabagCoreBundle:Entry')
148 ->findStarredByUser($this->getUser()->getId()); 150 ->findStarredByUser($this->getUser()->getId());
149 151
152 $entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
150 $entries->setCurrentPage($page); 153 $entries->setCurrentPage($page);
151 154
152 return $this->render( 155 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 5f8363ca..7070a399 100644
--- 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 @@
63 <ul id="slide-out" class="side-nav fixed"> 63 <ul id="slide-out" class="side-nav fixed">
64 {% block logo %} 64 {% block logo %}
65 <li class="logo border-bottom"> 65 <li class="logo border-bottom">
66 <a class="waves-effect" href="{{ path('unread') }}"> 66 <a class="waves-effect" title="{% trans %}Back to unread articles{% endtrans %}" href="{{ path('unread') }}">
67 <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" /> 67 <img src="{{ asset('themes/baggy/img/logo-other_themes.png') }}" alt="wallabag logo" />
68 </a> 68 </a>
69 </li> 69 </li>
@@ -72,7 +72,7 @@
72 {% set currentRoute = app.request.attributes.get('_route') %} 72 {% set currentRoute = app.request.attributes.get('_route') %}
73 73
74 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 74 <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
75 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> 75 <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
76 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li> 76 <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
77 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> 77 <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
78 <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li> 78 <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 6d43a1da..961ac20a 100644
--- a/src/Wallabag/CoreBundle/Service/Extractor.php
+++ b/src/Wallabag/CoreBundle/Service/Extractor.php
@@ -10,7 +10,7 @@ final class Extractor
10 public static function extract($url) 10 public static function extract($url)
11 { 11 {
12 $pageContent = self::getPageContent(new Url(base64_encode($url))); 12 $pageContent = self::getPageContent(new Url(base64_encode($url)));
13 $title = $pageContent['rss']['channel']['item']['title'] ?: 'Untitled'; 13 $title = $pageContent['rss']['channel']['item']['title'] ?: parse_url($url, PHP_URL_HOST);
14 $body = $pageContent['rss']['channel']['item']['description']; 14 $body = $pageContent['rss']['channel']['item']['description'];
15 15
16 $content = new Content(); 16 $content = new Content();