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:
Martin Konecny 2012-01-16 13:58:45 -05:00
commit 54ee177f7d
73 changed files with 8423 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/views/scripts/auth/password-change.phtml Normal file
View file

@ -0,0 +1 @@
<div><?php echo $this->form ?></div>

1
airtime_mvc/application/views/scripts/auth/password-restore-after.phtml Normal file
View file

@ -0,0 +1 @@
<div>Email sent</div>

1
airtime_mvc/application/views/scripts/auth/password-restore.phtml Normal file
View file

@ -0,0 +1 @@
<div><?php echo $this->form ?></div>

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

@ -33,12 +33,12 @@
</ul>
<?php endif; ?>
</dd>
<?php $watched_dirs = Application_Model_MusicDir::getWatchedDirs(); ?>
<?php $watched_dirs = Application_Model_MusicDir::getWatchedDirs(null, true); ?>
<?php if (count($watched_dirs) > 0): ?>
<?php foreach($watched_dirs as $watched_dir): ?>
<dd class="block-display selected-item">
<span><?php echo $watched_dir->getDirectory(); ?></span><span class="ui-icon ui-icon-close"></span>
<span><?php echo "< Exists? "; echo ($watched_dir->getExistsFlag())?"YES > : ":"NO > : ";?></span><span><?php echo $watched_dir->getDirectory();?></span></span><span class="ui-icon ui-icon-close"></span>
</dd>
<?php endforeach; ?>
<?php else: ?>

1
airtime_mvc/application/views/scripts/library/get-file-meta-data.ajax.phtml
View file

@ -15,6 +15,7 @@
<div><span>Copyright:</span><span><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></span></div>
<div><span>Isrc Number:</span><span><?php echo ($this->md["MDATA_KEY_ISRC"]);?></span></div>
<div><span>Website:</span><span><?php echo ($this->md["MDATA_KEY_URL"]);?></span></div>
<div><span>Language:</span><span><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></span></div>
<?php endif; ?>

1
airtime_mvc/application/views/scripts/playlist/update.phtml
View file

@ -17,6 +17,7 @@ if (count($items)) : ?>
</div>
<div class="text-row">
<span class="spl_artist"><?php echo $item["CcFiles"]['artist_name'] ?></span>
<span class="spl_artist"><?php echo ($item["CcFiles"]['file_exists'])?"":"NO FILE FOUND!" ?></span>
<span class="spl_offset"><?php echo $item["offset"]?></span>
</div>
<?php //create the crossfade icon.

6
airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
View file

@ -24,4 +24,10 @@
<?php $i=$i+1; ?>
<?php endforeach; ?>
</table>
<br/>
<div id="show_time_info">
<span id="show_time_filled" class="time"><?php echo $this->timeFilled; ?></span>
<div id="show_progressbar"></div>
<span id="show_length" class="time"><?php echo $this->showLength; ?></span>
</div>
</div>