Merge branch '2.4.x' into 2.4.x-saas

This commit is contained in:
Martin Konecny 2013-05-22 16:09:02 -04:00
commit 254d3b8950
47 changed files with 1204 additions and 1135 deletions

View file

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