From 7a897b9f0c0f496fab04c1a5b3340bb02ed934a0 Mon Sep 17 00:00:00 2001
From: Patrick Barroca <pbarroca@afi-sa.fr>
Date: Fri, 19 Jun 2020 14:02:20 +0200
Subject: [PATCH] dev #111127 : drive : admin list filter display adjustments

---
 .../views/scripts/drive-checkout/list.phtml   | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/application/modules/admin/views/scripts/drive-checkout/list.phtml b/application/modules/admin/views/scripts/drive-checkout/list.phtml
index 0be82ab9742..1a6acb73cf8 100644
--- a/application/modules/admin/views/scripts/drive-checkout/list.phtml
+++ b/application/modules/admin/views/scripts/drive-checkout/list.phtml
@@ -15,30 +15,26 @@ echo $this->Button((new Class_Entity())
                                             ['style' => 'filter: invert();']))
                    ->setAttribs(['style' => 'float:right']));
 
-?>
 
-<form>
-  <?php
-  echo $this->tag('label', $this->_('Date'), ['for' => 'date', 'style' => 'margin-right: 5px']);
+$date_url = $this->url(['date' => null]) . '/date/';
+$days_url = $this->url(['days' => null]) . '/days/';
+
+echo $this
+  ->tag('form',
+        $this->tag('label', $this->_('Date'),
+                   ['for' => 'date', 'style' => 'margin-right: 5px'])
+        . $this->formDate('date',
+                          $this->date,
+                          ['onchange' => 'window.location=\'' . $date_url . '\' + this.value'])
+        . BR
+        . $this->tag('label', $this->_('Nombre de jours à afficher'),
+                     ['for' => 'days', 'style' => 'margin-right: 5px;'])
+        . $this->formNumber('days',
+                            $this->days,
+                            ['onchange' => 'window.location=\'' . $days_url . '\' + this.value',
+                             'size' => 2])
+  );
 
-  $date_url = $this->url(['date' => null]) . '/date/';
-  echo $this->formDate('date',
-                       $this->date,
-                       ['onchange' => 'window.location=\'' . $date_url . '\' + this.value']);
 
-
-  echo $this->tag('label', $this->_('Nombre de jours à afficher'),
-                  ['for' => 'days', 'style' => 'margin-right: 5px; margin-left: 10px']);
-
-  $days_url = $this->url(['days' => null]) . '/days/';
-  echo $this->formNumber('days',
-                         $this->days,
-                         ['onchange' => 'window.location=\'' . $days_url . '\' + this.value',
-                          'size' => 2]);
-  ?>
-</form>
-
-<?php
 echo $this->renderTable($this->table_description,
                         (new Class_TableDescription_Models($this->checkouts))->groupBy('day_label'));
-?>
-- 
GitLab