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

Merge branch 'development'

Browse source
This commit is contained in:
nelsonlaquet 2013-09-08 03:16:56 -05:00
commit 2e1c88b842
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/Commands/EditTrackCommand.php
View file

@ -39,7 +39,7 @@
$rules = [
'title' => 'required|min:3|max:80',
'released_at' => 'before:today' . ($this->_input['released_at'] != "" ? '|date' : ''),
'released_at' => 'before:' . (date('Y-m-d', time() + (86400 * 2))) . (isset($this->_input['released_at']) && $this->_input['released_at'] != "" ? '|date' : ''),
'license_id' => 'required|exists:licenses,id',
'genre_id' => 'required|exists:genres,id',
'cover' => 'image|mimes:png|min_width:350|min_height:350',

3
public/templates/account/track.html
View file

@ -29,6 +29,7 @@
<label for="is_vocal" class="strong"><input ng-disabled="isSaving" ng-change="touchModel(); updateIsVocal()" id="is_vocal" type="checkbox" ng-model="edit.is_vocal" /> Is Vocal</label>
<textarea ng-disabled="isSaving" ng-change="touchModel()" ng-show="edit.is_vocal" ng-animate="'fade'" placeholder="Lyrics (required)" id="lyrics" ng-model="edit.lyrics"></textarea>
<div class="error">{{errors.lyrics}}</div>
<div class="error">{{errors.lyrics}}</div>
</div>
</div>
<div class="row-fluid">
@ -83,7 +84,7 @@
<label class="strong">Track Cover: </label>
<pfm-image-upload set-image="setCover" image="edit.cover" />
</div>
<div class="form-row span6">
<div class="form-row span6" ng-class="{'has-error': errors.released_at != null}">
<label for="released_at" class="strong">Release Date:</label>
<input ng-disabled="isSaving" type="text" id="released_at" ui-date ng-model="edit.released_at" ng-change="touchModel()" ui-date-format="yy-mm-dd" />
<div class="error">{{errors.released_at}}</div>

6
spa.pony.fm.iml
View file

@ -21,6 +21,8 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/http" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/parser" />
<excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/stream" />
<excludeFolder url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/ircmaxell/password-compat" />
<excludeFolder url="file://$MODULE_DIR$/vendor/kriswallsmith/assetic" />
<excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" />
@ -69,6 +71,8 @@
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
<root url="file://$MODULE_DIR$/vendor/predis/predis" />
<root url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<root url="file://$MODULE_DIR$/vendor/laravel/framework" />
<root url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<root url="file://$MODULE_DIR$/vendor/symfony/debug" />
@ -107,6 +111,8 @@
<root url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
<root url="file://$MODULE_DIR$/vendor/nesbot/carbon" />
<root url="file://$MODULE_DIR$/vendor/predis/predis" />
<root url="file://$MODULE_DIR$/vendor/intouch/newrelic" />
<root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" />
<root url="file://$MODULE_DIR$/vendor/laravel/framework" />
<root url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<root url="file://$MODULE_DIR$/vendor/symfony/debug" />