keraudre/SAE_DEV2.2_2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of grond.iut-fbleau.fr:keraudre/SAE_DEV2.2_2024

Browse Source
This commit is contained in:
Enzo CHARMETTAN 2024-06-19 13:01:28 +02:00
commit aac3746a4f
4 changed files with 30 additions and 11 deletions

8
codeigniter/application/views/album_musics.php

@ -3,13 +3,13 @@
<?php foreach ($musics as $music): ?> <?php foreach ($musics as $music): ?>
<div> <div>
<article> <article>
<ul> <ul class="musics-album">
<li><?= $music->songName ?></li> <li><?= $music->songName ?></li>
<li>Durée: <?= $music->trackDuration ?> secondes</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> </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> </article>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>

2
codeigniter/application/views/albums_list.php

@ -39,7 +39,7 @@ foreach($albums as $album){
echo "<div><article>"; echo "<div><article>";
echo "<header class='short-text'>"; echo "<header class='short-text'>";
echo anchor("music/view/{$album->id}", "{$album->name}"); 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 "</header>";
echo '<img src="data:image/jpeg;base64,'.base64_encode($album->jpeg).'" />'; echo '<img src="data:image/jpeg;base64,'.base64_encode($album->jpeg).'" />';
echo "<footer class='short-text'>{$album->year} - {$album->artistName}</footer> echo "<footer class='short-text'>{$album->year} - {$album->artistName}</footer>

2
codeigniter/application/views/artistes_list.php

@ -53,7 +53,7 @@ foreach ($artistAlbums as $artistName => $albums) {
echo "<ul>"; echo "<ul>";
foreach ($albums as $album) { foreach ($albums as $album) {
echo "<li>" . anchor("music/view/{$album['albumId']}", $album['albumName']) . " - " . $album['year'] . "</li>"; 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 "</ul>";
echo "</article></div>"; echo "</article></div>";

25
codeigniter/assets/style.css

@ -17,7 +17,7 @@ section.list img {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
display: grid; display: grid;
grid-template-columns: 200px 5px auto; grid-template-columns: 200px auto;
grid-template-rows: auto auto; grid-template-rows: auto auto;
justify-content: space-between; justify-content: space-between;
} }
@ -242,8 +242,27 @@ margin-left: 50px;
} }
/* bouton ajouter sur les albums et musique */ /* bouton ajouter sur les albums et musique */
.ajout { .ajout-albums {
padding: 0; 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;
}