Feature/templates

bin/release

@@ -413,7 +413,6 @@ def add_libs(rel_name, galette_archive):
         '.gitignore',
         '.php-cs-fixer.dist.php',
         '.phpcs.xml',
-        'calendar.js',
         'package-lock.json',
         'package.json',
         'phpstan.neon',
@@ -424,7 +423,7 @@ def add_libs(rel_name, galette_archive):
         if os.path.exists(target):
             os.remove(target)
 
-    for todrop in ['.github', 'bin', 'node_modules', 'tests']:
+    for todrop in ['.github', 'bin', 'js', 'node_modules', 'tests']:
         target = os.path.join(npm_dir, todrop)
         if os.path.exists(target):
             shutil.rmtree(target)

calendar.js → js/calendar.js

@@ -17,49 +17,39 @@ import 'fullcalendar/themes/classic/palette.css';
 
 $(function() {
   var calendarEl = document.getElementById('calendar');
+  var options = JSON.parse(document.getElementById('calendar_options').textContent);
+  //modal is written in the page, only its content changes
+  var $modal = $('#calendar_event');
+  var $edit = $modal.find('[data-action="edit"]');
+  var $booking = $modal.find('[data-action="booking"]');
 
   var calendar = new Calendar(calendarEl, {
     plugins: [ themePlugin, interactionPlugin, dayGridPlugin, listPlugin ],
-    views: _fullcalendar_views,
+    buttons: options.buttons,
     headerToolbar: {
       left: 'title',
       right: 'dayGridMonth,listDay,listWeek,listMonth prevYear,prev,today,next,nextYear'
     },
     height: 'auto',
     locales: allLocales,
-    locale: _fullcalendar_locale,
+    locale: options.locale,
     weekNumbers: true,
-    events: _calendar_dataurl,
+    events: options.dataurl,
     selectable: true,
     eventClick: function(info) {
-      var _infos = JSON.parse(JSON.stringify(info.event.extendedProps));
-      _infos.url = _calendar_event_url.replace('PLACEBO', _infos.id_event);
-      _infos.booking = _calendar_booking_url.replace('PLACEBO', _infos.id_event);
-      var _actions = [];
-      if (_infos.can_edit) {
-        _actions.push(_edit_action);
-      }
-      _actions.push(Object.assign({}, _booking_action, {
-        click: function() {
-          window.location.href = _infos.booking;
-        }
-      }));
-      _actions.push(_close_action);
+      var infos = info.event.extendedProps;
       //description is built and escaped server side, other values must be displayed as text
-      var _elt = $('<div class="ui tiny modal"><div class="header"></div><div class="content"></div></div>');
-      _elt.find('.header').text(_infos.name + ' (' + _infos.begin_date_fmt + ' - ' + _infos.end_date_fmt + ')');
-      _elt.find('.content').html(_infos.description);
-      _elt.appendTo('body');
-      _elt.modal({
-        onApprove: function() {
-          window.location.href = _infos.url;
-        },
-        actions: _actions
-      }).modal('show');
+      $modal.find('.header').text(infos.name + ' (' + infos.begin_date_fmt + ' - ' + infos.end_date_fmt + ')');
+      $modal.find('.content').html(infos.description);
+      //links are given with the event, edit one only when current user can edit it
+      $edit
+        .attr('href', infos.edit_url || '#')
+        .toggleClass('displaynone', !infos.edit_url);
+      $booking.attr('href', infos.booking_url);
+      $modal.modal('show');
     },
     eventMouseEnter: function(info) {
-      var _el = $(info.el);
-      _el.popup({
+      $(info.el).popup({
         exclusive: true,
         hoverable: true,
         variation: 'basic',
@@ -70,4 +60,3 @@ $(function() {
 
   calendar.render();
 });
-

lang/events.pot

@@ -555,7 +555,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_ar.utf8.po

@@ -535,7 +535,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_br.utf8.po

@@ -533,7 +533,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_ca.utf8.po

@@ -526,7 +526,7 @@ msgstr "No pagat"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_de_DE.utf8.po

@@ -535,8 +535,8 @@ msgstr "Nicht bezahlt"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Gesamtzahl der gefundenen Buchungen: %f"
+msgid "Found bookings total %1$s"
+msgstr "Gesamtzahl der gefundenen Buchungen: %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_en_US.po

@@ -583,8 +583,8 @@ msgstr "Not paid"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Found bookings total %f"
+msgid "Found bookings total %1$s"
+msgstr "Found bookings total %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_es.utf8.po

@@ -539,8 +539,8 @@ msgstr "No pagado"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Se encontraron un total de %f reservas"
+msgid "Found bookings total %1$s"
+msgstr "Se encontraron un total de %1$s reservas"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_fr_FR.utf8.po

@@ -531,8 +531,8 @@ msgstr "Non payée"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Total des réservations trouvées : %f"
+msgid "Found bookings total %1$s"
+msgstr "Total des réservations trouvées : %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_it_IT.utf8.po

@@ -530,8 +530,8 @@ msgstr "Non pagato"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Totale prenotazioni trovate %f"
+msgid "Found bookings total %1$s"
+msgstr "Totale prenotazioni trovate %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_nb_NO.utf8.po

@@ -523,7 +523,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_oc.utf8.po

@@ -527,7 +527,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_ota.utf8.po

@@ -523,7 +523,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_pt.utf8.po

@@ -534,8 +534,8 @@ msgstr "Não pago"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Reservas encontradas totalizam %f"
+msgid "Found bookings total %1$s"
+msgstr "Reservas encontradas totalizam %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_pt_BR.utf8.po

@@ -531,8 +531,8 @@ msgstr "Não pago"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Reservas encontradas totalizam %f"
+msgid "Found bookings total %1$s"
+msgstr "Reservas encontradas totalizam %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_ru.utf8.po

@@ -538,8 +538,8 @@ msgstr "Не оплачено"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Всего найдено броней %f"
+msgid "Found bookings total %1$s"
+msgstr "Всего найдено броней %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_si.utf8.po

@@ -523,7 +523,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_sl.utf8.po

@@ -533,8 +533,8 @@ msgstr "Ni plačano"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Skupaj najdenih rezervacij %f"
+msgid "Found bookings total %1$s"
+msgstr "Skupaj najdenih rezervacij %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_ta.utf8.po

@@ -532,8 +532,8 @@ msgstr "செலுத்தப்படவில்லை"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "முன்பதிவு மொத்தம் %f"
+msgid "Found bookings total %1$s"
+msgstr "முன்பதிவு மொத்தம் %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lang/events_tr.utf8.po

@@ -526,7 +526,7 @@ msgstr ""
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
+msgid "Found bookings total %1$s"
 msgstr ""
 
 #: ../templates/default/bookings.html.twig:192

lang/events_uk.utf8.po

@@ -540,8 +540,8 @@ msgstr "Не оплачено"
 
 #: ../templates/default/bookings.html.twig:147
 #, php-format
-msgid "Found bookings total %f"
-msgstr "Загалом бронювань знайдено: %f"
+msgid "Found bookings total %1$s"
+msgstr "Загалом бронювань знайдено: %1$s"
 
 #: ../templates/default/bookings.html.twig:192
 msgid "Edit booking"

lib/GaletteEvents/Controllers/Crud/ActivitiesController.php

@@ -150,7 +150,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
             $response,
             $this->getTemplate('activity'),
             [
-                'autocomplete'  => true,
                 'page_title'    => $title,
                 'activity'      => $activity,
                 // pseudo random int

lib/GaletteEvents/Controllers/Crud/BookingsController.php

@@ -388,7 +388,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
                 'filters'   => $m->getFilters(),
                 'count'     => $m->getCount()
             ];
-            $route_params['autocomplete'] = true;
 
             //check if current attached member is part of the list
             if (
@@ -412,7 +411,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
             array_merge(
                 $route_params,
                 [
-                    'autocomplete'      => true,
                     'page_title'        => $title,
                     'booking'           => $booking,
                     'events'            => $events->getList(true),

lib/GaletteEvents/Controllers/Crud/EventsController.php

@@ -10,6 +10,7 @@
 
 namespace GaletteEvents\Controllers\Crud;
 
+use ArrayObject;
 use Galette\Repository\Groups;
 use Galette\Core\Pagination;
 use GaletteEvents\Filters\EventsList;
@@ -168,8 +169,21 @@ public function ajaxCalendar(Request $request, Response $response): Response
         $filters->end_date_filter = date(__("Y-m-d"), $end);
 
         $events = new Events($this->zdb, $this->login, $this->history, $this->preferences, $filters);
+        $list = $events->getList(false, true);
 
-        return $this->withJson($response, $events->getList(false, true));
+        //links of the event modal
+        foreach ($list as $row) {
+            if (!$row instanceof ArrayObject) {
+                continue;
+            }
+            $id = (string)$row[Event::PK];
+            if ($row['can_edit']) {
+                $row['edit_url'] = $this->routeparser->urlFor('events_event_edit', ['id' => $id]);
+            }
+            $row['booking_url'] = $this->routeparser->urlFor('events_booking_add') . '?event=' . $id;
+        }
+
+        return $this->withJson($response, $list);
     }
 
     // /CRUD - Read
@@ -223,7 +237,6 @@ public function edit(Request $request, Response $response, ?int $id = null, stri
             $response,
             $this->getTemplate('event'),
             [
-                'autocomplete'      => true,
                 'page_title'        => $title,
                 'event'             => $event,
                 'require_calendar'  => true,

templates/default/activities.html.twig

@@ -73,7 +73,7 @@
             <td class="collapsing" data-col-label="{{ _T("Creation date", "events") }}">{{ activity.getCreationDate()|date(_T("Y-m-d")) }}</td>
             <td class="collapsing" data-col-label="{{ _T("Events", "events") }}">{{ activity.countEvents() }}</td>
             <td class="center id_row collapsing" data-col-label="{{ _T("Is active", "events") }}">
-                <i class="toggle {% if activity.isActive() %}on{% else %}off{% endif %} icon tooltip" data-html="{% if activity.isActive() %}{{ _T("Active", "events") }}{% else %}{{ _T("Inactive", "events") }}{% endif %}"></i>
+                <i class="toggle {% if activity.isActive() %}on{% else %}off{% endif %} icon tooltip" data-html="{% if activity.isActive() %}{{ _T("Active", "events") }}{% else %}{{ _T("Inactive", "events") }}{% endif %}" aria-hidden="true"></i>
                 <span class="visually-hidden">
                 {% if activity.isActive() %}
                     {{ _T("Active", "events") }}