modification du nom et plus seulement de l'URL des entrées "URL" du menu, header/footer: renommage de classes et input absents du HTML sans être adminHEADmain

14 files changed, 146 insertions, 222 deletions

diff --git a/public/css/head.css b/public/css/head.css
index 4206044..dab81a8 100644
--- a/public/css/head.css
+++ b/public/css/head.css
@@ -49,7 +49,7 @@ header
         }
 }
 
-.site_title
+.header_center_col
 {
         background-color: #ffffff7f;
         border-radius: 10px;
@@ -81,25 +81,15 @@ header a
         color: unset; /* ne plus hériter */
         text-decoration: none;
 }
-.editing_zone > div
-{
-        /*display: inline;*/ /* à l'ancienne */
-}
 /*.header_right_col
 {}*/
-.social
-{
-        /*align-self: end;*/
-        /*padding: 4px;*/
-}
-.social a img
+#header_social img
 {
-        width: 25px;
-        background-color: #ffffffb3;
+        width: 28px;
+        background-color: rgba(255, 255, 255, 0.7);
         border-radius: 50%;
 }
-
-.social img:hover
+#header_social img:hover
 {
         background-color: yellow;
-}
+}
\ No newline at end of file
diff --git a/public/css/menu.css b/public/css/menu.css
index ac77d50..0dfb840 100644
--- a/public/css/menu.css
+++ b/public/css/menu.css
@@ -58,7 +58,7 @@
 
 .menu button
 {
-        margin: 5px;
+        margin: 4px 0;
 }
 .menu_entry_checkbox
 {
@@ -109,15 +109,11 @@
         flex-wrap: wrap;
         align-items: center;
 }
-.menu .url
-{
-        text-wrap: nowrap;
-}
-.menu .url input[type=url]
+.menu .url_content input
 {
         width: 50%;
 }
 
-@media screen and (min-width: 80rem) {
+/*@media screen and (min-width: 80rem) {
         i{}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/public/js/InputFile.js b/public/js/Input.js
index e676037..0b6912b 100644
--- a/public/js/InputFile.js
+++ b/public/js/Input.js
@@ -1,27 +1,36 @@
-// étendre une classe parente avec InputFile?
-class InputFile{
+class Input{
         constructor(name){
                 this.name = name;
+                /*const name_array = name.split('_');
+                this.node = name_array[0];
+                this.what = name_array[1];*/
                 this.parent = document.getElementById(name);
         }
         open(){
-                this.parent.querySelector('#' + this.name + '_img').classList.add('hidden');
+                this.parent.querySelector('#' + this.name + '_content').classList.add('hidden');
                 this.parent.querySelector('#' + this.name + '_input').classList.remove('hidden');
                 this.parent.querySelector('#' + this.name + '_open').classList.add('hidden');
                 this.parent.querySelector('#' + this.name + '_submit').classList.remove('hidden');
                 this.parent.querySelector('#' + this.name + '_cancel').classList.remove('hidden');
         }
         close(){
-                this.parent.querySelector('#' + this.name + '_img').classList.remove('hidden');
+                this.parent.querySelector('#' + this.name + '_content').classList.remove('hidden');
                 this.parent.querySelector('#' + this.name + '_input').classList.add('hidden');
                 this.parent.querySelector('#' + this.name + '_open').classList.remove('hidden');
                 this.parent.querySelector('#' + this.name + '_submit').classList.add('hidden');
                 this.parent.querySelector('#' + this.name + '_cancel').classList.add('hidden');
         }
