méthodes insertCSS et insertJS

3 files changed, 36 insertions, 36 deletions

diff --git a/src/view/CalendarBuilder.php b/src/view/CalendarBuilder.php
index 4229866..65592f8 100644
--- a/src/view/CalendarBuilder.php
+++ b/src/view/CalendarBuilder.php
@@ -19,21 +19,6 @@ class CalendarBuilder extends AbstractBuilder
                 extract($node->getNodeData()->getData());
             }
 
-            
-            if($_SESSION['admin'])
-            {
-                
-
-                // squelette d'un nouvel article ()
-                /*ob_start();
-                require self::VIEWS_PATH . 'article.php';
-                $new_article = ob_get_clean();*/
-            }
-
-            // articles existants
-            /*$this->useChildrenBuilder($node);
-            $content = $this->html;*/
-
             ob_start();
             require $viewFile;
             $this->html = ob_get_clean(); // pas de concaténation ici, on écrase
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index fa0f063..16bf2b6 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -19,30 +19,30 @@ class HeadBuilder extends AbstractBuilder
 
             $css = '';
                 foreach($page->getCSS() as $name){
-                                $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";
+                $css .= self::insertCSS($name);
                         }
                         
             $js = '';
                 foreach($page->getJS() as $name){
-                                $js .= '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
+                $js .= self::insertJS($name);
                         }
 
             if(MainBuilder::$modif_mode){
-                $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', 'modif_page') . '">' . "\n";
-                $js .= '<script src="' . self::versionedFileURL('js', 'modif_page') . '"></script>' . "\n";
+                $css .= self::insertCSS('modif_page');
+                $js .= self::insertJS('modif_page');
             }
 
             if($_SESSION['admin']){
                 // édition éléments sur toutes les pages (header, footer et favicon)
-                $js .= '<script src="' . self::versionedFileURL('js', 'Input') . '"></script>' . "\n";
+                $js .= self::insertJS('Input');
 
                 // sert partout?
-                $js .= '<script src="' . self::versionedFileURL('js', 'Fetcher') . '"></script>' . "\n";
+                $js .= self::insertJS('Fetcher');
 
-                // tinymce, nécéssite un script de copie dans composer.json
-                $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";
+                // tinymce, nécéssite un script post-install et post-update dans composer.json
+                $css .= self::insertCSS('tinymce');
+                $js .= self::insertJS('tinymce/tinymce.min');
+                $js .= self::insertJS('tinymce');
             }
 
             $title = Model::$page_path->getLast()->getPageName();
@@ -60,7 +60,16 @@ class HeadBuilder extends AbstractBuilder
         }
     }
 
-    static public function versionedFileURL(string $type, string $filename): string
+    static function insertCSS(string $name): string
+    {
+        return '<link rel="stylesheet" href="' . self::versionedFileURL('css', $name) . '">' . "\n";
+    }
+    static function insertJS(string $name): string
+    {
+        return '<script src="' . self::versionedFileURL('js', $name) . '"></script>' . "\n";
+    }
+
+    static 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 e45f631..8e765c4 100644
--- a/src/view/templates/calendar.php
+++ b/src/view/templates/calendar.php
@@ -1,19 +1,25 @@
-<?php declare(strict_types=1); ?>
-<section class="calendar" id="<?= $this->id_node ?>">
-        <script src='js/fullcalendar/packages/core/index.global.min.js'></script>
-    <script src='js/fullcalendar/packages/daygrid/index.global.min.js'></script>
-    <script src='js/fullcalendar/packages/timegrid/index.global.min.js'></script>
-    <script src='js/fullcalendar/packages/list/index.global.min.js'></script>
-    <script src='js/fullcalendar/packages/interaction/index.global.min.js'></script>
-    <script src='js/fullcalendar/packages/core/locales/fr.global.min.js'></script>
 <?php
+declare(strict_types=1);
+
+$calendar_js_files = [
+    'fullcalendar/packages/core/index.global.min',
+    'fullcalendar/packages/daygrid/index.global.min',
+    'fullcalendar/packages/timegrid/index.global.min',
+    'fullcalendar/packages/list/index.global.min',
+    'fullcalendar/packages/interaction/index.global.min',
+    'fullcalendar/packages/core/locales/fr.global.min'
+];
 if($_SESSION['admin'] === true){
-    echo '<script src="' . HeadBuilder::versionedFileURL('js', 'calendar_admin') . '"></script>' . "\n";
+    $calendar_js_files[] = 'calendar_admin';
 }
 else{
-    echo '<script src="' . HeadBuilder::versionedFileURL('js', 'calendar') . '"></script>' . "\n";
+    $calendar_js_files[] = 'calendar';
 }
 ?>
+<section class="calendar" id="<?= $this->id_node ?>">
+<?php foreach($calendar_js_files as $file){
+    echo HeadBuilder::insertJS($file);
+} ?>
         <h3><?= $title ?></h3>
         <div id="calendar_zone">
         <div id="calendar"></div>