Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts: airtime_mvc/application/forms/SmartPlaylistCriteria.php
This commit is contained in:
commit
46294c3f40
2 changed files with 19 additions and 13 deletions
|
@ -1,5 +1,5 @@
|
|||
<form id="smart-playlist-form" method="post" action="">
|
||||
<fieldset class='toggle closed' id='smart_playlist_options'>
|
||||
<fieldset class='toggle closed' id='smart_playlist_options' style='overflow-x:auto; width:781px'>
|
||||
<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Playlist Options</legend>
|
||||
<dl class='zend_form'>
|
||||
<dd id='sp_type-element' class='radio-inline-list'>
|
||||
|
@ -28,7 +28,7 @@
|
|||
<?php if ($i != 0) { ?>
|
||||
<a href='#' id='criteria_remove_<?php echo $i ?>'>Remove </a>
|
||||
<?php } else { ?>
|
||||
<a href='#' id='criteria_add'>Add</a>
|
||||
<a href='#' id='criteria_add' class='criteria_add'>Add</a>
|
||||
<?php } ?>
|
||||
<br />
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue