28 files changed, 77 insertions, 93 deletions

diff --git a/controller/admin.php b/controller/admin.php
index 5e3cde7..f092135 100644
--- a/controller/admin.php
+++ b/controller/admin.php
@@ -90,11 +90,11 @@ function melaineEdit($fileCode, $suppression)
         $headerPaintedTitle = 'Melaine Favennec';

         pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

 }

-function concertsEdit($fileCode, $suppression)

+function musiqueEdit($fileCode, $suppression)

 {

-        $page = "concerts";

-        $title = "Concerts";

-        $headerPaintedTitle = 'Concerts';

+        $page = "musique";

+        $title = "Musique";

+        $headerPaintedTitle = 'Musique';

         pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

 }

 function presseEdit($fileCode, $suppression)

@@ -104,18 +104,11 @@ function presseEdit($fileCode, $suppression)
         $headerPaintedTitle = 'La Presse';

         pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

 }

-function ateliersEdit($fileCode, $suppression)

+function jaimeEdit($fileCode, $suppression)

 {

-        $page = "ateliers";

-        $title = "Ateliers";

-        $headerPaintedTitle = 'Les ateliers de Melaine';

-        pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

-}

-function liensEdit($fileCode, $suppression)

-{

-        $page = "liens";

-        $title = "Liens";

-        $headerPaintedTitle = 'Liens';

+        $page = "jaime";

+        $title = "J'aime";

+        $headerPaintedTitle = 'J\'aime';

         pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

 }

 function peintureEdit($fileCode, $suppression)

@@ -132,6 +125,13 @@ function archivesEdit($fileCode, $suppression)
         $headerPaintedTitle = 'Archives';

         pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

 }

+function legalEdit($fileCode, $suppression)

+{

+        $page = "legal";

+        $title = "Mentions légales";

+        $headerPaintedTitle = 'Mentions légales';

+        pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression);

+}

 

 

 // page plus complexe que les autres

diff --git a/controller/backup.php b/controller/backup.php
index 2cfccaa..31974d0 100644
--- a/controller/backup.php
+++ b/controller/backup.php
@@ -10,7 +10,7 @@ function sauvegarder($from)
         $date = date("d-m-Y", time());

         $nomFichier = "melaineDATA_" . $date;

         // ne prendre que les dossiers pour exclure les fichiers password.txt, melaineDATA.zip et melainePHP.zip existant

-        $dossiersCibles = [ 'data/archives', 'data/concerts', 'data/liens', 'data/presse', 'data/ateliers', 'data/discographie', 'data/melaine', 'data/peinture' ];

+        $dossiersCibles = [ 'data/archives', 'data/musique', 'data/jaime', 'data/presse', 'data/legal', 'data/discographie', 'data/melaine', 'data/peinture' ];

         //$fichiersALaRacine = [];

 

         createZip($cheminDestination, $nomFichier, $dossiersCibles);

diff --git a/controller/installation.php b/controller/installation.php
index 0bd56c2..4966611 100644
--- a/controller/installation.php
+++ b/controller/installation.php
@@ -83,7 +83,7 @@ function installation()
         createIndexPHP('data/index.php', $droitsFichiers);

     }

     

-    $listePages = array('melaine', 'discographie', 'concerts', 'presse', 'ateliers', 'liens', 'peinture', 'archives');

+    $listePages = array('melaine', 'musique', 'discographie', 'presse', 'jaime', 'peinture', 'archives', 'legal');

     foreach ($listePages as $page)

     {

         if(!file_exists('data/' . $page))

diff --git a/controller/visitor.php b/controller/visitor.php
index ac19441..38f24e8 100644
--- a/controller/visitor.php
+++ b/controller/visitor.php
@@ -58,11 +58,11 @@ function melaineVisitor()
         $headerPaintedTitle = 'Melaine Favennec';

         pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

 }

-function concertsVisitor()

+function musiqueVisitor()

 {

-        $page = "concerts";

-        $title = "Concerts";

-        $headerPaintedTitle = 'Concerts';

+        $page = "musique";

+        $title = "Musique";

+        $headerPaintedTitle = 'Musique';

         pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

 }

 function presseVisitor()

@@ -72,18 +72,11 @@ function presseVisitor()
         $headerPaintedTitle = 'La Presse';

         pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

 }

-function ateliersVisitor()

+function jaimeVisitor()

 {

-        $page = "ateliers";

-        $title = "Ateliers";

-        $headerPaintedTitle = 'Les ateliers de Melaine';

-        pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

-}

-function liensVisitor()

-{

-        $page = "liens";

-        $title = "Liens";

-        $headerPaintedTitle = 'Liens';

+        $page = "jaime";

+        $title = "J'aime";

+        $headerPaintedTitle = 'J\'aime';

         pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

 }

 function peintureVisitor()

