Author: tkoomzaaskz
Date: 2010-02-24 10:49:50 +0100 (Wed, 24 Feb 2010)
New Revision: 28244
Added:
plugins/tdAudioPlugin/trunk/modules/td_track_album/templates/_album_play.php
Modified:
plugins/tdAudioPlugin/trunk/README
plugins/tdAudioPlugin/trunk/config/tdAudioPluginConfiguration.class.php
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackAlbumForm.class.php
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackForm.class.php
plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrack.class.php
plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrackAlbum.class.php
plugins/tdAudioPlugin/trunk/modules/tdSampleAudio/actions/actions.class.php
plugins/tdAudioPlugin/trunk/modules/td_track_album/actions/actions.class.php
plugins/tdAudioPlugin/trunk/modules/td_track_album/config/generator.yml
plugins/tdAudioPlugin/trunk/package.xml
Log:
[td][audio] release 0.1.6
Modified: plugins/tdAudioPlugin/trunk/README
===================================================================
--- plugins/tdAudioPlugin/trunk/README 2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/README 2010-02-24 09:49:50 UTC (rev 28244)
@@ -71,9 +71,6 @@
* _td_audio_upload_dir_ - upload dir of all audio files
- * _td_audio_short_text_sign_count_ - character count of a short track album
- descrtiption version
-
Translations
============
Modified:
plugins/tdAudioPlugin/trunk/config/tdAudioPluginConfiguration.class.php
===================================================================
--- plugins/tdAudioPlugin/trunk/config/tdAudioPluginConfiguration.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/config/tdAudioPluginConfiguration.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -22,8 +22,5 @@
// audio album cover upload dir
sfConfig::set('td_audio_cover_upload_dir',
sfConfig::get('sf_web_dir').'/uploads/td/cover');
-
- // track album short description sign count
- sfConfig::set('td_audio_short_text_sign_count', 200);
}
}
\ No newline at end of file
Modified:
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackAlbumForm.class.php
===================================================================
---
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackAlbumForm.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackAlbumForm.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -48,6 +48,9 @@
$this->setValidator('author',
new sfValidatorString(array(), array('required' => 'Musisz podać
autora.')));
+ $this->setValidator('description',
+ new sfValidatorString(array(), array('required' => 'Musisz podać opis
albumu.')));
+
$this->setValidator('file_cover', new sfValidatorFile(array(
'required' => false,
'path' => sfConfig::get('td_audio_cover_upload_dir'),
@@ -55,12 +58,6 @@
), array(
'required' => 'Musisz wybrać plik',
)));
-
-// $this->setValidator('text',
-// new sfValidatorString(array(), array('required' => 'Musisz podać treść
wpisu.')));
-//
-// $this->setValidator('email',
-// new sfValidatorEmail(array('required' => false), array('invalid' =>
'Musisz podać poprawny adres E-mail')));
}
protected function doBind(array $values)
@@ -101,9 +98,8 @@
{
unset($values['Tracks'][$index]);
unset($this->object['Tracks'][$index]);
- $track = Doctrine::getTable('tdTrack')->findOneById($id);
- unlink(sfConfig::get('td_audio_upload_dir').'/'.$track->getFile());
- $track->delete();
+ // removing track file inside tdTrack preDelete method
+ Doctrine::getTable('tdTrack')->findOneById($id)->delete();
}
}
Modified:
plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackForm.class.php
===================================================================
--- plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackForm.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/lib/form/doctrine/PlugintdTrackForm.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -15,6 +15,7 @@
{
parent::setup();
$this->removeFields();
+ $this->manageFields();
$this->manageHidden();
$this->manageDelete();
$this->manageFiles();
@@ -26,6 +27,15 @@
unset($this['created_at'], $this['updated_at']);
}
+ protected function manageFields()
+ {
+ $this->setWidget('description',
+ new sfWidgetFormTextarea(array(), array()));
+
+ $this->setValidator('title',
+ new sfValidatorString(array(), array('required' => 'Musisz podać
tytuł.')));
+ }
+
protected function manageHidden()
{
$this->widgetSchema['td_track_album_id'] = new sfWidgetFormInputHidden();
Modified: plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrack.class.php
===================================================================
--- plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrack.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrack.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -12,5 +12,15 @@
*/
abstract class PlugintdTrack extends BasetdTrack
{
-
+ /**
+ * Attempts to delete the mp3 track file before record is deleted.
+ *
+ * @param Doctrine_Event $event
+ */
+ public function preDelete($event)
+ {
+ $file_path = sfConfig::get('td_audio_upload_dir').'/'.$this->getFile();
+ if (file_exists($file_path))
+ unlink($file_path);
+ }
}
\ No newline at end of file
Modified:
plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrackAlbum.class.php
===================================================================
--- plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrackAlbum.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/lib/model/doctrine/PlugintdTrackAlbum.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -19,7 +19,7 @@
*/
public function getDescriptionShort()
{
- return tdTools::getMbShortenedString($this->getDescription(),
sfConfig::get('td_audio_short_text_sign_count'));
+ return tdTools::getMbShortenedString($this->getDescription(),
sfConfig::get('td_short_text_sign_count'));
}
/**
@@ -45,4 +45,17 @@
$this->save();
return true;
}
+
+ /**
+ * Deletes all tracks before deleting the whole album.
+ *
+ * @param Doctrine_Event $event
+ */
+ public function preDelete($event)
+ {
+ foreach($this->getTracks() as $track)
+ {
+ $track->delete();
+ }
+ }
}
\ No newline at end of file
Modified:
plugins/tdAudioPlugin/trunk/modules/tdSampleAudio/actions/actions.class.php
===================================================================
--- plugins/tdAudioPlugin/trunk/modules/tdSampleAudio/actions/actions.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/modules/tdSampleAudio/actions/actions.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -34,8 +34,6 @@
$this->getResponse()->addJavascript('/tdAudioPlugin/js/swfobject.js');
// ading default td_video layout
$this->getResponse()->addStylesheet('/tdAudioPlugin/css/td_audio.css');
- // adding default flowplayer stylesheet
- $this->getResponse()->addStylesheet('/tdAudioPlugin/?');
}
/**
Modified:
plugins/tdAudioPlugin/trunk/modules/td_track_album/actions/actions.class.php
===================================================================
---
plugins/tdAudioPlugin/trunk/modules/td_track_album/actions/actions.class.php
2010-02-24 08:24:15 UTC (rev 28243)
+++
plugins/tdAudioPlugin/trunk/modules/td_track_album/actions/actions.class.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -13,73 +13,81 @@
*/
class td_track_albumActions extends autoTd_track_albumActions
{
- /**
- * Activates selected track albums.
- *
- * @param sfWebRequest $request
- */
- public function executeBatchActivate(sfWebRequest $request)
- {
- $ids = $request->getParameter('ids');
- $query =
Doctrine::getTable('tdTrackAlbum')->getSelectedAlbumsQuery($ids);
- foreach ($query->execute() as $audio)
- {
- $audio->activate(true);
- }
+ public function executeEdit(sfWebRequest $request)
+ {
+ parent::executeEdit($request);
- $this->getUser()->setFlash('notice', 'The selected track albums have
been activated successfully.');
+ // adding js flash embedding script
+ $this->getResponse()->addJavascript('/tdAudioPlugin/js/swfobject.js');
+ // ading default td_video layout
+ $this->getResponse()->addStylesheet('/tdAudioPlugin/css/td_audio.css');
+ }
- $this->redirect('@td_track_album');
- }
+ /**
+ * Activates selected track albums.
+ *
+ * @param sfWebRequest $request
+ */
+ public function executeBatchActivate(sfWebRequest $request)
+ {
+ $ids = $request->getParameter('ids');
+ $query = Doctrine::getTable('tdTrackAlbum')->getSelectedAlbumsQuery($ids);
- /**
- * Deactivates selected track albums.
- *
- * @param sfWebRequest $request
- */
- public function executeBatchDeactivate(sfWebRequest $request)
+ foreach ($query->execute() as $audio)
{
- $ids = $request->getParameter('ids');
- $query =
Doctrine::getTable('tdTrackAlbum')->getSelectedAlbumsQuery($ids);
+ $audio->activate(true);
+ }
- foreach ($query->execute() as $audio)
- {
- $audio->deactivate(true);
- }
+ $this->getUser()->setFlash('notice', 'The selected track albums have been
activated successfully.');
+ $this->redirect('@td_track_album');
+ }
- $this->getUser()->setFlash('notice', 'The selected track albums have
been deactivated successfully.');
+ /**
+ * Deactivates selected track albums.
+ *
+ * @param sfWebRequest $request
+ */
+ public function executeBatchDeactivate(sfWebRequest $request)
+ {
+ $ids = $request->getParameter('ids');
+ $query = Doctrine::getTable('tdTrackAlbum')->getSelectedAlbumsQuery($ids);
- $this->redirect('@td_track_album');
+ foreach ($query->execute() as $audio)
+ {
+ $audio->deactivate(true);
}
- /**
- * Activates selected track album.
- *
- * @param sfWebRequest $request
- */
- public function executeListActivate(sfWebRequest $request)
- {
- $audio = $this->getRoute()->getObject();
- $audio->activate();
+ $this->getUser()->setFlash('notice', 'The selected track albums have been
deactivated successfully.');
+ $this->redirect('@td_track_album');
+ }
- $this->getUser()->setFlash('notice', 'The selected track album has
been activated successfully.');
+ /**
+ * Activates selected track album.
+ *
+ * @param sfWebRequest $request
+ */
+ public function executeListActivate(sfWebRequest $request)
+ {
+ $audio = $this->getRoute()->getObject();
+ $audio->activate();
- $this->redirect('@td_track_album');
- }
+ $this->getUser()->setFlash('notice', 'The selected track album has been
activated successfully.');
+ $this->redirect('@td_track_album');
+ }
- /**
- * Deactivates selected track album.
- *
- * @param sfWebRequest $request
- */
- public function executeListDeactivate(sfWebRequest $request)
- {
- $audio = $this->getRoute()->getObject();
- $audio->deactivate();
+ /**
+ * Deactivates selected track album.
+ *
+ * @param sfWebRequest $request
+ */
+ public function executeListDeactivate(sfWebRequest $request)
+ {
+ $audio = $this->getRoute()->getObject();
+ $audio->deactivate();
- $this->getUser()->setFlash('notice', 'The selected track album has
been deactivated successfully.');
+ $this->getUser()->setFlash('notice', 'The selected track album has been
deactivated successfully.');
- $this->redirect('@td_track_album');
- }
+ $this->redirect('@td_track_album');
+ }
}
Modified:
plugins/tdAudioPlugin/trunk/modules/td_track_album/config/generator.yml
===================================================================
--- plugins/tdAudioPlugin/trunk/modules/td_track_album/config/generator.yml
2010-02-24 08:24:15 UTC (rev 28243)
+++ plugins/tdAudioPlugin/trunk/modules/td_track_album/config/generator.yml
2010-02-24 09:49:50 UTC (rev 28244)
@@ -57,7 +57,7 @@
max_per_page: 10
layout: stacked
params: |
- <img src="/tdAudioPlugin/images/%%file_cover%%" />
+ <img src="/uploads/td/cover/%%file_cover%%" />
<br />
<strong>Nazwa</strong>: <i>%%name%%</i> %%active%%
<br />
@@ -83,6 +83,6 @@
attributes: { cols: 80, rows: 16 }
edit:
title: Edit track album
- display: [ name, author, description, file_cover, released_at, active,
Tracks, new ]
+ display: [ name, author, description, file_cover, _album_play,
released_at, active, Tracks, new ]
new:
title: New track album
Added:
plugins/tdAudioPlugin/trunk/modules/td_track_album/templates/_album_play.php
===================================================================
---
plugins/tdAudioPlugin/trunk/modules/td_track_album/templates/_album_play.php
(rev 0)
+++
plugins/tdAudioPlugin/trunk/modules/td_track_album/templates/_album_play.php
2010-02-24 09:49:50 UTC (rev 28244)
@@ -0,0 +1,18 @@
+<?php use_helper('Audio') ?>
+
+ <div id="flashPlayer" style="float: left;">
+ <script type="text/javascript">
+ var so = new SWFObject(
+ "<?php echo audio_path('swf/playerMultipleList.swf') ?>",
+ "mymovie",
+ "<?php echo sfConfig::get('app_audio_player_width') ?>",
+ "<?php echo sfConfig::get('app_audio_player_height') ?>",
+ "3",
+ "#FFFFFF");
+ so.addVariable("autoPlay", "no")
+ so.addVariable("playlistPath", "<?php echo
url_for('@td_sample_track_album_show_xml?id='.$form->getObject()->getId()) ?>")
+ so.write("flashPlayer");
+ </script>
+ </div>
+
+ <div style="clear: both;"></div>
\ No newline at end of file
Modified: plugins/tdAudioPlugin/trunk/package.xml
===================================================================
--- plugins/tdAudioPlugin/trunk/package.xml 2010-02-24 08:24:15 UTC (rev
28243)
+++ plugins/tdAudioPlugin/trunk/package.xml 2010-02-24 09:49:50 UTC (rev
28244)
@@ -10,10 +10,10 @@
<email>[email protected]</email>
<active>yes</active>
</lead>
- <date>2010-02-23</date>
+ <date>2010-02-24</date>
<time>11:00:00</time>
<version>
- <release>0.1.5</release>
+ <release>0.1.6</release>
<api>0.1.0</api>
</version>
<stability>
@@ -112,7 +112,9 @@
<file name="td_track_albumGeneratorConfiguration.class.php"
role="data" />
<file name="td_track_albumGeneratorHelper.class.php" role="data" />
</dir>
- <dir name="templates" />
+ <dir name="templates">
+ <file name="_album_play.php" role="data" />
+ </dir>
</dir>
</dir>
@@ -153,7 +155,7 @@
<package>
<name>tdCorePlugin</name>
<channel>plugins.symfony-project.org</channel>
- <min>0.1.8</min>
+ <min>0.1.9</min>
</package>
</required>
</dependencies>
@@ -165,6 +167,26 @@
<release>
<version>
+ <release>0.1.6</release>
+ <api>0.1.0</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.symfony-project.org/license";>MIT license</license>
+ <date>2010-02-24</date>
+ <license>MIT</license>
+ <notes>
+ * short description sign count moved to core
+ * added mp3 play widget inside admin generator edit panel
+ * deletion of the whole album involves deleting particular tracks with
their files
+ * validation updated
+ </notes>
+ </release>
+
+ <release>
+ <version>
<release>0.1.5</release>
<api>0.1.0</api>
</version>
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
