(feat) icalendar links

Author: gnepud

app/frontend/src/javascript/controllers/admin/calendar.js

@@ -306,6 +306,59 @@ Application.Controllers.controller('AdminCalendarController', ['$scope', '$state
      * Setup the feature-tour for the admin/calendar page.
      * This is intended as a contextual help (when pressing F1)
      */
+    /**
+     * Open the iCal links modal
+     */
+    $scope.openICalLinksModal = function () {
+      const modalInstance = $uibModal.open({
+        animation: true,
+        templateUrl: '/calendar/ical_links.html',
+        size: 'md',
+        controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
+          $scope.icalLinks = [];
+          if (Fablab.machinesModule) {
+            $scope.icalLinks.push({
+              type: 'Machine',
+              name: _t('app.admin.calendar.machine_reservations'),
+              url: `webcal://${window.location.host}/ical/reservations/machine`
+            });
+          }
+          if (Fablab.trainingsModule) {
+            $scope.icalLinks.push({
+              type: 'Training',
+              name: _t('app.admin.calendar.training_reservations'),
+              url: `webcal://${window.location.host}/ical/availabilities/training`
+            });
+          }
+          if (Fablab.spacesModule) {
+            $scope.icalLinks.push({
+              type: 'Space',
+              name: _t('app.admin.calendar.space_reservations'),
+              url: `webcal://${window.location.host}/ical/availabilities/space`
+            });
+          }
+          $scope.icalLinks.push({
+            type: 'Event',
+            name: _t('app.admin.calendar.event_reservations'),
+            url: `webcal://${window.location.host}/ical/reservations/event`
+          });
+
+          $scope.copyToClipboard = function (url) {
+            navigator.clipboard.writeText(url).then(function () {
+              growl.success(_t('app.admin.calendar.link_copied'));
+            }).catch(function () {
+              growl.error(_t('app.admin.calendar.copy_failed'));
+            });
+          };
+
+          $scope.close = function () {
+            $uibModalInstance.dismiss();
+          };
+        }]
+      });
+      return modalInstance;
+    };
+
     $scope.setupCalendarTour = function () {
       // get the tour defined by the ui-tour directive
       const uitour = uiTourService.getTourByName('calendar');

app/frontend/src/javascript/controllers/calendar.js

@@ -130,56 +130,6 @@ Application.Controllers.controller('CalendarController', ['$scope', '$state', '$
       $scope.filterAvailabilities(filter, $scope);
     };
 
-    $scope.openICalLinksModal = function () {
-      const modalInstance = $uibModal.open({
-        animation: true,
-        templateUrl: '/calendar/ical_links.html',
-        size: 'md',
-        controller: ['$scope', '$uibModalInstance', function ($scope, $uibModalInstance) {
-          $scope.icalLinks = [];
-          if (Fablab.machinesModule) {
-            $scope.icalLinks.push({
-              type: 'Machine',
-              name: _t('app.shared.calendar.machine_reservations'),
-              url: `webcal://${window.location.host}/ical/reservations/machine`
-            });
-          }
-          if (Fablab.trainingsModule) {
-            $scope.icalLinks.push({
-              type: 'Training',
-              name: _t('app.shared.calendar.training_reservations'),
-              url: `webcal://${window.location.host}/ical/availabilities/training`
-            });
-          }
-          if (Fablab.spacesModule) {
-            $scope.icalLinks.push({
-              type: 'Space',
-              name: _t('app.shared.calendar.space_reservations'),
-              url: `webcal://${window.location.host}/ical/availabilities/space`
-            });
-          }
-          $scope.icalLinks.push({
-            type: 'Event',
-            name: _t('app.shared.calendar.event_reservations'),
-            url: `webcal://${window.location.host}/ical/reservations/event`
-          });
-
-          $scope.copyToClipboard = function (url) {
-            navigator.clipboard.writeText(url).then(function () {
-              growl.success(_t('app.shared.calendar.link_copied'));
-            }).catch(function () {
-              growl.error(_t('app.shared.calendar.copy_failed'));
-            });
-          };
-
-          $scope.close = function () {
-            $uibModalInstance.dismiss();
-          };
-        }]
-      });
-      return modalInstance;
-    };
-
     $scope.openFilterAside = () =>
       $aside.open({
         templateUrl: '/calendar/filterAside.html',

app/frontend/templates/admin/calendar/calendar.html

@@ -54,6 +54,9 @@ <h4 translate>{{ 'app.admin.calendar.legend' }}</h4>
         </a>
         <iframe name="export-frame" height="0" width="0" class="none"></iframe>
       </div>
+      <button type="button" class="btn btn-default m-l" ng-click="openICalLinksModal()">
+        <span class="fas fa-calendar-alt"></span> {{ 'app.admin.calendar.ical_links' | translate }}
+      </button>
       <button type="button" class="btn btn-default m-l" ng-click="openFilterAside()">
         <span class="fa fa-filter"></span> {{ 'app.shared.calendar.filter_calendar' | translate }}
       </button>

app/frontend/templates/calendar/calendar.html

@@ -21,9 +21,6 @@ <h1 translate>{{ 'app.public.calendar.calendar' }}</h1>
           <span ng-if="autoRefresh">{{ 'app.shared.calendar.auto_refresh_on' | translate }}</span>
           <span ng-if="!autoRefresh">{{ 'app.shared.calendar.auto_refresh_off' | translate }}</span>
         </button>
-        <button type="button" class="btn btn-default m-t m-b m-r-sm" ng-click="openICalLinksModal()">
-          <span class="fas fa-calendar-alt"></span> {{ 'app.shared.calendar.ical_links' | translate }}
-        </button>
         <button type="button" class="btn btn-default m-t m-b" ng-click="triggerOnlyCalendarViewMode()">
           <span class="fas fa-expand"></span>
         </button>

app/frontend/templates/calendar/ical_links.html

@@ -1,9 +1,9 @@
 <div class="modal-header">
-  <h3 class="modal-title">{{ 'app.shared.calendar.ical_links' | translate }}</h3>
+  <h3 class="modal-title">{{ 'app.admin.calendar.ical_links' | translate }}</h3>
 </div>
 
 <div class="modal-body">
-  <p class="text-muted">{{ 'app.shared.calendar.ical_description' | translate }}</p>
+  <p class="text-muted">{{ 'app.admin.calendar.ical_description' | translate }}</p>
 
   <div class="list-group">
     <div class="list-group-item" ng-repeat="link in icalLinks">
@@ -17,7 +17,7 @@ <h5 class="list-group-item-heading m-b">
         </div>
         <div class="col-md-4 text-right">
           <button type="button" class="btn btn-outline-primary btn-sm" ng-click="copyToClipboard(link.url)">
-            <i class="fas fa-copy"></i> {{ 'app.shared.calendar.copy_link' | translate }}
+            <i class="fas fa-copy"></i> {{ 'app.admin.calendar.copy_link' | translate }}
           </button>
         </div>
       </div>
@@ -26,7 +26,7 @@ <h5 class="list-group-item-heading m-b">
 
   <div class="alert alert-info" role="alert">
     <i class="fas fa-info-circle"></i>
-    {{ 'app.shared.calendar.ical_usage_info' | translate }}
+    {{ 'app.admin.calendar.ical_usage_info' | translate }}
   </div>
 </div>
 

config/locales/app.admin.de.yml

@@ -405,6 +405,16 @@ de:
         deleted_user: "Gelöschter Nutzer"
         select_type: "Please select a type to continue"
         no_modules_available: "No reservable module available. Please enable at least one module (machines, spaces or trainings) in the Customization section."
+        ical_links: "iCal-Links"
+        ical_description: "Verwenden Sie diese Links, um Reservierungskalender in Ihrer bevorzugten Kalender-App zu abonnieren."
+        copy_link: "Link kopieren"
+        ical_usage_info: "Kopieren Sie diese webcal://-Links in Ihre Kalender-App, um automatische Updates zu abonnieren."
+        link_copied: "Link in die Zwischenablage kopiert!"
+        copy_failed: "Fehler beim Kopieren des Links"
+        machine_reservations: "Maschinenreservierungen"
+        training_reservations: "Schulungsreservierungen"
+        event_reservations: "Veranstaltungsreservierungen"
+        space_reservations: "Raumreservierungen"
       #import external iCal calendar
       icalendar:
         icalendar_import: "iCalendar Import"

config/locales/app.admin.en.yml

@@ -405,6 +405,16 @@ en:
         deleted_user: "Deleted user"
         select_type: "Please select a type to continue"
         no_modules_available: "No reservable module available. Please enable at least one module (machines, spaces or trainings) in the Customization section."
+        ical_links: "iCal links"
+        ical_description: "Use the following links to subscribe to reservation calendars in your calendar application."
+        copy_link: "Copy Link"
+        ical_usage_info: "Add these links to your calendar application (such as Google Calendar, Outlook, etc.) to automatically sync reservation information."
+        link_copied: "Link copied to clipboard"
+        copy_failed: "Copy failed, please copy the link manually"
+        machine_reservations: "Machine Reservations"
+        training_reservations: "Training Reservations"
+        event_reservations: "Event Reservations"
+        space_reservations: "Space Reservations"
       # import external iCal calendar
       icalendar:
         icalendar_import: "iCalendar import"

config/locales/app.admin.es-MX.yml

@@ -405,6 +405,16 @@ es-MX:
         deleted_user: "Usuario suprimido"
         select_type: "Seleccione un tipo para continuar"
         no_modules_available: "No hay ningún módulo reservable disponible. Habilite al menos un módulo (máquinas, espacios o capacitaciones) en la sección Personalización."
+        ical_links: "Enlaces iCal"
+        ical_description: "Use estos enlaces para suscribirse a calendarios de reservas en su aplicación de calendario preferida."
+        copy_link: "Copiar enlace"
+        ical_usage_info: "Copie estos enlaces webcal:// en su aplicación de calendario para suscribirse a actualizaciones automáticas."
+        link_copied: "¡Enlace copiado al portapapeles!"
+        copy_failed: "Error al copiar el enlace"
+        machine_reservations: "Reservas de máquinas"
+        training_reservations: "Reservas de capacitaciones"
+        event_reservations: "Reservas de eventos"
+        space_reservations: "Reservas de espacios"
       #import external iCal calendar
       icalendar:
         icalendar_import: "Importar iCalendar"

config/locales/app.admin.es.yml

@@ -405,6 +405,16 @@ es:
         deleted_user: "Usuario suprimido"
         select_type: "Seleccione un tipo para continuar"
         no_modules_available: "No hay ningún módulo reservable disponible. Habilite al menos un módulo (máquinas, espacios o capacitaciones) en la sección Personalización."
+        ical_links: "Enlaces iCal"
+        ical_description: "Use estos enlaces para suscribirse a calendarios de reservas en su aplicación de calendario preferida."
+        copy_link: "Copiar enlace"
+        ical_usage_info: "Copie estos enlaces webcal:// en su aplicación de calendario para suscribirse a actualizaciones automáticas."
+        link_copied: "¡Enlace copiado al portapapeles!"
+        copy_failed: "Error al copiar el enlace"
+        machine_reservations: "Reservas de máquinas"
+        training_reservations: "Reservas de capacitaciones"
+        event_reservations: "Reservas de eventos"
+        space_reservations: "Reservas de espacios"
       #import external iCal calendar
       icalendar:
         icalendar_import: "Importar iCalendar"

config/locales/app.admin.fr.yml

@@ -405,6 +405,16 @@ fr:
         deleted_user: "Utilisateur supprimé"
         select_type: "Veuillez sélectionner un type pour continuer"
         no_modules_available: "Aucun module réservable n'est disponible. Veuillez activer au moins un module (machines, espaces ou formations) dans la section Personnalisation."
+        ical_links: "Liens iCal"
+        ical_description: "Utilisez ces liens pour vous abonner aux calendriers de réservation dans votre application de calendrier préférée."
+        copy_link: "Copier le lien"
+        ical_usage_info: "Copiez ces liens webcal:// dans votre application de calendrier pour vous abonner aux mises à jour automatiques."
+        link_copied: "Lien copié dans le presse-papiers !"
+        copy_failed: "Échec de la copie du lien"
+        machine_reservations: "Réservations de machines"
+        training_reservations: "Réservations de formations"
+        event_reservations: "Réservations d'événements"
+        space_reservations: "Réservations d'espaces"
       #import external iCal calendar
       icalendar:
         icalendar_import: "Import iCalendar"