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

Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
This commit is contained in:
Martin Konecny 2012-11-02 20:16:54 -04:00
commit 9609a4e220
47 changed files with 5150 additions and 4769 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/library/library.phtml
View file

@ -1,6 +1,6 @@
<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
<div id="import_status" class="library_import" style="display:none">File import in progress...<img src=<?php $baseUrl . "/css/images/file_import_loader.gif"?>></img></div>
<fieldset class="toggle" id="filter_options">
<fieldset class="toggle closed" id="filter_options">
<legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
<div id="advanced_search" class="advanced_search form-horizontal"></div>
</fieldset>