Merge branch 'SAAS-317-datatables-reorder' into 2.4.x

airtime_mvc/application/views/scripts/library/library.phtml

@@ -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>

airtime_mvc/public/js/airtime/library/library.js

@@ -413,7 +413,7 @@ var AIRTIME = (function(AIRTIME) {
                     
                     if (ele.bVisible) {
                         advanceSearchDiv.append(
-                            "<div id='advanced_search_col_"+currentColId+" class='control-group'>" +
+                            "<div id='advanced_search_col_"+currentColId+"' class='control-group'>" +
                                 "<label class='control-label'"+labelStyle+">"+ele.sTitle+" : </label>" +
                                 "<div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div>" +
                             "</div>");
@@ -447,15 +447,15 @@ var AIRTIME = (function(AIRTIME) {
         function setFilterElement(iColumn, bVisible){
             var actualId = colReorderMap[iColumn];
             var selector = "div#advanced_search_col_"+actualId;
+            var $el = $(selector);
+            
             if (bVisible) {
-                $(selector).show();
+                $el.show();
             } else {
-                $(selector).hide();
+                $el.hide();
             }
         }
         
-        var currentColOrder = new Array();
-        
         oTable = $libTable.dataTable( {
             
             // put hidden columns at the top to insure they can never be visible
@@ -764,7 +764,8 @@ var AIRTIME = (function(AIRTIME) {
                 "sAlign": "right",
                 "aiExclude": [0, 1, 2],
                 "sSize": "css",
-                "fnStateChange": setFilterElement
+                "fnStateChange": setFilterElement,
+                "buttonText": $.i18n._("Show / hide columns")
             },
             
             "oColReorder": {

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -817,17 +817,18 @@ var AIRTIME = (function(AIRTIME){
                 mod.checkToolBarIcons();
             },
             
+            // R = ColReorder, C = ColVis
+            "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
+            
             "oColVis": {
-                "aiExclude": [ 0, 1 ]
+                "aiExclude": [ 0, 1 ],
+                "buttonText": $.i18n._("Show / hide columns"),
             },
             
             "oColReorder": {
                 "iFixedColumns": 2
             },
-            
+             
-            // R = ColReorderResize, C = ColVis
-            "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>',
-            
             "sAjaxDataProp": "schedule",
             "oLanguage": datatables_dict,
             "sAjaxSource": baseUrl+"showbuilder/builder-feed"  

airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS

@@ -30,8 +30,4 @@ The new _fnDomBaseButton looks like this:
         
         return nButton;
     },
-    
+    
---------------------------------------------------------------------------------
-* Line 96 has changed
-- "buttonText": "Show / hide columns",
-+ "buttonText": $.i18n._("Show / hide columns"),

debian/watch

@@ -1,2 +1,2 @@
 version=3
-http://sf.net/airtime/airtime-([\d\.]+)\.tar\.gz
+http://sf.net/airtime/airtime-([\d\.]+)-ga\.tar\.gz