@@ -100,6 +93,13 @@ function archivesVisitor()
         $headerPaintedTitle = 'Archives';

         pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

 }

+function legalVisitor()

+{

+        $page = "legal";

+        $title = "Mentions légales";

+        $headerPaintedTitle = 'Mentions légales';

+        pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle);

+}

 

 

 // page plus complexe que les autres

diff --git a/index.php b/index.php
index 008e4a2..76d3b4f 100644
--- a/index.php
+++ b/index.php
@@ -115,7 +115,7 @@ else
 // page du site demandée

 if(isset($_GET['page']))

 {

-    $pagesArticlesSimples = ['melaine', 'concerts', 'presse', 'ateliers', 'liens', 'peinture', 'archives'];

+    $pagesArticlesSimples = ['melaine', 'musique', 'presse', 'jaime', 'peinture', 'archives', 'legal'];

 

     // page d'accueil

     if($_GET['page'] == 'accueil')

@@ -145,25 +145,21 @@ if(isset($_GET['page']))
             // modification

             if(isset($_GET['file_code']) || !empty($_GET['file_code']))

             {

-                //melaineEdit($_GET['file_code'], 0);

                 $fonctionEdit($_GET['file_code'], 0);

             }

             // nouvel article

             else

             {

-                //melaineEdit('', 0);

                 $fonctionEdit('', 0);

             }

         }

         // suppression

         else if($_SESSION['admin'] == 1 && isset($_GET['action']) && $_GET['action'] == 'suppression')

         {

-            //melaineEdit($_GET['file_code'], 1);

             $fonctionEdit($_GET['file_code'], 1);

         }

         else

         {

-            //melaineVisitor();

             $fonctionVisitor();

         }

 

diff --git a/public/css/pages_articles_simples.css b/public/css/pages_articles_simples.css
index 124166b..9afdf0e 100644
--- a/public/css/pages_articles_simples.css
+++ b/public/css/pages_articles_simples.css
@@ -108,7 +108,7 @@ figure
     {

         background-image: url('../header_images/melaine.png');

     }

-    #photo_concerts

+    #photo_musique

     {

         background-image: url('../header_images/sirene.jpg');

         width: 308px;

@@ -122,14 +122,7 @@ figure
         height: 163px;

         margin-left: auto;

     }

-    #photo_ateliers

-    {

-        background-image: url('../header_images/cavalier.jpg');

-        width: 159px;

-        height: 312px;

-        margin-left: 10px;

-    }

-    #photo_liens

+    #photo_jaime

     {

         background-image: url('../header_images/canoe.png');

         width: 207px;

@@ -151,6 +144,13 @@ figure
         height: 233px;

         margin-left: auto;

     }

+    #photo_legal