+        cancel(){
+                this.close();
+        }
+}
+
+class InputFile extends Input{
         submit(){
                 const file = this.parent.querySelector('#' + this.name + '_input').files[0];
                 if(!file){
                         console.error("Erreur: aucun fichier sélectionné.");
+                        toastNotify("Erreur: aucun fichier sélectionné.");
                         return;
                 }
                 const form_data = new FormData();
@@ -34,9 +43,7 @@ class InputFile{
             .then(response => response.json())
             .then(data => {
                 if(data.success){
-                        this.parent.querySelector('#' + this.name + '_img').src = data.location;
-
-                        // cas particulier
+                        // cas particuliers
                         if(this.name === 'head_favicon'){
                                 const link = document.querySelector('link[rel="icon"]');
                                 link.type = data.mime_type;
@@ -46,6 +53,7 @@ class InputFile{
                                 document.querySelector('header').style.backgroundImage = "url('" + data.location + "')";
                         }
 
+                        this.parent.querySelector('#' + this.name + '_content').src = data.location;
                                 this.close();
                 }
                 else{
@@ -56,7 +64,33 @@ class InputFile{
                 console.error('Erreur:', error);
             });
         }
-        cancel(){
+}
+
+class InputText extends Input{
+        submit(){
+                const new_text = this.parent.querySelector('#' + this.name + '_input').value;
+
+                fetch('index.php?head_foot_text=' + this.name, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({new_text: new_text})
+            })
+            .then(response => response.json())
+            .then(data => {
+                if(data.success){
+                        this.parent.querySelector('#' + this.name + '_content').innerHTML = new_text;
+                                this.close();
+                }
+                else{
+                    console.error("Erreur: le serveur n'a pas enregistré le nouveau texte.");
+                }
+            })
+            .catch(error => {
+                console.error('Erreur:', error);
+            });
+        }
+        cancel(){ // surcharge
+                this.parent.querySelector('#' + this.name + '_input').value = this.parent.querySelector('#' + this.name + '_content').innerHTML;
                 this.close();
         }
 }
\ No newline at end of file
diff --git a/public/js/InputText.js b/public/js/InputText.js
deleted file mode 100644
index 79f0398..0000000
--- a/public/js/InputText.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// s'en servir dans menu et chemin
-// étendre un classe parente avec InputText?
-class InputText{
-        constructor(name){
-                this.name = name;
-                this.parent = document.getElementById(name);
-        }
-        open(){
-                this.parent.querySelector('#' + this.name + '_span').classList.add('hidden');
-                this.parent.querySelector('#' + this.name + '_input').classList.remove('hidden');
-                this.parent.querySelector('#' + this.name + '_open').classList.add('hidden');
-                this.parent.querySelector('#' + this.name + '_submit').classList.remove('hidden');
-                this.parent.querySelector('#' + this.name + '_cancel').classList.remove('hidden');
-        }
-        close(){
-                this.parent.querySelector('#' + this.name + '_span').classList.remove('hidden');
-                this.parent.querySelector('#' + this.name + '_input').classList.add('hidden');
-                this.parent.querySelector('#' + this.name + '_open').classList.remove('hidden');
-                this.parent.querySelector('#' + this.name + '_submit').classList.add('hidden');
-                this.parent.querySelector('#' + this.name + '_cancel').classList.add('hidden');
-        }
-        submit(){
-                const new_text = this.parent.querySelector('#' + this.name + '_input').value;
-
-                fetch('index.php?head_foot_text=' + this.name, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({new_text: new_text})
-            })
-            .then(response => response.json())
-            .then(data => {
-                if(data.success){
-                        this.parent.querySelector('#' + this.name + '_span').innerHTML = new_text;
-                                this.close();
-                }
-                else{
-                    console.error("Erreur: le serveur n'a pas enregistré le nouveau texte.");
-                }
-            })
-            .catch(error => {
-                console.error('Erreur:', error);
-            });
-        }
-        cancel(){
-                this.parent.querySelector('#' + this.name + '_input').value = this.parent.querySelector('#' + this.name + '_span').innerHTML;
-                this.close();
-        }
-}
\ No newline at end of file
diff --git a/public/js/menu.js b/public/js/menu.js
index ef58c42..5e02387 100644
--- a/public/js/menu.js
+++ b/public/js/menu.js
@@ -147,22 +147,27 @@ function checkMenuEntry(page_id){
     });
 }
 
-// seul la modification des URL est possible pour l'instant, les noms des entrées de menu attendront
-function editUrlEntry(page_id){
+function editUrl(page_id, selector){
     const parent_div = document.getElementById(page_id);
-    const url_input = parent_div.querySelector('.url').querySelector('input').value;
+    const input_data = parent_div.querySelector('.' + selector).querySelector('input').value;
     
-    fetch('index.php?menu_edit=edit_url_entry', {
+    fetch('index.php?menu_edit=url_edit', {
         method: 'POST',
         headers: {
         'Content-Type': 'application/json'
         },
-        body: JSON.stringify({ id: page_id, url_input: url_input })
+        body: JSON.stringify({ id: page_id, field: selector, input_data: input_data })
     })
     .then(response => response.json())
     .then(data => {
         if(data.success){
-            findParentByTagName(document.getElementById('m_' + page_id), 'a').href = data.url_input; // MAJ menu
+            // MAJ menu
+            if(selector === 'url_name'){
+                document.getElementById('m_' + page_id).innerHTML = data.url_data;
+            }
+            else if(selector === 'url_content'){
+                findParentByTagName(document.getElementById('m_' + page_id), 'a').href = data.url_data;
+            }
             toastNotify("Nouvelle adresse enregistrée avec succès")
         }
         else{
@@ -173,63 +178,4 @@ function editUrlEntry(page_id){
     .catch(error => {
         console.error('Erreur:', error);
     });
-}
-
-
-
-// code à recycler pour pouvoir modifier le nom de l'entrée de menu correspondant aux liens
-/*function editUrlEntry(page_id){
-        const parent_div = document.getElementById(page_id);
-    parent_div.querySelector('i').classList.add('hidden');
-    parent_div.querySelector('.url').querySelector('input').classList.remove('hidden');
-    parent_div.querySelector('#edit-i' + page_id).classList.add('hidden');
-    parent_div.querySelector('#delete-i' + page_id).querySelector('input[type=image]').classList.add('hidden');
-    parent_div.querySelector('#cancel-i' + page_id).querySelector('button').classList.remove('hidden');
-    parent_div.querySelector('#submit-i' + page_id).querySelector('input[type=submit]').classList.remove('hidden');
-}
-function cancelUrlEntry(page_id){
-    const parent_div = document.getElementById(page_id);
-    parent_div.querySelector('.url').querySelector('input').value = parent_div.querySelector('i').textContent; // textContent (contrairement à innerHTML) ne transforme pas les & en entités HTML
-    closeUrlEntry(page_id, parent_div);
-}
-function submitUrlEntry(page_id){
-    const parent_div = document.getElementById(page_id);
-    const url_input = parent_div.querySelector('.url').querySelector('input').value;
-
-    fetch('index.php?menu_edit=edit_url_entry', {
-        method: 'POST',
-        headers: {
-        'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({ id: page_id, url_input: url_input })
-    })
-    .then(response => response.json())
-    .then(data => {
-        if(data.success){
-            parent_div.querySelector('i').innerHTML = data.url_input; // MAJ <i>
-            findParentByTagName(document.getElementById('m_' + page_id), 'a').href = data.url_input; // MAJ menu
-            closeUrlEntry(page_id, parent_div);
-        }
-        else{
-            toastNotify("Erreur rencontrée par le serveur, changements non pris en compte");
-            console.error("Erreur rencontrée par le serveur, changements non pris en compte");
-        }
-    })
-    .catch(error => {
-        console.error('Erreur:', error);
-    });
-}
-function closeUrlEntry(page_id, parent_div){
-    parent_div.querySelector('i').classList.remove('hidden');
-    parent_div.querySelector('.url').querySelector('input').classList.add('hidden');
-    parent_div.querySelector('#edit-i' + page_id).classList.remove('hidden');
-    parent_div.querySelector('#delete-i' + page_id).querySelector('input[type=image]').classList.remove('hidden');
-    parent_div.querySelector('#cancel-i' + page_id).querySelector('button').classList.add('hidden');
-    parent_div.querySelector('#submit-i' + page_id).querySelector('input[type=submit]').classList.add('hidden');
-}*/
-
-/*function deleteUrlEntry(page_id){
-        const selected_div = document.getElementById(page_id);
-        console.log(selected_div.id);
-}*/
-
+}
\ No newline at end of file
diff --git a/src/controller/MenuAndPathsController.php b/src/controller/MenuAndPathsController.php
index a32b210..6bb098f 100644
--- a/src/controller/MenuAndPathsController.php
+++ b/src/controller/MenuAndPathsController.php
@@ -42,21 +42,30 @@ class MenuAndPathsController
         die;
     }
 
-    static public function editUrlEntry(EntityManager $entityManager, array $json): void
+    // on pourrait utiliser FormValidation ici
+    static public function editUrl(EntityManager $entityManager, array $json): void
     {
-        $url_input = trim($json['url_input']); // faire htmlspecialchars à l'affichage
+        $url_data = trim($json['input_data']); // garder htmlspecialchars pour l'affichage
         $page = $entityManager->find('App\Entity\Page', $json['id']);
 
         if(!$page){
             echo json_encode(['success' => false, 'message' => "id invalide"]);
         }
-        elseif(!filter_var($url_input, FILTER_VALIDATE_URL) || !str_starts_with($url_input, 'http')){
+        elseif(!in_array($json['field'], ['url_name', 'url_content'])){
+            echo json_encode(['success' => false, 'message' => "champ invalide"]);
+        }
+        elseif($json['field'] === 'url_content' && (!filter_var($url_data, FILTER_VALIDATE_URL) || !str_starts_with($url_data, 'http'))){
             echo json_encode(['success' => false, 'message' => "la chaîne envoyée n'est pas une URL valide"]);
         }
         else{
-            $page->setEndOfPath($url_input);
+            if($json['field'] === 'url_name'){
+                $page->setPageName($url_data);
+            }
+            elseif($json['field'] === 'url_content'){
+                $page->setEndOfPath($url_data);
+            }
             $entityManager->flush();
-            echo json_encode(['success' => true, 'url_input' => $url_input]);
+            echo json_encode(['success' => true, 'url_data' => $url_data]);
         }
         die;
     }
diff --git a/src/model/Model.php b/src/model/Model.php
index 68c4c08..eeba8b2 100644
--- a/src/model/Model.php
+++ b/src/model/Model.php
@@ -1,5 +1,8 @@
 <?php
 // src/model/Model.php
+//
+// à l'occaz, faire des classes métiers: NodeModel = celle-ci
+// puis PageModel, puis éventuellement UserModel, EmailModel (le calendrier a déjà EventDTO)
 
 declare(strict_types=1);
 
diff --git a/src/router.php b/src/router.php
index cfb1dec..ebe645f 100644
--- a/src/router.php
+++ b/src/router.php
@@ -166,8 +166,8 @@ elseif($request->getMethod() === 'POST'){
                 elseif($_GET['menu_edit'] === 'display_in_menu' && isset($json['id']) && isset($json['checked'])){
                     MenuAndPathsController::displayInMenu($entityManager, $json);
                 }
-                elseif($_GET['menu_edit'] === 'edit_url_entry' && isset($json['id']) && isset($json['url_input'])){
-                    MenuAndPathsController::editUrlEntry($entityManager, $json);
+                elseif($_GET['menu_edit'] === 'url_edit' && isset($json['id']) && isset($json['field']) && isset($json['input_data'])){
+                    MenuAndPathsController::editUrl($entityManager, $json);
                 }
             }
 
diff --git a/src/view/FooterBuilder.php b/src/view/FooterBuilder.php
index fcb78e0..277de4b 100644
--- a/src/view/FooterBuilder.php
+++ b/src/view/FooterBuilder.php
@@ -30,17 +30,21 @@ class FooterBuilder extends AbstractBuilder
             if($_SESSION['admin'])
             {
                 // données du footer
-                $buttons_footer_name = '<img id="footer_name_open" class="action_icon" src="assets/edit.svg" onclick="footer_name.open()">
+                $admin_footer_name = '<input type="text" id="footer_name_input" class="hidden" value="' . htmlspecialchars($name ?? '') . '" size="30">
+                    <img id="footer_name_open" class="action_icon" src="assets/edit.svg" onclick="footer_name.open()">
                     <img id="footer_name_submit" class="action_icon hidden" src="assets/save.svg" onclick="footer_name.submit()">
                     <img id="footer_name_cancel" class="action_icon hidden" src="assets/close.svg" onclick="footer_name.cancel()">';
-                $buttons_footer_address = '<img id="footer_address_open" class="action_icon" src="assets/edit.svg" onclick="footer_address.open()">
+                $admin_footer_address = '<input type="text" id="footer_address_input" class="hidden" value="' . htmlspecialchars($address ?? '') . '" size="30">
+                    <img id="footer_address_open" class="action_icon" src="assets/edit.svg" onclick="footer_address.open()">
                     <img id="footer_address_submit" class="action_icon hidden" src="assets/save.svg" onclick="footer_address.submit()">
                     <img id="footer_address_cancel" class="action_icon hidden" src="assets/close.svg" onclick="footer_address.cancel()">';
-                $buttons_footer_email = '<img id="footer_email_open" class="action_icon" src="assets/edit.svg" onclick="footer_email.open()">
+                $admin_footer_email = '<input type="text" id="footer_email_input" class="hidden" value="' . htmlspecialchars($email ?? '') . '" size="30">
+                    <img id="footer_email_open" class="action_icon" src="assets/edit.svg" onclick="footer_email.open()">
                     <img id="footer_email_submit" class="action_icon hidden" src="assets/save.svg" onclick="footer_email.submit()">
                     <img id="footer_email_cancel" class="action_icon hidden" src="assets/close.svg" onclick="footer_email.cancel()">';
 
-                $buttons_footer_logo = '<img id="footer_logo_open" class="action_icon" src="assets/edit.svg" onclick="footer_logo.open()">
+                $admin_footer_logo = '<input type="file" id="footer_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
+                    <img id="footer_logo_open" class="action_icon" src="assets/edit.svg" onclick="footer_logo.open()">
                     <img id="footer_logo_submit" class="action_icon hidden" src="assets/save.svg" onclick="footer_logo.submit()">
                     <img id="footer_logo_cancel" class="action_icon hidden" src="assets/close.svg" onclick="footer_logo.cancel()">';
 
@@ -81,10 +85,10 @@ class FooterBuilder extends AbstractBuilder
                 }
                 $zone_admin = '<button><a href="' . $url . '">Mode admin</a></button>';
 
-                $buttons_footer_name = '';
-                $buttons_footer_address = '';
-                $buttons_footer_email = '';
-                $buttons_footer_logo = '';
+                $admin_footer_name = '';
+                $admin_footer_address = '';
+                $admin_footer_email = '';
+                $admin_footer_logo = '';
             }
 
             ob_start();
diff --git a/src/view/HeadBuilder.php b/src/view/HeadBuilder.php
index fd7f751..3eba9a2 100644
--- a/src/view/HeadBuilder.php
+++ b/src/view/HeadBuilder.php
@@ -36,8 +36,7 @@ class HeadBuilder extends AbstractBuilder
 
             if($_SESSION['admin']){
                 // édition éléments sur toutes les pages (header, footer et favicon)
-                $js .= '<script src="' . self::versionedFileURL('js', 'InputText') . '"></script>' . "\n";
-                $js .= '<script src="' . self::versionedFileURL('js', 'InputFile') . '"></script>' . "\n";
+                $js .= '<script src="' . self::versionedFileURL('js', 'Input') . '"></script>' . "\n";
 
                 // tinymce, nécéssite un script de copie dans composer.json
                 $css .= '<link rel="stylesheet" href="' . self::versionedFileURL('css', 'tinymce') . '">' . "\n";
diff --git a/src/view/HeaderBuilder.php b/src/view/HeaderBuilder.php
index 1c82368..ae9a888 100644
--- a/src/view/HeaderBuilder.php
+++ b/src/view/HeaderBuilder.php
@@ -57,37 +57,42 @@ class HeaderBuilder extends AbstractBuilder
             if($_SESSION['admin']){
                 // assets dans classe editing_zone
                 $editing_zone_margin = '5px';
-                $buttons_favicon = '<button id="head_favicon_open" onclick="head_favicon.open()"><img id="head_favicon_img" class="action_icon"> Favicon</button>
-                    <script>document.getElementById(\'head_favicon_img\').src = window.Config.favicon;</script>
+                $admin_favicon = '<input type="file" id="head_favicon_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff, image/x-icon, image/bmp">
+                    <button id="head_favicon_open" onclick="head_favicon.open()"><img id="head_favicon_content" class="action_icon"> Favicon</button>
+                    <script>document.getElementById(\'head_favicon_content\').src = window.Config.favicon;</script>
                     <img id="head_favicon_submit" class="action_icon hidden" src="assets/save.svg" onclick="head_favicon.submit()">
                     <img id="head_favicon_cancel" class="action_icon hidden" src="assets/close.svg" onclick="head_favicon.cancel()">';
-                $buttons_background = '<button id="header_background_open" onclick="header_background.open()"><img id="header_background_img" class="background_button" src="' . $header_background . '"> Image de fond</button>
+                $admin_background = '<input type="file" id="header_background_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
+                    <button id="header_background_open" onclick="header_background.open()"><img id="header_background_content" class="background_button" src="' . $header_background . '"> Image de fond</button>
                     <img id="header_background_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_background.submit()">
                     <img id="header_background_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_background.cancel()">';
 
                 // asset dans classe header_content
-                $buttons_header_logo = '<img id="header_logo_open" class="action_icon" src="assets/edit.svg" onclick="header_logo.open()">
+                $admin_header_logo = '<input type="file" id="header_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
+                    <img id="header_logo_open" class="action_icon" src="assets/edit.svg" onclick="header_logo.open()">
                     <img id="header_logo_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_logo.submit()">
                     <img id="header_logo_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_logo.cancel()">';
                 // texte dans classe header_content
-                $buttons_header_title = '<img id="header_title_open" class="action_icon" src="assets/edit.svg" onclick="header_title.open()">
+                $admin_header_title = '<input type="text" id="header_title_input" class="hidden" value="' . htmlspecialchars($title ?? '') . '" size="30">
+                    <img id="header_title_open" class="action_icon" src="assets/edit.svg" onclick="header_title.open()">
                     <img id="header_title_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_title.submit()">
                     <img id="header_title_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_title.cancel()">';
-                $buttons_header_description = '<img id="header_description_open" class="action_icon" src="assets/edit.svg" onclick="header_description.open()">
+                $admin_header_description = '<input type="text" id="header_description_input" class="hidden" value="' . htmlspecialchars($description ?? '') . '" size="30">
+                    <img id="header_description_open" class="action_icon" src="assets/edit.svg" onclick="header_description.open()">
                     <img id="header_description_submit" class="action_icon hidden" src="assets/save.svg" onclick="header_description.submit()">
                     <img id="header_description_cancel" class="action_icon hidden" src="assets/close.svg" onclick="header_description.cancel()">';
 
-                //$buttons_social_networks = '<img class="action_icon" src="assets/edit.svg" onclick="editSocialNetworks()">';
-                $buttons_social_networks = '';
+                // icônes réseaux sociaux
+                $admin_social_networks = '';
             }
             else{
                 $editing_zone_margin = '0';
-                $buttons_favicon = '';
-                $buttons_background = '';
-                $buttons_header_logo = '';
-                $buttons_header_title = '';
-                $buttons_header_description = '';
-                $buttons_social_networks = '';
+                $admin_favicon = '';
+                $admin_background = '';
+                $admin_header_logo = '';
+                $admin_header_title = '';
+                $admin_header_description = '';
+                $admin_social_networks = '';
             }
             
             ob_start();
diff --git a/src/view/MenuBuilder.php b/src/view/MenuBuilder.php
index 12298cf..8e8b9a9 100644
--- a/src/view/MenuBuilder.php
+++ b/src/view/MenuBuilder.php
@@ -55,32 +55,26 @@ class MenuBuilder extends AbstractBuilder
                 <img class="move_entry_icon" onclick="switchMenuPositions(' . $entry->getId() . ', \'down\')" src="assets/arrow-down.svg">
                 <span class="menu_entry_checkbox">
                     <input type="checkbox" ' . $checked . ' onclick="checkMenuEntry(' . $entry->getId() . ')">
-                </span>
-                <button>' . $entry->getPageName() . '</button>';
+                </span>';
 
-            // seul la modification des URL est possible pour l'instant, les noms des entrées de menu attendront
+            // entrées URL: bouton poubelle + nom du lien + adresse
             if(str_starts_with($entry->getEndOfPath(), 'http')){
                 $this->html .= '<form style="display: inline;" id="delete-i' . $entry->getId() . '" method="post" action="' . new URL(['from' => 'menu_chemins']) . '">
                         <input type="hidden" name="delete" value="' . $entry->getId() . '">
                         <input type="image" class="move_entry_icon" src="assets/delete-bin.svg" alt="delete link button" onclick="return confirm(\'Voulez-vous vraiment supprimer cette entrée?\');">
                     </form>
-                    <span class="url">
+                    <span class="url_name">
+                        <button class="url_name"><input type="" value="' . htmlspecialchars($entry->getPageName()) . '"></button>
+                        <img class="move_entry_icon" src="assets/save.svg" onclick="editUrl(' . $entry->getId() . ', \'url_name\')">
+                    </span>
+                    <span class="url_content">
                         <input type="url" value="' . htmlspecialchars($entry->getEndOfPath()) . '">
-                        <img class="move_entry_icon" src="assets/save.svg" onclick="editUrlEntry(' . $entry->getId() . ')">
+                        <img class="move_entry_icon" src="assets/save.svg" onclick="editUrl(' . $entry->getId() . ', \'url_content\')">
                     </span>';
-
-                // code à recycler pour pouvoir modifier le nom de l'entrée de menu correspondant aux liens
-                /*$this->html .= '<span id="cancel-i' . $entry->getId() . '">
-                        <input type="hidden" name="cancel" value="' . $entry->getId() . '">
-                        <button class="hidden" onclick="cancelUrlEntry(' . $entry->getId() . ')">Annuler</button>
-                    </span>
-                    <span id="submit-i' . $entry->getId() . '">
-                        <input type="hidden" name="submit" value="' . $entry->getId() . '">
-                        <input type="submit" class="hidden" onclick="submitUrlEntry(' . $entry->getId() . ')">
-                    </span>';*/
             }
             else{
-                $this->html .= '<i class="path">' . $entry->getPagePath() . '</i>';
+                $this->html .= '<button>' . $entry->getPageName() . '</button>
+                    <i class="path">' . $entry->getPagePath() . '</i>';
             }
             
             if(count($entry->getChildren()) > 0){
diff --git a/src/view/templates/footer.php b/src/view/templates/footer.php
index 4db38ae..dc1c6cb 100644
--- a/src/view/templates/footer.php
+++ b/src/view/templates/footer.php
@@ -4,25 +4,21 @@
                 <div class="data">
                     <div class="contact">
                         <div id="footer_name">
-                            <span id="footer_name_span"><?= htmlspecialchars($name ?? '') ?></span>
-                            <input type="text" id="footer_name_input" class="hidden" value="<?= htmlspecialchars($name ?? '') ?>" size="30">
-                            <?= $buttons_footer_name ?>
+                            <span id="footer_name_content"><?= htmlspecialchars($name ?? '') ?></span>
+                            <?= $admin_footer_name ?>
                         </div>
                         <div id="footer_address">
-                            <span id="footer_address_span"><?= htmlspecialchars($address ?? '') ?></span>
-                            <input type="text" id="footer_address_input" class="hidden" value="<?= htmlspecialchars($address ?? '') ?>" size="30">
-                            <?= $buttons_footer_address ?>
+                            <span id="footer_address_content"><?= htmlspecialchars($address ?? '') ?></span>
+                            <?= $admin_footer_address ?>
                         </div>
                         <div id="footer_email">
-                            <a href="mailto:<?= $email ?>"><span id="footer_email_span"><?= htmlspecialchars($email ?? '') ?></span></a>
-                            <input type="text" id="footer_email_input" class="hidden" value="<?= htmlspecialchars($email ?? '') ?>" size="30">
-                            <?= $buttons_footer_email ?>
+                            <a id="footer_email_content" href="mailto:<?= $email ?>"><?= htmlspecialchars($email ?? '') ?></a>
+                            <?= $admin_footer_email ?>
                         </div>
                     </div>
                     <div id="footer_logo">
-                        <a href="<?= new URL ?>"><img id="footer_logo_img" src="<?= $footer_logo ?? '' ?>" alt="logo_alt"></a>
-                        <input type="file" id="footer_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
-                        <?= $buttons_footer_logo ?>
+                        <a id="footer_logo_content" href="<?= new URL ?>"><img src="<?= $footer_logo ?? '' ?>" alt="logo_alt"></a>
+                        <?= $admin_footer_logo ?>
                     </div>
 <?php if($_SESSION['admin']){ ?>
                     <script>
diff --git a/src/view/templates/header.php b/src/view/templates/header.php
index ac8af7f..4d3b323 100644
--- a/src/view/templates/header.php
+++ b/src/view/templates/header.php
@@ -5,43 +5,38 @@
             <div id="nav_zone">
                 <?= $nav ?>
             </div>
-            <div class="editing_zone">
+            <div>
                 <div id="head_favicon" style="margin: <?= $editing_zone_margin ?>;">
-                    <input type="file" id="head_favicon_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff, image/x-icon, image/bmp">
-                    <?= $buttons_favicon ?>
+                    <?= $admin_favicon ?>
                 </div>
                 <div id="header_background">
-                    <input type="file" id="header_background_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
-                    <?= $buttons_background ?>
+                    <?= $admin_background ?>
                 </div>
             </div>
             <div class="header_content">
                 <div class="header_left_col">
                     <div id="header_logo">
-                        <a href="<?= new URL ?>"><img id="header_logo_img" src="<?= $header_logo ?? '' ?>" alt="header_logo"></a>
-                        <input type="file" id="header_logo_input" class="hidden" accept="image/png, image/jpeg, image/gif, image/webp, image/tiff">
-                        <?= $buttons_header_logo ?>
+                        <a id="header_logo_content" href="<?= new URL ?>"><img src="<?= $header_logo ?? '' ?>" alt="header_logo"></a>
+                        <?= $admin_header_logo ?>
                     </div>
                 </div>
                 <div class="nav_button">
                     <button>MENU</button>
                 </div>
-                <div class="site_title">
+                <div class="header_center_col">
                     <h1 id="header_title">
-                        <a href="<?= new URL ?>"><span id="header_title_span"><?= htmlspecialchars($title ?? '') ?></span></a>
-                        <input type="text" id="header_title_input" class="hidden" value="<?= htmlspecialchars($title ?? '') ?>" size="30">
-                        <?= $buttons_header_title ?>
+                        <a id="header_title_content" href="<?= new URL ?>"><?= htmlspecialchars($title ?? '') ?></a></span>
+                        <?= $admin_header_title ?>
                     </h1>
                     <h2 id="header_description">
-                        <span id="header_description_span"><?= htmlspecialchars($description ?? '') ?></span>
-                        <input type="text" id="header_description_input" class="hidden" value="<?= htmlspecialchars($description ?? '') ?>" size="30">
-                        <?= $buttons_header_description ?>
+                        <span id="header_description_content"><?= htmlspecialchars($description ?? '') ?></span>
+                        <?= $admin_header_description ?>
                     </h2>
                 </div>
                 <div class="header_right_col">
-                    <div class="social">
+                    <div id="header_social">
                         <?= $social_networks ?>
-                        <?= $buttons_social_networks ?>
+                        <?= $admin_social_networks ?>
                     </div>
                     <?= $breadcrumb ?? '' ?>
                 </div>
@@ -53,6 +48,7 @@
                 let header_logo = new InputFile('header_logo');
                 let header_title = new InputText('header_title');
                 let header_description = new InputText('header_description');
+                let header_social = new InputFile('header_social');
             </script>
 <?php } ?>
         </header>
\ No newline at end of file