From 2de2b87653dbfdd7da6e9edd28ef662a7e5d1256 Mon Sep 17 00:00:00 2001 From: Zeusking19 Date: Sun, 13 Dec 2015 13:42:37 +0000 Subject: [PATCH] Make changes in regards to #28 --- .gitignore | 1 + app/Album.php | 3 +- app/Playlist.php | 3 +- app/Track.php | 3 +- public/templates/albums/show.html | 2 +- public/templates/partials/credits-dialog.html | 1 + public/templates/playlists/show.html | 2 +- public/templates/tracks/show.html | 2 +- .../scripts/app/directives/colorbox.coffee | 20 ++++++----- .../scripts/app/directives/href-loader.coffee | 36 ------------------- 10 files changed, 22 insertions(+), 51 deletions(-) delete mode 100644 resources/assets/scripts/app/directives/href-loader.coffee diff --git a/.gitignore b/.gitignore index d44311e0..deb80874 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Homestead.yaml .env .vagrant _ide_helper.php +.idea \ No newline at end of file diff --git a/app/Album.php b/app/Album.php index 027f8188..f1c8c11d 100644 --- a/app/Album.php +++ b/app/Album.php @@ -174,7 +174,8 @@ class Album extends Model ], 'covers' => [ 'small' => $album->getCoverUrl(Image::SMALL), - 'normal' => $album->getCoverUrl(Image::NORMAL) + 'normal' => $album->getCoverUrl(Image::NORMAL), + 'original' => $album->getCoverUrl(Image::ORIGINAL) ], 'url' => $album->url, 'user' => [ diff --git a/app/Playlist.php b/app/Playlist.php index e223469f..042249e2 100644 --- a/app/Playlist.php +++ b/app/Playlist.php @@ -132,7 +132,8 @@ class Playlist extends Model ], 'covers' => [ 'small' => $playlist->getCoverUrl(Image::SMALL), - 'normal' => $playlist->getCoverUrl(Image::NORMAL) + 'normal' => $playlist->getCoverUrl(Image::NORMAL), + 'original' => $playlist->getCoverUrl(Image::ORIGINAL) ], 'url' => $playlist->url, 'user' => [ diff --git a/app/Track.php b/app/Track.php index 078d968a..57e43298 100644 --- a/app/Track.php +++ b/app/Track.php @@ -321,7 +321,8 @@ class Track extends Model 'covers' => [ 'thumbnail' => $track->getCoverUrl(Image::THUMBNAIL), 'small' => $track->getCoverUrl(Image::SMALL), - 'normal' => $track->getCoverUrl(Image::NORMAL) + 'normal' => $track->getCoverUrl(Image::NORMAL), + 'original' => $track->getCoverUrl(Image::ORIGINAL) ], 'streams' => [ 'mp3' => $track->getStreamUrl('MP3'), diff --git a/public/templates/albums/show.html b/public/templates/albums/show.html index 1de857ec..67ac3086 100644 --- a/public/templates/albums/show.html +++ b/public/templates/albums/show.html @@ -33,7 +33,7 @@
- +