diff --git a/ci/application/controllers/Chansons.php b/ci/application/controllers/Chansons.php index 992e9d6..5dab478 100644 --- a/ci/application/controllers/Chansons.php +++ b/ci/application/controllers/Chansons.php @@ -14,4 +14,11 @@ class Albums extends CI_Controller { $this->load->view('layout/footer_chanson'); } + public function view($AlbumsOfArtistId){ + $AlbumsOfArtists = $this->model_music->getAlbumsOfArtist($AlbumsOfArtistId); + $this->load->view('layout/header'); + $this->load->view('albums_artist_list',['AlbumsOfArtists'=>$AlbumsOfArtists]); + $this->load->view('layout/footer'); + } + } diff --git a/ci/application/controllers/Song.php b/ci/application/controllers/Song.php index 77b552a..82d44d3 100644 --- a/ci/application/controllers/Song.php +++ b/ci/application/controllers/Song.php @@ -14,4 +14,4 @@ class Song extends CI_Controller { $this->load->view('song_album_list',['songs'=>$songs]); $this->load->view('layout/footer'); } -} \ No newline at end of file +} diff --git a/ci/application/controllers/connexion.php b/ci/application/controllers/connexion.php new file mode 100644 index 0000000..a7cc2be --- /dev/null +++ b/ci/application/controllers/connexion.php @@ -0,0 +1,14 @@ +load->model('model_music'); + } + public function index(){ + $this->load->view('layout/connexion'); + } + +} diff --git a/ci/application/views/Welcome.php b/ci/application/views/Welcome.php index 8fbee6c..d762ec3 100644 --- a/ci/application/views/Welcome.php +++ b/ci/application/views/Welcome.php @@ -7,22 +7,36 @@
-
+
- Connexion - S'inscrire -
+ Connexion + S'inscrire +
diff --git a/ci/application/views/albums_artist_list.php b/ci/application/views/albums_artist_list.php index d1d9c81..b2868f9 100644 --- a/ci/application/views/albums_artist_list.php +++ b/ci/application/views/albums_artist_list.php @@ -1,5 +1,4 @@ -
Liste des albums
id}", "{$AlbumsOfArtist->name}"); echo "
"; echo "
"; + echo '' . $AlbumsOfArtist->name . ''; echo ""; echo ""; diff --git a/ci/application/views/albums_list.php b/ci/application/views/albums_list.php index ad8709b..20cac90 100644 --- a/ci/application/views/albums_list.php +++ b/ci/application/views/albums_list.php @@ -1,4 +1,4 @@ -
Liste des albums
+
Artists list +
+ + + + + Connexion Spotify + + + +
+ +
+ + diff --git a/ci/application/views/layout/header.php b/ci/application/views/layout/header.php index 6d33305..29698f6 100644 --- a/ci/application/views/layout/header.php +++ b/ci/application/views/layout/header.php @@ -17,20 +17,34 @@
- Connexion - S'inscrire -
- + Connexion + S'inscrire + + +
-593; - - - \ No newline at end of file + + + diff --git a/ci/application/views/song_album_list.php b/ci/application/views/song_album_list.php index 9c3cc4a..bd87cf4 100644 --- a/ci/application/views/song_album_list.php +++ b/ci/application/views/song_album_list.php @@ -1,15 +1,14 @@ -
Song of the album
+
"; echo "
"; - echo /*anchor("albums/view/{$song->id}",*/"{$song->name}"/*)*/; + echo "{$song->name}"; + echo " "; echo "
"; echo "
"; echo "
"; } ?> -
\ No newline at end of file + diff --git a/ci/application/views/song_playlist.php b/ci/application/views/song_playlist.php index 73ebae0..0054f4a 100644 --- a/ci/application/views/song_playlist.php +++ b/ci/application/views/song_playlist.php @@ -1,4 +1,4 @@ -
Song of the playlist
+