new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
new Nelmio\CorsBundle\NelmioCorsBundle(),
new Liip\ThemeBundle\LiipThemeBundle(),
- new Wallabag\CoreBundle\WallabagCoreBundle(),
- new Wallabag\ApiBundle\WallabagApiBundle(),
new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
- new Wallabag\UserBundle\WallabagUserBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
- new Wallabag\ImportBundle\WallabagImportBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Craue\ConfigBundle\CraueConfigBundle(),
new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
+ new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+
+ // wallabag bundles
+ new Wallabag\CoreBundle\WallabagCoreBundle(),
+ new Wallabag\ApiBundle\WallabagApiBundle(),
+ new Wallabag\UserBundle\WallabagUserBundle(),
+ new Wallabag\ImportBundle\WallabagImportBundle(),
new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
];
"craue/config-bundle": "~1.4",
"mnapoli/piwik-twig-extension": "^1.0",
"lexik/maintenance-bundle": "~2.1",
- "ocramius/proxy-manager": "1.*"
+ "ocramius/proxy-manager": "1.*",
+ "white-october/pagerfanta-bundle": "^1.0"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~2.2",
namespace Wallabag\CoreBundle\Controller;
use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Exception\OutOfRangeCurrentPageException;
use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
$entries = new Pagerfanta($pagerAdapter);
$entries->setMaxPerPage($this->getUser()->getConfig()->getItemsPerPage());
- try {
- $entries->setCurrentPage($page);
- } catch (OutOfRangeCurrentPageException $e) {
- if ($page > 1) {
- return $this->redirect($this->generateUrl($type, array('page' => $entries->getNbPages())), 302);
- }
- }
+ $entries->setCurrentPage($page);
return $this->render(
'WallabagCoreBundle:Entry:entries.html.twig',
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- "@security.token_storage"
- - %wallabag_core.theme%
+ - "%wallabag_core.theme%"
# custom form type
wallabag_core.form.type.config:
class: Wallabag\CoreBundle\Form\Type\ConfigType
arguments:
- - %liip_theme.themes%
- - %wallabag_core.languages%
+ - "%liip_theme.themes%"
+ - "%wallabag_core.languages%"
tags:
- { name: form.type }
wallabag_core.table_prefix_subscriber:
class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber
arguments:
- - %database_table_prefix%
+ - "%database_table_prefix%"
tags:
- { name: doctrine.event_subscriber }
class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
arguments:
- "@doctrine.orm.entity_manager"
- - %wallabag_core.theme%
- - %wallabag_core.items_on_page%
- - %wallabag_core.rss_limit%
- - %wallabag_core.language%
+ - "%wallabag_core.theme%"
+ - "%wallabag_core.items_on_page%"
+ - "%wallabag_core.rss_limit%"
+ - "%wallabag_core.language%"
tags:
- { name: kernel.event_subscriber }
class: Wallabag\CoreBundle\Operator\Doctrine\Matches
tags:
- { name: rulerz.operator, executor: rulerz.executor.doctrine, operator: matches, inline: true }
+
+ pagerfanta.view.wallabag_view:
+ class: Pagerfanta\View\OptionableView
+ arguments:
+ - "@pagerfanta.view.twitter_bootstrap"
+ - { proximity: 1 }
+ public: false
+ tags: [{ name: pagerfanta.view, alias: wallabag_view }]
width: 50%;
}
-.pagination {
+div.pagination ul {
text-align: right;
margin-bottom:50px;
}
color: #999;
}
-.pagination > * {
+div.pagination ul > * {
display: inline-block;
margin-left: 0.5em;
}
-.pagination a {
+div.pagination ul a {
color: #999;
text-decoration: none;
}
- .pagination a:hover, .pagination a:focus {
+div.pagination ul a:hover, div.pagination ul a:focus {
text-decoration: underline;
- }
+}
-.pagination .disabled {
+div.pagination ul .disabled {
display: none;
}
-.pagination .current {
+div.pagination ul .current {
height: 25px;
padding: 4px 8px;
border: 1px solid #d5d5d5;
margin-bottom: 0;
}
+.pagination {
+ float: right;
+}
+
+.pagination ul {
+ margin: 0 !important;
+}
+
.pagination li {
padding: 0;
}
display: block;
}
+.pagination li.active span {
+ padding: 0px 10px;
+ height: 30px;
+ display: block;
+ color: #fff;
+}
+
.page-footer .footer-copyright p {
display: inline;
}
<div class="results">
<div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
<div class="pagination">
- <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
- {% if entries is not empty %}
- –
- {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
- <li>
- <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}" class="{{ currentPage == p ? 'current':''}}" >{{ p }}</a>
- </li>
- {% endfor %}
- {% endif %}
- </div>
+ <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a>
+ {{ pagerfanta(entries, 'wallabag_view') }}
+ </div>
</div>
{% endblock %}
<div class="nb-results left">
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
</div>
- <ul class="pagination right">
- {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %}
- <li class="{{ currentPage == p ? 'active':'waves-effect'}}">
- <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}">{{ p }}</a>
- </li>
- {% endfor %}
- </ul>
+ {{ pagerfanta(entries, 'wallabag_view') }}
</div>
{% endblock %}
<br />
$client->request('GET', '/all/list/900');
- $this->assertEquals(302, $client->getResponse()->getStatusCode());
- $this->assertEquals('/all/list', $client->getResponse()->getTargetUrl());
+ $this->assertEquals(404, $client->getResponse()->getStatusCode());
}
/**
projects / github / wallabag / wallabag.git / commitdiff
