PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-29 08:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

started work on embeds

Browse source
This commit is contained in:
nelsonlaquet 2013-08-30 22:16:16 -05:00
parent c2f482e8a8
commit f9be5c4728
6 changed files with 90 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/TracksController.php
View file

@ -9,6 +9,14 @@
return View::make('tracks.index'); return View::make('tracks.index');
} }
public function getEmbed($id) {
$track = Track::find($id);
if (!$track || !$track->canView(Auth::user()))
App::abort(404);
return View::make('tracks.embed', ['track' => $track]);
}
public function getTrack($id, $slug) { public function getTrack($id, $slug) {
$track = Track::find($id); $track = Track::find($id);
if (!$track || !$track->canView(Auth::user())) if (!$track || !$track->canView(Auth::user()))

2
app/models/Entities/Track.php
View file

@ -114,7 +114,7 @@
$returnValue['share'] = [ $returnValue['share'] = [
'url' => URL::to('/t' . $track->id), 'url' => URL::to('/t' . $track->id),
'html' => '<iframe src="https://pony.fm/t' . $track->id . '/embed" width="100%" height="150" allowTransparency="true" frameborder="0" seamless allowfullscreen></iframe>', 'html' => '<iframe src="' . URL::to('t' . $track->id . '/embed') . '" width="100%" height="150" allowTransparency="true" frameborder="0" seamless allowfullscreen></iframe>',
'bbcode' => '[url=' . $track->url . '][img]' . $track->getCoverUrl() . '[/img][/url]', 'bbcode' => '[url=' . $track->url . '][img]' . $track->getCoverUrl() . '[/img][/url]',
'twitterUrl' => 'https://platform.twitter.com/widgets/tweet_button.html?text=' . $track->title . ' by ' . $track->user->display_name . ' on Pony.fm' 'twitterUrl' => 'https://platform.twitter.com/widgets/tweet_button.html?text=' . $track->title . ' by ' . $track->user->display_name . ' on Pony.fm'
]; ];

1
app/routes.php
View file

@ -22,6 +22,7 @@
Route::get('tracks/{id}-{slug}', 'TracksController@getTrack'); Route::get('tracks/{id}-{slug}', 'TracksController@getTrack');
Route::get('t{id}', 'TracksController@getShortlink' ); Route::get('t{id}', 'TracksController@getShortlink' );
Route::get('t{id}/embed', 'TracksController@getEmbed' );
Route::get('t{id}/stream', 'TracksController@getStream' ); Route::get('t{id}/stream', 'TracksController@getStream' );
Route::get('t{id}/dl.{extension}', 'TracksController@getDownload' ); Route::get('t{id}/dl.{extension}', 'TracksController@getDownload' );

78
app/views/tracks/embed.blade.php Normal file
View file

@ -0,0 +1,78 @@
<!DOCTYPE html>
<html lang="en-CA">
<head>
<meta charset="UTF-8">
<title>@section('title')Pony.fm
@yield_section</title>
<meta itemprop="name" content="Pony.fm">
{{-- <meta itemprop="image" content="https://pony.fm/favicon.ico"> --}}
<meta property="og:title" content="Pony.fm - The Pony Music Hosting Site" />
<meta property="og:type" content="website" />
<meta property="og:url" content="https://pony.fm/" />
<meta property="og:image" content="https://pony.fm/favicon.ico" />
<meta property="og:site_name" content="Pony.fm" />
<meta property="fb:admins" content="1165335382" />
{{ HTML::style( 'css/app-embed.css?' . filemtime(path('public').'/css/app.css') ) }}
{{ Asset::styles() }}
<?php Asset::add('jquery', 'https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js'); ?>
<?php Asset::add('jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.0/jquery-ui.min.js', 'jquery'); ?>
<?php Asset::add('scripts', 'js/app.js?' . filemtime(path('public').'/js/app.js'), 'jquery'); ?>
</head>
<body class="embed">
<div class="fixed-image-width">
@if($track->explicit && !(Auth::check() && Auth::user()->can_see_explicit_content))
<div class="explicit alert-box alert">
<em>Enable explicit content in {{ HTML::link(URL::to_action('account@edit'), 'your account', ['target' => '_blank']) }} to play this track.</em>
<div class="stats">
<span>Hosted by <a href="{{URL::to('/')}}" target="_blank">Pony.fm</a></span>
</div>
</div>
@else
<div class="player-small {{Auth::check() ? 'can-favourite' : ''}} {{Track_Plays::hasPlayed($track->id) ? 'played' : 'unplayed'}} {{Track_Plays::hasFavourited($track->id) ? 'favourited' : ''}}" data-track-id="{{ $track->id }}" data-duration="{{ $track->duration * 1000 }}">
<div class="play" disabled="disabled">
<div><i class="icon-play icon-1x"></i></div>
{{ HTML::image($track->get_cover_url('normal')) }}
</div>
<div class="meta">
@if (Auth::check())
<a href="#" class="favourite"><i title="Favourite this track!" class="favourite-icon icon-star-empty"></i></a>
@endif
<div class="progressbar">
<div class="progress-container">
<div class="loader"></div>
<div class="seeker"></div>
</div>
</div>
<span class="title">{{ HTML::link( $track->url, $track->title, ['target' => '_blank'] ) }}</span>
<span>by: <strong>{{ HTML::link($track->user->url, $track->artist, ['target' => '_blank']) }}</strong> / {{ HTML::link($track->genre->url, $track->genre->title, ['target' => '_blank']) }} / {{ HTML::timestamp($track->published_at) }}</span>
<div class="clear"></div>
</div>
<div class="stats">
Views: <strong>{{ $track->views }}</strong> / Plays: <strong>{{ $track->plays }}</strong> / Downloads: <strong>{{ $track->downloads }}</strong> /
<span>Hosted by <a href="{{URL::to('/')}}" target="_blank">Pony.fm</a></span>
</div>
</div>
@endif
</div>
<script>
var pfm = {token: '{{ Session::token() }}'}
</script>
{{ Asset::scripts() }}
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-29463256-1']);
_gaq.push(['_setDomainName', 'pony.fm']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</body>
</html>

2
public/templates/albums/show.html
View file

@ -8,7 +8,7 @@
<li bindonce ng-repeat="format in album.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li> <li bindonce ng-repeat="format in album.formats"><a target="_blank" bo-href="format.url"><span bo-text="format.name"></span> <small bo-text="'(' + format.size + ')'"></small></a></li>
</ul> </ul>
</li> </li>
<li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share or Embed</a></li> <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li>
<li><pfm-favourite-button resource="album" type="album"></pfm-favourite-button></li> <li><pfm-favourite-button resource="album" type="album"></pfm-favourite-button></li>
<li bo-show="album.permissions.edit"><a class="btn btn-small" bo-href="'/account/albums/edit/' + album.id">Edit</a></li> <li bo-show="album.permissions.edit"><a class="btn btn-small" bo-href="'/account/albums/edit/' + album.id">Edit</a></li>
</ul> </ul>

2
public/templates/tracks/show.html
View file

@ -22,7 +22,7 @@
<li><a href="#" class="add-btn" pfm-eat-click ng-click="addToNewPlaylist()">Add to New Playlist</a></li> <li><a href="#" class="add-btn" pfm-eat-click ng-click="addToNewPlaylist()">Add to New Playlist</a></li>
</ul> </ul>
</li> </li>
<li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share</a></li> <li><a href="#" class="btn" pfm-eat-click ng-click="share()">Share or Embed</a></li>
<li><pfm-favourite-button resource="track" type="track"></pfm-favourite-button></li> <li><pfm-favourite-button resource="track" type="track"></pfm-favourite-button></li>
<li bo-show="track.permissions.edit"><a class="btn btn-small" bo-href="'/account/tracks/edit/' + track.id">Edit</a></li> <li bo-show="track.permissions.edit"><a class="btn btn-small" bo-href="'/account/tracks/edit/' + track.id">Edit</a></li>
</ul> </ul>