From 942cfaac25bd3e5faac98901a08947fff07d6969 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Thu, 2 Feb 2012 01:29:50 +0100
Subject: [PATCH] CC-3174 : show builder

moving columns around in library to look better.
---
 airtime_mvc/application/models/StoredFile.php            | 3 ++-
 .../js/airtime/library/events/library_playlistbuilder.js | 3 +--
 airtime_mvc/public/js/airtime/library/library.js         | 9 ++++-----
 airtime_mvc/public/js/airtime/showbuilder/builder.js     | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index dfa858ec8..afe7d1489 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -772,7 +772,8 @@ class Application_Model_StoredFile {
 		      unset($columnsDisplayed[$key]);
 		  }
 		}
-		$selectorRows = "SELECT " . join(',', $columnsDisplayed );
+		//$selectorRows = "SELECT " . join(',', $columnsDisplayed );
+		$selectorRows = "SELECT * ";
 
         $sql = $selectorCount." FROM ".$fromTable;
 		$totalRows = $CC_DBC->getOne($sql);
diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index 065ec4d17..81a8516b7 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -6,7 +6,7 @@ function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFul
 }
 
 function fnLibraryTableDrawCallback() {
-    addMetadataQtip();
+	addLibraryItemEvents();
 }
 
 function addLibraryItemEvents() {
@@ -44,5 +44,4 @@ function setupLibraryToolbar(oTable) {
 	addToolBarButtonsLibrary(aButtons);
 	
 	oSettings = oTable.fnSettings();
-    oSettings.fnServerData.start = oRange.start;
 }
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 0a525cb45..6b9918d78 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -324,16 +324,15 @@ function createDataTable(data) {
 		
 		"aoColumns": [
                 /* Checkbox */      {"sTitle": "<input type='checkbox' name='pl_cb_all'>", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"},
-                /* Id */            {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"},
+                /* Type */          {"sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"},
                 /* Title */         {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"},
                 /* Creator */       {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"},
                 /* Album */         {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"},
                 /* Genre */         {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sWidth": "10%", "sClass": "library_genre"},
                 /* Year */          {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sWidth": "8%", "sClass": "library_year"},
                 /* Length */        {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sWidth": "10%", "sClass": "library_length"},
-                /* Type */          {"sTitle": "", "sName": "ftype", "bSearchable": false, "mDataProp": "image", "sWidth": "25px", "sClass": "library_type"},
                 /* Upload Time */   {"sTitle": "Upload Time", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"},
-                /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"},
+                /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}
             ],
 		"aaSorting": [[2,'asc']],
 		"sPaginationType": "full_numbers",
@@ -375,13 +374,13 @@ function createDataTable(data) {
         "oColVis": {
             "buttonText": "Show/Hide Columns",
             "sAlign": "right",
-            "aiExclude": [0, 1, 2],
+            "aiExclude": [0, 1],
             "sSize": "css",
             "bShowAll": true
 		},
 		
 		"oColReorder": {
-			"iFixedColumns": 1
+			"iFixedColumns": 2
 		}
 		
     });
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index a12f31bc0..f27a560a8 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -232,7 +232,7 @@ $(document).ready(function() {
 		},
 		
 		"oColReorder": {
-			"iFixedColumns": 1
+			"iFixedColumns": 2
 		},
 		
 		"oTableTools": {