Merge remote-tracking branch 'origin/master'

js/server_modules.js

@@ -0,0 +1,17 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Functions used in server modules pages
+ */
+AJAX.registerOnload('server_modules.js', function () {
+    // Make columns sortable
+    var $table = $('#plugins_modules table');
+    $table.tablesorter({
+        sortList: [[0, 0]],
+        headers: {
+            1: {sorter: false},
+            3: {sorter: "digit"}
+        }
+    });
+    $table.find('thead th')
+        .append('<div class="sorticon"></div>');
+});

server_modules.php

@@ -11,6 +11,15 @@
  */
 require_once 'libraries/common.inc.php';
 
+/**
+ * JS includes
+ */
+$response = PMA_Response::getInstance();
+$header   = $response->getHeader();
+$scripts  = $header->getScripts();
+$scripts->addFile('jquery/jquery.tablesorter.js');
+$scripts->addFile('server_modules.js');
+
 /**
  * Does the common work
  */
@@ -22,7 +31,6 @@ $modules = PMA_getServerModules();
 /**
  * Displays the page
  */
-$response = PMA_Response::getInstance();
 $response->addHTML('<div>');
 $response->addHTML(PMA_getHtmlForPluginsSubTabs('server_modules.php'));
 $response->addHTML(PMA_getModuleTab($modules));