diff --git a/ci/application/controllers/Albums.php b/ci/application/controllers/Albums.php index 5e832c0..0200e56 100644 --- a/ci/application/controllers/Albums.php +++ b/ci/application/controllers/Albums.php @@ -20,11 +20,8 @@ class Albums extends CI_Controller { if (empty($songs)) { $songs = []; } - - log_message('debug', 'Songs: ' . print_r($songs, true)); - $this->load->view('layout/header'); - $this->load->view('song_album_list', ['songs' => $songs]); + $this->load->view('song_album_list', ['songs' => $songs, 'album' => $album]); $this->load->view('layout/footer'); } } diff --git a/ci/application/controllers/Playlist.php b/ci/application/controllers/Playlist.php index 4af69bb..00b3648 100644 --- a/ci/application/controllers/Playlist.php +++ b/ci/application/controllers/Playlist.php @@ -10,16 +10,16 @@ class Playlist extends CI_Controller { public function index(){ $playlists = $this->model_music->getPlaylist(); - //$this->load->view('layout/header_album'); + // $this->load->view('layout/header'); $this->load->view('playlist_list', ['playlists' => $playlists]); - //$this->load->view('layout/footer_album'); + $this->load->view('layout/footer'); } public function view(){ $playlists = $this->model_music->deletePlaylist(); //$this->load->view('layout/header_album'); $this->load->view('playlist_list', ['playlists' => $playlists]); - //$this->load->view('layout/footer_album'); + $this->load->view('layout/footer'); } public function SongPlaylist($playlist_id){ @@ -37,6 +37,8 @@ class Playlist extends CI_Controller { public function MenuCreate() { //$this->load->view('layout/header_album'); $this->load->view('create_playlist'); + $this->load->view('layout/footer'); + } public function createPlaylistController() { diff --git a/ci/application/views/create_playlist.php b/ci/application/views/create_playlist.php index 27ee44b..ce0be49 100644 --- a/ci/application/views/create_playlist.php +++ b/ci/application/views/create_playlist.php @@ -1,10 +1,6 @@ -