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

CC-3340 : Remove "Search" tab from library view

This commit is contained in:
Naomi Aro 2012-02-22 21:56:55 +01:00
parent bb49914294
commit c89451f880
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/layouts/scripts/library.phtml
View File

@ -22,7 +22,7 @@
<div class="wrapper"> <div class="wrapper">
<!--Set to z-index 254 to make it lower than the top-panel and the ZFDebug info bar, but higher than the side-playlist--> <!--Set to z-index 254 to make it lower than the top-panel and the ZFDebug info bar, but higher than the side-playlist-->
<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded" style="z-index:254"><?php echo $this->layout()->library ?></div> <div id="library_content" class="ui-widget ui-widget-content block-shadow alpha-block padded" style="z-index:254"><?php echo $this->layout()->library ?></div>
<div id="side_playlist" class="ui-widget ui-widget-content block-shadow omega-block"><?php echo $this->layout()->spl ?></div> <div id="side_playlist" class="ui-widget ui-widget-content block-shadow omega-block"><?php echo $this->layout()->spl ?></div>
</div> </div>
</body> </body>

10
airtime_mvc/application/views/scripts/library/library.phtml
View File

@ -1,7 +1,3 @@
<ul> <div id="import_status" style="display:none">File import in progress...</div>
<li><a href="#simpleSearch">Search</a></li> <table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
</ul>
<div id="simpleSearch">
<div id="import_status" style="visibility:hidden">File import in progress...</div>
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>

9
airtime_mvc/public/js/airtime/library/library.js
View File

@ -83,9 +83,10 @@ function checkImportStatus(){
$.getJSON('/Preference/is-import-in-progress', function(data){ $.getJSON('/Preference/is-import-in-progress', function(data){
var div = $('#import_status'); var div = $('#import_status');
if (data == true){ if (data == true){
div.css('visibility', 'visible'); div.show();
}else{ }
div.css('visibility', 'hidden'); else{
div.hide();
} }
}); });
} }
@ -214,8 +215,6 @@ function addQtipToSCIcons(){
$(document).ready(function() { $(document).ready(function() {
var oTable; var oTable;
$('.tabs').tabs();
oTable = $('#library_display').dataTable( { oTable = $('#library_display').dataTable( {
"aoColumns": [ "aoColumns": [