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

Merged development into master

Browse source
This commit is contained in:
NelsonLaQuet 2013-09-01 04:18:08 -05:00
commit bbfcb16961
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/asset.php
View file

@ -42,10 +42,14 @@
$bundle->ensureFilter(new UglifyCssFilter(Config::get('app.uglify-css'), Config::get('app.node'))); $bundle->ensureFilter(new UglifyCssFilter(Config::get('app.uglify-css'), Config::get('app.node')));
$bundle->setTargetPath('styles'); $bundle->setTargetPath('styles');
} else { } else {
$node = Config::get('app.node');
if ($node == null)
$node = 'node';
$filePath = trim($_GET['file'], '/'); $filePath = trim($_GET['file'], '/');
$lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]); $lastModifiedCollection = new AssetCollection([new GlobAsset("styles/*.less")]);
$bundle = new AssetCollection([new FileAsset($filePath), new CacheBusterAsset($lastModifiedCollection->getLastModified())], $bundle = new AssetCollection([new FileAsset($filePath), new CacheBusterAsset($lastModifiedCollection->getLastModified())],
[new LessFilter(Config::get('app.node'), Config::get('app.node_paths'))]); [new LessFilter($node, Config::get('app.node_paths'))]);
$bundle->setTargetPath($filePath); $bundle->setTargetPath($filePath);
} }

2
public/scripts/app/services/upload.coffee
View file

@ -31,7 +31,7 @@ angular.module('ponyfm').factory('upload', [
if xhr.status != 200 if xhr.status != 200
error = error =
if xhr.getResponseHeader('content-type') == 'application/json' if xhr.getResponseHeader('content-type') == 'application/json'
$.parseJSON(xhr.responseText).message $.parseJSON(xhr.responseText).errors.track.join ', '
else else
'There was an unknown error!' 'There was an unknown error!'

13
public/templates/uploader/index.html
View file

@ -3,13 +3,21 @@
<p>Drop files here to begin your upload!</p> <p>Drop files here to begin your upload!</p>
</div> </div>
<p>FLAC, WAV, and AIFF files will be accepted. Each file can be up to 200 MB in size.</p>
<p>Tracks must be a <strong>minimum</strong> of 30 seconds long.</p>
<p>Please note that you need to publish your tracks after uploading them before they will become available to the public.</p>
<ul class="uploads"> <ul class="uploads">
<li ng-repeat="upload in data.queue" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isUploading && upload.error == null && upload.progress >= 100}" ng-animate="'upload-queue'"> <li ng-repeat="upload in data.queue" ng-class="{'uploading': upload.isUploading, 'has-error': upload.error != null, 'is-processing': upload.isUploading && upload.error == null && upload.progress >= 100}" ng-animate="'upload-queue'">
<p> <p>
<span ng-show="!upload.success"> <span ng-show="!upload.success">
<strong ng-show="upload.isUploading && upload.error == null && upload.progress >= 100">Processing</strong> <strong ng-show="upload.isUploading && upload.error == null && upload.progress >= 100">Processing</strong>
<strong ng-hide="upload.isUploading && upload.error == null && upload.progress >= 100">Uploading</strong> <strong ng-show="upload.isUploading && upload.error == null && upload.progress < 100">Uploading</strong>
{{upload.name}} <strong ng-show="upload.error != null">Error</strong>
{{upload.name}} -
<strong ng-show="upload.error != null">{{upload.error}}</strong>
</span> </span>
<span ng-show="upload.success"> <span ng-show="upload.success">
<a href="/account/tracks/edit/{{upload.trackId}}" class="btn btn-small btn-primary"> <a href="/account/tracks/edit/{{upload.trackId}}" class="btn btn-small btn-primary">
@ -18,7 +26,6 @@
{{upload.name}} {{upload.name}}
</span> </span>
</p> </p>
<p ng-show="upload.error != null">{{upload.error}}</p>
<div class="bar" pfm-progress-bar="upload.progress"></div> <div class="bar" pfm-progress-bar="upload.progress"></div>
</li> </li>
</ul> </ul>