+    {

+        background-image: url('../header_images/cavalier.jpg');

+        width: 159px;

+        height: 312px;

+        margin-left: 10px;

+    }

     .explications

     {

         width: 373px;

@@ -167,7 +167,7 @@ figure
     {

         background-image: url("../header_images/melaine_petit.png");

     }

-    #photo_concerts

+    #photo_musique

     {

         background-image: url('../header_images/sirene_petit.jpg');

         width: 243px;

@@ -181,14 +181,7 @@ figure
         height: 124px;

         margin: 0 0 0 auto;

     }

-    #photo_ateliers

-    {

-        background-image: url('../header_images/cavalier_petit.jpg');

-        width: 121px;

-        height: 237px;

-        margin-left: 10px;

-    }

-    #photo_liens

+    #photo_jaime

     {

         background-image: url('../header_images/canoe_petit.png');

         width: 157px;

@@ -209,6 +202,13 @@ figure
         height: 177px;

         margin: 0 0 0 auto;

     }

+    #photo_legal

+    {

+        background-image: url('../header_images/cavalier_petit.jpg');

+        width: 121px;

+        height: 237px;

+        margin-left: 10px;

+    }

     .explications

     {

         width: 285px;

@@ -225,7 +225,7 @@ figure
     {

         background-image: url("../header_images/melaine_mini.png");

     }

-    #photo_concerts

+    #photo_musique

     {

         background-image: url('../header_images/sirene_mini.jpg');

         width: 162px;

@@ -239,14 +239,7 @@ figure
         height: 82px;

         margin: 0 0 0 auto;

     }

-    #photo_ateliers

-    {

-        background-image: url('../header_images/cavalier_mini.jpg');

-        width: 80px;

-        height: 158px;

-        margin-left: 10px;

-    }

-    #photo_liens

+    #photo_jaime

     {

         background-image: url('../header_images/canoe_mini.png');

         width: 105px;

@@ -267,6 +260,13 @@ figure
         height: 118px;

         margin: 0 0 0 auto;

     }

+    #photo_legal

+    {

+        background-image: url('../header_images/cavalier_mini.jpg');

+        width: 80px;

+        height: 158px;

+        margin-left: 10px;

+    }

     .explications

     {

         width: 190px;

diff --git a/public/header_images/canoe.png b/public/header_images/canoe.png
index 9c449a6..3d604eb 100644
--- a/public/header_images/canoe.png
+++ b/public/header_images/canoe.png
diff --git a/public/header_images/canoe_mini.png b/public/header_images/canoe_mini.png
index 048dd37..4e9ab4e 100644
--- a/public/header_images/canoe_mini.png
+++ b/public/header_images/canoe_mini.png
diff --git a/public/header_images/canoe_petit.png b/public/header_images/canoe_petit.png
index 1d82002..75f6d67 100644
--- a/public/header_images/canoe_petit.png
+++ b/public/header_images/canoe_petit.png
diff --git a/public/header_images/cavalier.jpg b/public/header_images/cavalier.jpg
index fcf92fe..dab1183 100644
--- a/public/header_images/cavalier.jpg
+++ b/public/header_images/cavalier.jpg
diff --git a/public/header_images/cavalier_mini.jpg b/public/header_images/cavalier_mini.jpg
index 6050c67..a4f3217 100644
--- a/public/header_images/cavalier_mini.jpg
+++ b/public/header_images/cavalier_mini.jpg
diff --git a/public/header_images/cavalier_petit.jpg b/public/header_images/cavalier_petit.jpg
index 7dcf283..2cf5dde 100644
--- a/public/header_images/cavalier_petit.jpg
+++ b/public/header_images/cavalier_petit.jpg
diff --git a/public/header_images/sirene.jpg b/public/header_images/sirene.jpg
index aaa1226..bd179c7 100644
--- a/public/header_images/sirene.jpg
+++ b/public/header_images/sirene.jpg
diff --git a/public/header_images/sirene_mini.jpg b/public/header_images/sirene_mini.jpg
index 028d22c..572b899 100644
--- a/public/header_images/sirene_mini.jpg
+++ b/public/header_images/sirene_mini.jpg
diff --git a/public/header_images/sirene_petit.jpg b/public/header_images/sirene_petit.jpg
index 6655514..030f1ae 100644
--- a/public/header_images/sirene_petit.jpg
+++ b/public/header_images/sirene_petit.jpg
diff --git a/public/menu/canoe.png b/public/menu/canoe.png
index 9c449a6..3d604eb 100644
--- a/public/menu/canoe.png
+++ b/public/menu/canoe.png
diff --git a/public/menu/canoe_mini.png b/public/menu/canoe_mini.png
index 048dd37..4e9ab4e 100644
--- a/public/menu/canoe_mini.png
+++ b/public/menu/canoe_mini.png
diff --git a/public/menu/canoe_petit.png b/public/menu/canoe_petit.png
index 1d82002..75f6d67 100644
--- a/public/menu/canoe_petit.png
+++ b/public/menu/canoe_petit.png
diff --git a/public/menu/cavalier.jpg b/public/menu/cavalier.jpg
index fcf92fe..dab1183 100644
--- a/public/menu/cavalier.jpg
+++ b/public/menu/cavalier.jpg
diff --git a/public/menu/cavalier_mini.jpg b/public/menu/cavalier_mini.jpg
index 6050c67..a4f3217 100644
--- a/public/menu/cavalier_mini.jpg
+++ b/public/menu/cavalier_mini.jpg
diff --git a/public/menu/cavalier_petit.jpg b/public/menu/cavalier_petit.jpg
index 7dcf283..2cf5dde 100644
--- a/public/menu/cavalier_petit.jpg
+++ b/public/menu/cavalier_petit.jpg
diff --git a/public/menu/sirene.jpg b/public/menu/sirene.jpg
index aaa1226..bd179c7 100644
--- a/public/menu/sirene.jpg
+++ b/public/menu/sirene.jpg
diff --git a/public/menu/sirene_mini.jpg b/public/menu/sirene_mini.jpg
index 028d22c..572b899 100644
--- a/public/menu/sirene_mini.jpg
+++ b/public/menu/sirene_mini.jpg
diff --git a/public/menu/sirene_petit.jpg b/public/menu/sirene_petit.jpg
index 6655514..030f1ae 100644
--- a/public/menu/sirene_petit.jpg
+++ b/public/menu/sirene_petit.jpg
diff --git a/view/menu.php b/view/menu.php
index 2e07a94..719c036 100644
--- a/view/menu.php
+++ b/view/menu.php
@@ -32,7 +32,7 @@ ob_start();
 echo "\n";

 ?>

                 <div id="colonne1" >

-                    <a href="index.php?page=liens" >

+                    <a href="index.php?page=jaime" >

                         <div id="canoe" ></div>

                     </a>

                     

@@ -44,7 +44,7 @@ echo "\n";
                         <div id="pochette" ></div>

                     </a>

 

-                    <a href="index.php?page=ateliers" >

+                    <a href="index.php?page=legal" >

                         <div id="cavalier" ></div>

                     </a>

 

@@ -54,7 +54,7 @@ echo "\n";
                 </div>

 

                 <div id="colonne2" >

-                    <a href="index.php?page=concerts" >

+                    <a href="index.php?page=musique" >

                         <div id="sirene" ></div>

                     </a>

 

diff --git a/view/nav.php b/view/nav.php
index 1fa0487..a55e1dc 100644
--- a/view/nav.php
+++ b/view/nav.php
@@ -2,12 +2,12 @@
                 <ul id="ul_menu">

                     <li><a href="index.php?page=menu" <?php if($page == "menu") {echo('id="actuelle" ');} ?>>Menu</a></li>

                     <li><a href="index.php?page=melaine" <?php if($page == "melaine") {echo('id="actuelle" ');} ?>>Melaine</a></li>

+                    <li><a href="index.php?page=musique" <?php if($page == "musique") {echo('id="actuelle" ');} ?>>Musique</a></li>

                     <li><a href="index.php?page=discographie" <?php if($page == "discographie") {echo('id="actuelle" ');} ?>>Discographie</a></li>

-                    <li><a href="index.php?page=concerts" <?php if($page == "concerts") {echo('id="actuelle" ');} ?>>Concerts</a></li>

                     <li><a href="index.php?page=presse" <?php if($page == "presse") {echo('id="actuelle" ');} ?>>La Presse</a></li>

-                    <li><a href="index.php?page=ateliers" <?php if($page == "ateliers ") {echo('id="actuelle" ');} ?>>Ateliers</a></li>

-                    <li><a href="index.php?page=liens" <?php if($page == "liens") {echo('id="actuelle" ');} ?>>Liens</a></li>

+                    <li><a href="index.php?page=jaime" <?php if($page == "jaime") {echo('id="actuelle" ');} ?>>J'aime</a></li>

                     <li><a href="index.php?page=peinture" <?php if($page == "peinture") {echo('id="actuelle" ');} ?>>Peinture</a></li>

                     <li><a href="index.php?page=archives" <?php if($page == "archives") {echo('id="actuelle" ');} ?>>Archives</a></li>

+                    <li><a href="index.php?page=legal" <?php if($page == "legal ") {echo('id="actuelle" ');} ?>>Mentions légales</a></li>

                 </ul>

             </nav>
\ No newline at end of file
diff --git a/view/template.php b/view/template.php
index 313e35a..2811254 100644
--- a/view/template.php
+++ b/view/template.php
@@ -87,24 +87,6 @@ if($_SESSION['admin'] == 1)
             </div>

 <?php

 }

-// mentions légales

-// à déplacer dans une page dédiée

-if(isset($page) && $page != 'accueil')

-{

-?>

-        <footer>

-            <p>Melaine Favennec<br/>

-            Ty Glaz, 29120 Plomeur<br/>

-            Tel: ...<br/>

-            SIRET: 318 152 071</p>

-            <p>Directeur/codirecteur de la publication: ...</p>

-            <p>Ce site a été créé par Florant ... et utilise des illustrations de François Bourgeon.</p>

-            <p>Il a été rénové et est actuellement hébergé par Paul Jusot.<br/>

-            2A, rue de l'île de Man<br/>

-            SIRET: 814 320 610</p>

-        </footer>

-<?php

-}

 ?>

         </div>

     </body>

diff --git a/à faire après livraison.txt b/à faire après livraison.txt
index faf0131..843971a 100644
--- a/à faire après livraison.txt
+++ b/à faire après livraison.txt
@@ -1,8 +1,14 @@
-rassembler les pages
-presse (fille qui tombe) dans melaine
-ateliers (cheval) dans archives (blonde)
-remplacer concerts (sirene) par "écouter"
-remplacer liens (fille qui tombe) par "mentions légales"
+créer page peinture
+
+créer page musique
+
+choix des polices dans les images de BD
+
+n'utiliser que les grandes dans le menu
+
+images d'en-tête svg?
+
+déconnexion automatique quand inactivité
 
 dans installation.php, utiliser la racine dans config.php pour adapter le .htaccess (si c'est possible)