amélioration calendrier écran tactile, selection sans touché prolongé, versionedFileURL() dispo de partout

2 files changed, 10 insertions, 10 deletions

diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index f1f41ba..06a1301 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -26,25 +26,25 @@ class HeadBuilder extends AbstractBuilder
             $css = '';
                 foreach($css_array as $name)
                         {
-                                $css .= '<link rel="stylesheet" href="' . $this->versionedFileURL('css', $name) . '">' . "\n";
+                                $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";
                         }
                         
             $js = '';
                 foreach($js_array as $name)
                         {
-                                $js .= '<script src="' . $this->versionedFileURL('js', $name) . '"></script>' . "\n";
+                                $js .= '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
                         }
 
             if(MainBuilder::$modif_mode){
-                $css .= '<link rel="stylesheet" href="' . $this->versionedFileURL('css', 'modif_page') . '">' . "\n";
-                $js .= '<script src="' . $this->versionedFileURL('js', 'modif_page') . '"></script>' . "\n";
+                $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', 'modif_page') . '">' . "\n";
+                $js .= '<script src="' . self::versionedFileURL('js', 'modif_page') . '"></script>' . "\n";
             }
 
             // tinymce, nécéssite un script de copie dans composer.json
             if($_SESSION['admin']){
-                $css .= '<link rel="stylesheet" href="' . $this->versionedFileURL('css', 'tinymce') . '">' . "\n";
-                $js .= '<script src="' . $this->versionedFileURL('js', 'tinymce/tinymce.min') . '"></script>' . "\n"; // pour js/tinymce/tinymce.min.js
-                $js .= '<script src="' . $this->versionedFileURL('js', 'tinymce') . '"></script>' . "\n";
+                $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', 'tinymce') . '">' . "\n";
+                $js .= '<script src="' . self::versionedFileURL('js', 'tinymce/tinymce.min') . '"></script>' . "\n"; // pour js/tinymce/tinymce.min.js
+                $js .= '<script src="' . self::versionedFileURL('js', 'tinymce') . '"></script>' . "\n";
             }
 
             // titre
@@ -77,7 +77,7 @@ class HeadBuilder extends AbstractBuilder
         return $this->stop;
     }
 
-    private function versionedFileURL(string $type, string $filename): string
+    static public function versionedFileURL(string $type, string $filename): string
     {
         $path = $type . '/' . $filename . '.' . $type;
 
diff --git a/src/view/templates/calendar.php b/src/view/templates/calendar.php
index 144df00..e45f631 100644
--- a/src/view/templates/calendar.php
+++ b/src/view/templates/calendar.php
@@ -8,10 +8,10 @@
     <script src='js/fullcalendar/packages/core/locales/fr.global.min.js'></script>
 <?php
 if($_SESSION['admin'] === true){
-    echo '<script src="js/calendar_admin.js"></script>' . "\n";
+    echo '<script src="' . HeadBuilder::versionedFileURL('js', 'calendar_admin') . '"></script>' . "\n";
 }
 else{
-    echo '<script src="js/calendar.js"></script>' . "\n";
+    echo '<script src="' . HeadBuilder::versionedFileURL('js', 'calendar') . '"></script>' . "\n";
 }
 ?>
         <h3><?= $title ?></h3>