Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2011-09-22 13:40:32 -04:00
commit 95a2c179c2
23 changed files with 125 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
View file

@ -16,7 +16,7 @@
</ul>
<?php endif; ?>
</dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
<dt id="watchedFolder-label" class="block-display">
<label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
@ -33,7 +33,7 @@
</ul>
<?php endif; ?>
</dd>
<?php $watched_dirs = MusicDir::getWatchedDirs(); ?>
<?php $watched_dirs = Application_Model_MusicDir::getWatchedDirs(); ?>
<?php if (count($watched_dirs) > 0): ?>
<?php foreach($watched_dirs as $watched_dir): ?>