Merge branch 'fix/436' into 'master'

fix #436 also remove ordering from columns in mail template

See merge request NCER-PD/scheduling-system!334

CHANGELOG

 smasch (1.1.0~alpha.0-1) unstable; urgency=low
 
+  * improvement: remove sorting from columns that do not require sorting in
+    mail template menu and languages menu (#436)
+  * improvement: added explanatory tooltip for the column `order` in language
+    menu (#436)
   * improvement: warn the user on invalid date range when creating a
     holidays/extra availability (#427)
   * improvement: user can modify/add Subject types with custom follow up schema

smash/web/templates/languages/list.html

@@ -29,11 +29,11 @@
             <tr>
                 <th>Id</th>
                 <th>Name</th>
-                <th>Flag</th>
-                <th>Order</th>
+                <th class="no-sort">Flag</th>
+                <th>Order <i style="margin-left: 5px" title="Languages will be sort on smasch dropdown menus according to their order value." class="fa fa-info-circle"></i></th>
                 <th>Locale</th>
-                <th>Edit</th>
-                <th>Delete</th>
+                <th class="no-sort">Edit</th>
+                <th class="no-sort">Delete</th>
             </tr>
             </thead>
             <tbody>
@@ -69,8 +69,13 @@
                 "searching": true,
                 "ordering": true,
                 "info": true,
-                "autoWidth": false
+                "autoWidth": false,
+                "columnDefs": [ {
+                    "targets": 'no-sort',
+                    "orderable": false,
+                } ]
             });
+            $('th > i[title]').tooltip({container: 'body'});
         });
     </script>
 {% endblock scripts %}

smash/web/templates/mail_templates/list.html

@@ -34,11 +34,11 @@
                 <tr>
                     <th>No.</th>
                     <th>Context</th>
-                    <th>Language</th>
+                    <th class="no-sort">Language</th>
                     <th>Name</th>
-                    <th>Download</th>
-                    <th>Edit</th>
-                    <th>Delete</th>
+                    <th class="no-sort">Download</th>
+                    <th class="no-sort">Edit</th>
+                    <th class="no-sort">Delete</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -108,7 +108,11 @@
                 "searching": true,
                 "ordering": true,
                 "info": true,
-                "autoWidth": false
+                "autoWidth": false,
+                "columnDefs": [ {
+                    "targets": 'no-sort',
+                    "orderable": false,
+                } ]
             });
         });
     </script>