13 files changed, 41 insertions, 6 deletions

diff --git a/controller/admin.php b/controller/admin.php
index c79f761..93d1900 100644
--- a/controller/admin.php
+++ b/controller/admin.php
@@ -121,6 +121,13 @@ function presseEdit($fileCode, $suppression)
         $headerPaintedTitle = 'La Presse';

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

 }

+function livresEdit($fileCode, $suppression)

+{

+        $page = "livres";

+        $title = "Livres";

+        $headerPaintedTitle = 'Dans les livres';

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

+}

 function jaimeEdit($fileCode, $suppression)

 {

         $page = "jaime";

diff --git a/controller/visitor.php b/controller/visitor.php
index 333c628..c561097 100644
--- a/controller/visitor.php
+++ b/controller/visitor.php
@@ -77,6 +77,13 @@ function presseVisitor()
         $headerPaintedTitle = 'La Presse';

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

 }

+function livresVisitor()

+{

+        $page = "livres";

+        $title = "Livres";

+        $headerPaintedTitle = 'Dans les livres';

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

+}

 function jaimeVisitor()

 {

         $page = "jaime";

diff --git a/index.php b/index.php
index 7cef980..87c020e 100644
--- a/index.php
+++ b/index.php
@@ -100,7 +100,7 @@ else
 // page du site demandée

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

 {

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

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

 

     // page d'accueil

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

diff --git a/model/Article.php b/model/Article.php
index 806c5f6..39fbbe4 100644
--- a/model/Article.php
+++ b/model/Article.php
@@ -109,7 +109,6 @@ class Article
         }
         public function readOne()
         {
-                //return(file_get_contents($this->fileName));
                 return(file_get_contents('data/' . $this->page . '/' . $this->format .  '/' . $this->fileCode . '.' . $this->format));
         }
         
diff --git a/public/css/accueil.css b/public/css/accueil.css
index 8425cfa..087da86 100644
--- a/public/css/accueil.css
+++ b/public/css/accueil.css
@@ -422,7 +422,7 @@ button
     }

     .police_titre:not(.police_titre_header)

     {

-        padding-top: 10px;

+        /*padding-top: 10px;*/

     }

 

     #bienvenue .police_titre

diff --git a/public/css/pages_articles_simples.css b/public/css/pages_articles_simples.css
index 9afdf0e..9b6d2c3 100644
--- a/public/css/pages_articles_simples.css
+++ b/public/css/pages_articles_simples.css
@@ -117,7 +117,14 @@ figure
     }

     #photo_presse

     {

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

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

+        width: 208px;

+        height: 163px;

+        margin-left: auto;

+    }

+    #photo_livres

+    {

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

         width: 208px;

         height: 163px;

         margin-left: auto;

@@ -176,7 +183,14 @@ figure
     }

     #photo_presse

     {

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

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

+        width: 158px;

+        height: 124px;

+        margin: 0 0 0 auto;

+    }

+    #photo_livres

+    {

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

         width: 158px;

         height: 124px;

         margin: 0 0 0 auto;

@@ -234,7 +248,14 @@ figure
     }

     #photo_presse

     {

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

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

+        width: 105px;

+        height: 82px;

+        margin: 0 0 0 auto;

+    }

+    #photo_livres

+    {

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

         width: 105px;

         height: 82px;

         margin: 0 0 0 auto;

diff --git a/public/header_images/fille_qui_tombe_livres.jpg b/public/header_images/fille_qui_tombe_livres.jpg
new file mode 100644
index 0000000..073626d
--- /dev/null
+++ b/public/header_images/fille_qui_tombe_livres.jpg
diff --git a/public/header_images/fille_qui_tombe_mini_livres.jpg b/public/header_images/fille_qui_tombe_mini_livres.jpg
new file mode 100644
index 0000000..5b8a5cf
--- /dev/null
+++ b/public/header_images/fille_qui_tombe_mini_livres.jpg
diff --git a/public/header_images/fille_qui_tombe_mini.jpg b/public/header_images/fille_qui_tombe_mini_presse.jpg
index c8be5ee..c8be5ee 100644
--- a/public/header_images/fille_qui_tombe_mini.jpg
+++ b/public/header_images/fille_qui_tombe_mini_presse.jpg
diff --git a/public/header_images/fille_qui_tombe_petit_livres.jpg b/public/header_images/fille_qui_tombe_petit_livres.jpg
new file mode 100644
index 0000000..51e4eb7
--- /dev/null
+++ b/public/header_images/fille_qui_tombe_petit_livres.jpg
diff --git a/public/header_images/fille_qui_tombe_petit.jpg b/public/header_images/fille_qui_tombe_petit_presse.jpg
index 29b22f3..29b22f3 100644
--- a/public/header_images/fille_qui_tombe_petit.jpg
+++ b/public/header_images/fille_qui_tombe_petit_presse.jpg
diff --git a/public/header_images/fille_qui_tombe.jpg b/public/header_images/fille_qui_tombe_presse.jpg
index e572287..e572287 100644
--- a/public/header_images/fille_qui_tombe.jpg
+++ b/public/header_images/fille_qui_tombe_presse.jpg
diff --git a/view/nav.php b/view/nav.php
index a55e1dc..b5dee06 100644
--- a/view/nav.php
+++ b/view/nav.php
@@ -5,6 +5,7 @@
                     <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=presse" <?php if($page == "presse") {echo('id="actuelle" ');} ?>>La Presse</a></li>

+                    <li><a href="index.php?page=livres" <?php if($page == "livres") {echo('id="actuelle" ');} ?>>Livres</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>