From 0a13363d279371ff6bcea1fdcfc40d9e9b147aa9 Mon Sep 17 00:00:00 2001
From: keraudre <yann.keraudren@etu-upec.fr>
Date: Wed, 19 Jun 2024 12:58:49 +0200
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20du=20CSS=20sur=20les=20bout?=
=?UTF-8?q?ons=20d'ajouts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../application/views/album_musics.php | 10 +++----
codeigniter/application/views/albums_list.php | 2 +-
.../application/views/artistes_list.php | 2 +-
codeigniter/assets/style.css | 27 ++++++++++++++++---
4 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/codeigniter/application/views/album_musics.php b/codeigniter/application/views/album_musics.php
index 1b70cc6..8782e67 100644
--- a/codeigniter/application/views/album_musics.php
+++ b/codeigniter/application/views/album_musics.php
@@ -3,14 +3,14 @@
<?php foreach ($musics as $music): ?>
<div>
<article>
- <ul>
+ <ul class="musics-album">
<li><?= $music->songName ?></li>
<li>Durée: <?= $music->trackDuration ?> secondes</li>
- <form action="<?= site_url('playlist/choose_playlist/' . $music->songId) ?>" method="get">
- <button type="submit">Ajouter à la Playlist</button>
- </form>
</ul>
+ <form action="<?= site_url('playlist/choose_playlist/' . $music->songId) ?>" method="get">
+ <button class='ajout-album-list'type="submit">Ajouter à la Playlist</button>
+ </form>
</article>
</div>
<?php endforeach; ?>
-</section>
\ No newline at end of file
+</section>
diff --git a/codeigniter/application/views/albums_list.php b/codeigniter/application/views/albums_list.php
index 5f37597..299b0ed 100644
--- a/codeigniter/application/views/albums_list.php
+++ b/codeigniter/application/views/albums_list.php
@@ -39,7 +39,7 @@ foreach($albums as $album){
echo "<div><article>";
echo "<header class='short-text'>";
echo anchor("music/view/{$album->id}", "{$album->name}");
- echo "<button class='ajout' onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album->id}") . "'\">Ajouter</button>";
+ echo "<button class='ajout-albums' onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album->id}") . "'\">Ajouter</button>";
echo "</header>";
echo '<img src="data:image/jpeg;base64,'.base64_encode($album->jpeg).'" />';
echo "<footer class='short-text'>{$album->year} - {$album->artistName}</footer>
diff --git a/codeigniter/application/views/artistes_list.php b/codeigniter/application/views/artistes_list.php
index de29c5c..9fc05b4 100644
--- a/codeigniter/application/views/artistes_list.php
+++ b/codeigniter/application/views/artistes_list.php
@@ -53,7 +53,7 @@ foreach ($artistAlbums as $artistName => $albums) {
echo "<ul>";
foreach ($albums as $album) {
echo "<li>" . anchor("music/view/{$album['albumId']}", $album['albumName']) . " - " . $album['year'] . "</li>";
- echo "<button onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album['albumId']}") . "'\">Ajouter toutes les chansons à la Playlist</button>";
+ echo "<button class='ajout-artistes' onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album['albumId']}") . "'\">Ajouter</button>";
}
echo "</ul>";
echo "</article></div>";
diff --git a/codeigniter/assets/style.css b/codeigniter/assets/style.css
index 84ca1c4..c7b4ee1 100644
--- a/codeigniter/assets/style.css
+++ b/codeigniter/assets/style.css
@@ -17,7 +17,7 @@ section.list img {
white-space: nowrap;
text-overflow: ellipsis;
display: grid;
- grid-template-columns: 200px 5px auto;
+ grid-template-columns: 200px auto;
grid-template-rows: auto auto;
justify-content: space-between;
}
@@ -240,8 +240,27 @@ section.playlists {
/* bouton ajouter sur les albums et musique */
-.ajout {
+.ajout-albums {
padding: 0;
- grid-column: 3/4;
+ margin-top: 5px;
+ grid-column: 2/3;
+ grid-row: 2/3;
+}
+
+.ajout-artistes {
+ padding: 0;
+ margin-bottom: 20px;
+ grid-column: 2/3;
+ grid-row: 2/3;
+}
+
+.ajout-album-list {
+ padding: 0;
+ margin-top: 10px;
+ grid-column: 2/3;
+ grid-row: 2/3;
+}
+
+.musics-album {
+ margin-bottom: 0;
}
-