CRM-13819 - Remove click-sort from tables where order matters

diff --git a/css/civicrm.css b/css/civicrm.css
index b7154fdc8cf0a1f9b1a7e3c0d4314ff375e699db..58bc42cb18ed9446153f116fc100d5a7b50c4c50 100644 (file)
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -3029,12 +3029,6 @@ div#crm-container form {
   padding-top: 3px;
 }
 
-.crm-container table.display thead th {
-  padding: 3px 0px 3px 10px;
-  cursor: pointer;
-  * cursor: hand;
-}
-
 .crm-container div.dataTables_wrapper .ui-widget-header {
   font-weight: normal;
 }
@@ -3118,7 +3112,10 @@ div#crm-container form {
   border-bottom: 1px solid black;
   font-weight: bold;
   cursor: pointer;
-  * cursor: hand;
+}
+
+.crm-container table.display thead th.sorting_disabled {
+  cursor: default;
 }
 
 .crm-container table.display tfoot th {

diff --git a/templates/CRM/common/jsortable.tpl b/templates/CRM/common/jsortable.tpl
index 5678b8cf6d60d65daa62448fd21a090a6b04c8e6..08286493ab10a8fbe42e3e8f5404a12ce168a77a 100644 (file)
--- a/templates/CRM/common/jsortable.tpl
+++ b/templates/CRM/common/jsortable.tpl
@@ -28,7 +28,7 @@
 cj( function( ) {
 // for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
 var useAjax = {/literal}{if $useAjax}1{else}0{/if}{literal};
-
+var sortEnabled = true;
 var sourceUrl = '';
 var useClass  = 'display';
 
@@ -76,6 +76,7 @@ eval('tableId =[' + tableId + ']');
                     sortColumn += '[' + count + ', "asc" ],';
                 }
                 sortId   = getRowId(tdObject, cj(this).attr('id') +' hiddenElement' );
+                sortEnabled = false;
                 columns += '{ "sType": \'' + stype + '\', "fnRender": function (oObj) { return oObj.aData[' + sortId + ']; },"bUseRendered": false},';
             break;
             case 'nosort':
@@ -160,6 +161,7 @@ eval('tableId =[' + tableId + ']');
                 "asStripClasses" : [ "odd-row", "even-row" ],
                 "bAutoWidth"   : false,
                 "aoColumns"   : columns,
+                "bSort" : sortEnabled,
             "oLanguage":{"sEmptyTable"  : noRecordFoundMsg,
                          "sZeroRecords" : noRecordFoundMsg }
               });