diff options
| author | polo <ordipolo@gmx.fr> | 2022-07-22 20:23:23 +0200 |
|---|---|---|
| committer | polo <ordipolo@gmx.fr> | 2022-07-22 20:23:23 +0200 |
| commit | 6cb7d134384f94b78ed995d8744f88eb7d66b6f9 (patch) | |
| tree | f976a74da8c5eb35838696d8dc91942be131e025 | |
| parent | f76c0e9331a3f95039df29fbf2f8e6a6bafd60f4 (diff) | |
| download | melaine-6cb7d134384f94b78ed995d8744f88eb7d66b6f9.tar.gz melaine-6cb7d134384f94b78ed995d8744f88eb7d66b6f9.tar.bz2 melaine-6cb7d134384f94b78ed995d8744f88eb7d66b6f9.zip | |
pages livres
| -rw-r--r-- | controller/admin.php | 7 | ||||
| -rw-r--r-- | controller/visitor.php | 7 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | model/Article.php | 1 | ||||
| -rw-r--r-- | public/css/accueil.css | 2 | ||||
| -rw-r--r-- | public/css/pages_articles_simples.css | 27 | ||||
| -rw-r--r-- | public/header_images/fille_qui_tombe_livres.jpg | bin | 0 -> 24985 bytes | |||
| -rw-r--r-- | public/header_images/fille_qui_tombe_mini_livres.jpg | bin | 0 -> 17214 bytes | |||
| -rw-r--r-- | public/header_images/fille_qui_tombe_mini_presse.jpg (renamed from public/header_images/fille_qui_tombe_mini.jpg) | bin | 14105 -> 14105 bytes | |||
| -rw-r--r-- | public/header_images/fille_qui_tombe_petit_livres.jpg | bin | 0 -> 19593 bytes | |||
| -rw-r--r-- | public/header_images/fille_qui_tombe_petit_presse.jpg (renamed from public/header_images/fille_qui_tombe_petit.jpg) | bin | 17566 -> 17566 bytes | |||
| -rw-r--r-- | public/header_images/fille_qui_tombe_presse.jpg (renamed from public/header_images/fille_qui_tombe.jpg) | bin | 22520 -> 22520 bytes | |||
| -rw-r--r-- | view/nav.php | 1 |
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) | |||
| 121 | $headerPaintedTitle = 'La Presse'; | 121 | $headerPaintedTitle = 'La Presse'; |
| 122 | pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression); | 122 | pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression); |
| 123 | } | 123 | } |
| 124 | function livresEdit($fileCode, $suppression) | ||
| 125 | { | ||
| 126 | $page = "livres"; | ||
| 127 | $title = "Livres"; | ||
| 128 | $headerPaintedTitle = 'Dans les livres'; | ||
| 129 | pageArticlesSimplesAdmin($page, $title, $headerPaintedTitle, $fileCode, $suppression); | ||
| 130 | } | ||
| 124 | function jaimeEdit($fileCode, $suppression) | 131 | function jaimeEdit($fileCode, $suppression) |
| 125 | { | 132 | { |
| 126 | $page = "jaime"; | 133 | $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() | |||
| 77 | $headerPaintedTitle = 'La Presse'; | 77 | $headerPaintedTitle = 'La Presse'; |
| 78 | pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle); | 78 | pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle); |
| 79 | } | 79 | } |
| 80 | function livresVisitor() | ||
| 81 | { | ||
| 82 | $page = "livres"; | ||
| 83 | $title = "Livres"; | ||
| 84 | $headerPaintedTitle = 'Dans les livres'; | ||
| 85 | pageArticlesSimplesVisitor($page, $title, $headerPaintedTitle); | ||
| 86 | } | ||
| 80 | function jaimeVisitor() | 87 | function jaimeVisitor() |
| 81 | { | 88 | { |
| 82 | $page = "jaime"; | 89 | $page = "jaime"; |
| @@ -100,7 +100,7 @@ else | |||
| 100 | // page du site demandée | 100 | // page du site demandée |
| 101 | if(isset($_GET['page'])) | 101 | if(isset($_GET['page'])) |
| 102 | { | 102 | { |
| 103 | $pagesArticlesSimples = ['menu', 'melaine', 'musique', 'presse', 'jaime', 'peinture', 'archives', 'legal']; | 103 | $pagesArticlesSimples = ['menu', 'melaine', 'musique', 'presse', 'livres', 'jaime', 'peinture', 'archives', 'legal']; |
| 104 | 104 | ||
| 105 | // page d'accueil | 105 | // page d'accueil |
| 106 | if($_GET['page'] == 'accueil') | 106 | 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 | |||
| 109 | } | 109 | } |
| 110 | public function readOne() | 110 | public function readOne() |
| 111 | { | 111 | { |
| 112 | //return(file_get_contents($this->fileName)); | ||
| 113 | return(file_get_contents('data/' . $this->page . '/' . $this->format . '/' . $this->fileCode . '.' . $this->format)); | 112 | return(file_get_contents('data/' . $this->page . '/' . $this->format . '/' . $this->fileCode . '.' . $this->format)); |
| 114 | } | 113 | } |
| 115 | 114 | ||
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 | |||
| 422 | } | 422 | } |
| 423 | .police_titre:not(.police_titre_header) | 423 | .police_titre:not(.police_titre_header) |
| 424 | { | 424 | { |
| 425 | padding-top: 10px; | 425 | /*padding-top: 10px;*/ |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | #bienvenue .police_titre | 428 | #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 | |||
| 117 | } | 117 | } |
| 118 | #photo_presse | 118 | #photo_presse |
| 119 | { | 119 | { |
| 120 | background-image: url('../header_images/fille_qui_tombe.jpg'); | 120 | background-image: url('../header_images/fille_qui_tombe_presse.jpg'); |
| 121 | width: 208px; | ||
| 122 | height: 163px; | ||
| 123 | margin-left: auto; | ||
| 124 | } | ||
| 125 | #photo_livres | ||
| 126 | { | ||
| 127 | background-image: url('../header_images/fille_qui_tombe_livres.jpg'); | ||
| 121 | width: 208px; | 128 | width: 208px; |
| 122 | height: 163px; | 129 | height: 163px; |
| 123 | margin-left: auto; | 130 | margin-left: auto; |
| @@ -176,7 +183,14 @@ figure | |||
| 176 | } | 183 | } |
| 177 | #photo_presse | 184 | #photo_presse |
| 178 | { | 185 | { |
| 179 | background-image: url('../header_images/fille_qui_tombe_petit.jpg'); | 186 | background-image: url('../header_images/fille_qui_tombe_petit_presse.jpg'); |
| 187 | width: 158px; | ||
| 188 | height: 124px; | ||
| 189 | margin: 0 0 0 auto; | ||
| 190 | } | ||
| 191 | #photo_livres | ||
| 192 | { | ||
| 193 | background-image: url('../header_images/fille_qui_tombe_petit_livres.jpg'); | ||
| 180 | width: 158px; | 194 | width: 158px; |
| 181 | height: 124px; | 195 | height: 124px; |
| 182 | margin: 0 0 0 auto; | 196 | margin: 0 0 0 auto; |
| @@ -234,7 +248,14 @@ figure | |||
| 234 | } | 248 | } |
| 235 | #photo_presse | 249 | #photo_presse |
| 236 | { | 250 | { |
| 237 | background-image: url('../header_images/fille_qui_tombe_mini.jpg'); | 251 | background-image: url('../header_images/fille_qui_tombe_mini_presse.jpg'); |
| 252 | width: 105px; | ||
| 253 | height: 82px; | ||
| 254 | margin: 0 0 0 auto; | ||
| 255 | } | ||
| 256 | #photo_livres | ||
| 257 | { | ||
| 258 | background-image: url('../header_images/fille_qui_tombe_mini_livres.jpg'); | ||
| 238 | width: 105px; | 259 | width: 105px; |
| 239 | height: 82px; | 260 | height: 82px; |
| 240 | margin: 0 0 0 auto; | 261 | 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 | |||
| Binary files 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 --- /dev/null +++ b/public/header_images/fille_qui_tombe_mini_livres.jpg | |||
| Binary files differ | |||
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 | |||
| Binary files 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 --- /dev/null +++ b/public/header_images/fille_qui_tombe_petit_livres.jpg | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 | |||
| Binary files 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 @@ | |||
| 5 | <li><a href="index.php?page=musique" <?php if($page == "musique") {echo('id="actuelle" ');} ?>>Musique</a></li> | 5 | <li><a href="index.php?page=musique" <?php if($page == "musique") {echo('id="actuelle" ');} ?>>Musique</a></li> |
| 6 | <li><a href="index.php?page=discographie" <?php if($page == "discographie") {echo('id="actuelle" ');} ?>>Discographie</a></li> | 6 | <li><a href="index.php?page=discographie" <?php if($page == "discographie") {echo('id="actuelle" ');} ?>>Discographie</a></li> |
| 7 | <li><a href="index.php?page=presse" <?php if($page == "presse") {echo('id="actuelle" ');} ?>>La Presse</a></li> | 7 | <li><a href="index.php?page=presse" <?php if($page == "presse") {echo('id="actuelle" ');} ?>>La Presse</a></li> |
| 8 | <li><a href="index.php?page=livres" <?php if($page == "livres") {echo('id="actuelle" ');} ?>>Livres</a></li> | ||
| 8 | <li><a href="index.php?page=jaime" <?php if($page == "jaime") {echo('id="actuelle" ');} ?>>J'aime</a></li> | 9 | <li><a href="index.php?page=jaime" <?php if($page == "jaime") {echo('id="actuelle" ');} ?>>J'aime</a></li> |
| 9 | <li><a href="index.php?page=peinture" <?php if($page == "peinture") {echo('id="actuelle" ');} ?>>Peinture</a></li> | 10 | <li><a href="index.php?page=peinture" <?php if($page == "peinture") {echo('id="actuelle" ');} ?>>Peinture</a></li> |
| 10 | <li><a href="index.php?page=archives" <?php if($page == "archives") {echo('id="actuelle" ');} ?>>Archives</a></li> | 11 | <li><a href="index.php?page=archives" <?php if($page == "archives") {echo('id="actuelle" ');} ?>>Archives</a></li> |
