From 6cb7d134384f94b78ed995d8744f88eb7d66b6f9 Mon Sep 17 00:00:00 2001 From: polo Date: Fri, 22 Jul 2022 20:23:23 +0200 Subject: pages livres --- controller/admin.php | 7 ++++++ controller/visitor.php | 7 ++++++ index.php | 2 +- model/Article.php | 1 - public/css/accueil.css | 2 +- public/css/pages_articles_simples.css | 27 ++++++++++++++++++--- public/header_images/fille_qui_tombe.jpg | Bin 22520 -> 0 bytes public/header_images/fille_qui_tombe_livres.jpg | Bin 0 -> 24985 bytes public/header_images/fille_qui_tombe_mini.jpg | Bin 14105 -> 0 bytes .../header_images/fille_qui_tombe_mini_livres.jpg | Bin 0 -> 17214 bytes .../header_images/fille_qui_tombe_mini_presse.jpg | Bin 0 -> 14105 bytes public/header_images/fille_qui_tombe_petit.jpg | Bin 17566 -> 0 bytes .../header_images/fille_qui_tombe_petit_livres.jpg | Bin 0 -> 19593 bytes .../header_images/fille_qui_tombe_petit_presse.jpg | Bin 0 -> 17566 bytes public/header_images/fille_qui_tombe_presse.jpg | Bin 0 -> 22520 bytes view/nav.php | 1 + 16 files changed, 41 insertions(+), 6 deletions(-) delete mode 100644 public/header_images/fille_qui_tombe.jpg create mode 100644 public/header_images/fille_qui_tombe_livres.jpg delete mode 100644 public/header_images/fille_qui_tombe_mini.jpg create mode 100644 public/header_images/fille_qui_tombe_mini_livres.jpg create mode 100644 public/header_images/fille_qui_tombe_mini_presse.jpg delete mode 100644 public/header_images/fille_qui_tombe_petit.jpg create mode 100644 public/header_images/fille_qui_tombe_petit_livres.jpg create mode 100644 public/header_images/fille_qui_tombe_petit_presse.jpg create mode 100644 public/header_images/fille_qui_tombe_presse.jpg 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.jpg b/public/header_images/fille_qui_tombe.jpg deleted file mode 100644 index e572287..0000000 Binary files a/public/header_images/fille_qui_tombe.jpg and /dev/null differ 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 Binary files /dev/null and b/public/header_images/fille_qui_tombe_livres.jpg differ diff --git a/public/header_images/fille_qui_tombe_mini.jpg b/public/header_images/fille_qui_tombe_mini.jpg deleted file mode 100644 index c8be5ee..0000000 Binary files a/public/header_images/fille_qui_tombe_mini.jpg and /dev/null differ 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 Binary files /dev/null and b/public/header_images/fille_qui_tombe_mini_livres.jpg differ diff --git a/public/header_images/fille_qui_tombe_mini_presse.jpg b/public/header_images/fille_qui_tombe_mini_presse.jpg new file mode 100644 index 0000000..c8be5ee Binary files /dev/null and b/public/header_images/fille_qui_tombe_mini_presse.jpg differ diff --git a/public/header_images/fille_qui_tombe_petit.jpg b/public/header_images/fille_qui_tombe_petit.jpg deleted file mode 100644 index 29b22f3..0000000 Binary files a/public/header_images/fille_qui_tombe_petit.jpg and /dev/null differ 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 Binary files /dev/null and b/public/header_images/fille_qui_tombe_petit_livres.jpg differ diff --git a/public/header_images/fille_qui_tombe_petit_presse.jpg b/public/header_images/fille_qui_tombe_petit_presse.jpg new file mode 100644 index 0000000..29b22f3 Binary files /dev/null and b/public/header_images/fille_qui_tombe_petit_presse.jpg differ diff --git a/public/header_images/fille_qui_tombe_presse.jpg b/public/header_images/fille_qui_tombe_presse.jpg new file mode 100644 index 0000000..e572287 Binary files /dev/null and b/public/header_images/fille_qui_tombe_presse.jpg differ 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 @@
  • >Musique
  • >Discographie
  • >La Presse
  • +
  • >Livres
  • >J'aime
  • >Peinture
  • >Archives
  • -- cgit v1.2.3