diff --git a/lib/Alchemy/Phrasea/Controller/LightboxController.php b/lib/Alchemy/Phrasea/Controller/LightboxController.php index 7c3fdf6463..30d7c81f65 100644 --- a/lib/Alchemy/Phrasea/Controller/LightboxController.php +++ b/lib/Alchemy/Phrasea/Controller/LightboxController.php @@ -78,17 +78,39 @@ class LightboxController extends Controller { /** @var BasketElementRepository $repository */ $repository = $this->app['repo.basket-elements']; - $basketElement = $repository->findUserElement($sselcont_id, $this->getAuthenticatedUser()); + $basket = $basketElement->getBasket(); + + $elements = $basket->getElements(); + for ($i = 0; $i < count($elements); ++$i) { + if ($sselcont_id == $elements[$i]->getId()) { + $nextKey = $i + 1; + $prevKey = $i - 1; + if ($nextKey < count($elements)) { + $nextId = $elements[$nextKey]->getId(); + } + else { + $nextId = null; + } + if ($prevKey >= 0) { + $prevId = $elements[$prevKey]->getId(); + } + else { + $prevId = null; + } + } + } + if ($this->app['browser']->isMobile()) { return $this->renderResponse('lightbox/basket_element.html.twig', [ 'basket_element' => $basketElement, - 'module_name' => $basketElement->getRecord($this->app)->get_title() + 'module_name' => $basketElement->getRecord($this->app)->get_title(), + 'nextId' => $nextId, + 'prevId' => $prevId ]); } - $basket = $basketElement->getBasket(); $ret = []; $ret['number'] = $basketElement->getRecord($this->app)->getNumber(); diff --git a/resources/www/lightbox/styles/main-mobile.scss b/resources/www/lightbox/styles/main-mobile.scss index dafac5c02d..ad46473b67 100644 --- a/resources/www/lightbox/styles/main-mobile.scss +++ b/resources/www/lightbox/styles/main-mobile.scss @@ -1 +1,15 @@ -@import './jquery-mobile/jquery-validator'; \ No newline at end of file +@import './jquery-mobile/jquery-validator'; + +.nav_button { + width: 90%; + margin: 0px auto; + padding: 4px; +} + +#left-btn { + float: left; +} + +#right-btn { + float: right; +} \ No newline at end of file diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 2d2228f6c9..81950443e7 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -37,14 +37,31 @@ {% block content %} {% set record = basket_element.getRecord(app) %} -
+ + +
- Back + {{ 'Back' | trans }}

{{basket_element.getOrd()}} - {{record.get_title()}}

- Home + {{ 'Home' | trans }}
{{ thumbnail.format100percent(record.get_preview()) }} + {% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
@@ -70,4 +87,5 @@
+ {% endblock %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 2cf44ac8bc..4d8cc7cd96 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -82,7 +82,7 @@
- {{ 'Back' | trans }} + {{ 'Back' | trans }}

{{ 'Validations' | trans }}

@@ -112,7 +112,7 @@
- {{ 'Back' | trans }} + {{ 'Back' | trans }}

{{ 'Paniers' | trans }}

diff --git a/templates/mobile/lightbox/validate.html.twig b/templates/mobile/lightbox/validate.html.twig index 9988639e2a..b06c6e7728 100644 --- a/templates/mobile/lightbox/validate.html.twig +++ b/templates/mobile/lightbox/validate.html.twig @@ -26,7 +26,9 @@ {% block content %}