[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12871-g0427378 - Git

2 Aug 2011

The branch, master has been updated
       via  0427378a0531e3d568a6ae60266d49318ff2310b (commit)
      from  663d073e6be9630bd99e3684705d9182c36112b1 (commit)
- Log -----------------------------------------------------------------
commit 0427378a0531e3d568a6ae60266d49318ff2310b
Author: Piotr Przybylski piotrprz@gmail.com
Date:   Tue Aug 2 23:13:39 2011 +0200
Allow to use noclick class on table level
-----------------------------------------------------------------------
Summary of changes:
 js/functions.js                           |    2 +-
 libraries/display_change_password.lib.php |    6 ++--
 libraries/tbl_properties.inc.php          |    6 ++--
 server_collations.php                     |    6 ++--
 server_engines.php                        |    6 ++--
 server_status.php                         |   30 ++++++++++++++--------------
 server_variables.php                      |    6 ++--
 7 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index bc94a89..287195d 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -597,7 +597,7 @@ $(document).ready(function() {
      * next pages reached via AJAX); a tr may have the class noclick to remove
      * this behavior.
      */
-    $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) {
+    $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click',function(e) {
         // do not trigger when clicked on anchor
         if ($(e.target).is('a, img, a *')) {
             return;
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 4dcb2c9..48444a6 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -27,14 +27,14 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             }?>
     <fieldset id="fieldset_change_password">
         <legend><?php echo __('Change password'); ?></legend>
-        <table class="data">
-        <tr class="odd noclick">
+        <table class="data noclick">
+        <tr class="odd">
             <td colspan="2">
                 <input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
         <label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label>
             </td>
         </tr>
-        <tr class="even noclick">
+        <tr class="even">
             <td>
                 <input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
         <label for="nopass_0"><?php echo __('Password'); ?>:&nbsp;</label>
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index f4ade94..7208ea3 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -622,7 +622,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
     // last row is for javascript insert
     //$empty_row = array_pop($content_cells);
-    echo '<table id="table_columns">';
+    echo '<table id="table_columns" class="noclick">';
     echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>';
if ($display_type == 'horizontal') {
@@ -636,7 +636,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
$odd_row = true;
         foreach ($content_cells as $content_row) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">';
+            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
             $odd_row = ! $odd_row;
if (is_array($content_row)) {
@@ -652,7 +652,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
         $i = 0;
         $odd_row = true;
         foreach ($header_cells as $header_val) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">';
+            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
             $odd_row = ! $odd_row;
             ?>
     <th><?php echo $header_val; ?></th>
diff --git a/server_collations.php b/server_collations.php
index ccd41d4..71508be 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -49,7 +49,7 @@ require_once './libraries/mysql_charsets.lib.php';
  * Outputs the result
  */
 echo '<div id="div_mysql_charset_collations">' . "\n"
-   . '<table class="data">' . "\n"
+   . '<table class="data noclick">' . "\n"
    . '<tr><th>' . __('Collation') . '</th>' . "\n"
    . '    <th>' . __('Description') . '</th>' . "\n"
    . '</tr>' . "\n";
@@ -61,7 +61,7 @@ foreach ($mysql_charsets as $current_charset) {
     if ($i >= $table_row_count / 2) {
         $i = 0;
         echo '</table>' . "\n"
-           . '<table class="data">' . "\n"
+           . '<table class="data noclick">' . "\n"
            . '<tr><th>' . __('Collation') . '</th>' . "\n"
            . '    <th>' . __('Description') . '</th>' . "\n"
            . '</tr>' . "\n";
@@ -78,7 +78,7 @@ foreach ($mysql_charsets as $current_charset) {
     $odd_row = true;
     foreach ($mysql_collations[$current_charset] as $current_collation) {
         $i++;
-        echo '<tr class="noclick '
+        echo '<tr class="'
            . ($odd_row ? 'odd' : 'even')
            . ($mysql_default_collations[$current_charset] == $current_collation
                 ? ' marked'
diff --git a/server_engines.php b/server_engines.php
index c668777..4e5eeb3 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -50,7 +50,7 @@ if (empty($_REQUEST['engine'])
     /**
      * Displays the table header
      */
-    echo '<table>' . "\n"
+    echo '<table class="noclick">' . "\n"
        . '<thead>' . "\n"
        . '<tr><th>' . __('Storage Engine') . '</th>' . "\n"
        . '    <th>' . __('Description') . '</th>' . "\n"
@@ -64,7 +64,7 @@ if (empty($_REQUEST['engine'])
      */
     $odd_row = true;
     foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) {
-        echo '<tr class="noclick '
+        echo '<tr class="'
            . ($odd_row ? 'odd' : 'even')
            . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED'
                 ? ' disabled'
@@ -82,7 +82,7 @@ if (empty($_REQUEST['engine'])
     $PMA_Config = $GLOBALS['PMA_Config'];
     if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) {
         // Special case for PBMS daemon which is not listed as an engine
-        echo '<tr class="noclick '
+        echo '<tr class="'
             . ($odd_row ? 'odd' : 'even')
             .  '">' . "\n"
             . '    <td><a href="./server_engines.php'
diff --git a/server_status.php b/server_status.php
index e5bb06f..877f0a5 100644
--- a/server_status.php
+++ b/server_status.php
@@ -767,7 +767,7 @@ function printQueryStatistics() {
?>
-        <table id="serverstatusqueriesdetails" class="data sortable">
+        <table id="serverstatusqueriesdetails" class="data sortable noclick">
         <col class="namecol" />
         <col class="valuecol" span="3" />
         <thead>
@@ -799,7 +799,7 @@ function printQueryStatistics() {
             $other_sum += $value;
         else $chart_json[$name] = $value;
     ?>
-            <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+            <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
                 <th class="name"><?php echo htmlspecialchars($name); ?></th>
                 <td class="value"><?php echo PMA_formatNumber($value, 5, 0, true); ?></td>
                 <td class="value"><?php echo
@@ -888,7 +888,7 @@ function printServerTraffic() {
     }
     ?>
-    <table id="serverstatustraffic" class="data">
+    <table id="serverstatustraffic" class="data noclick">
     <thead>
     <tr>
         <th colspan="2"><?php echo __('Traffic') . '&nbsp;' . PMA_showHint(__('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.')); ?></th>
@@ -896,7 +896,7 @@ function printServerTraffic() {
     </tr>
     </thead>
     <tbody>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Received'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -906,7 +906,7 @@ function printServerTraffic() {
                 PMA_formatByteDown(
                     $server_status['Bytes_received'] * $hour_factor, 3, 1)); ?></td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Sent'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -916,7 +916,7 @@ function printServerTraffic() {
                 PMA_formatByteDown(
                     $server_status['Bytes_sent'] * $hour_factor, 3, 1)); ?></td>
     </tr>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Total'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -933,7 +933,7 @@ function printServerTraffic() {
     </tbody>
     </table>
-    <table id="serverstatusconnections" class="data">
+    <table id="serverstatusconnections" class="data noclick">
     <thead>
     <tr>
         <th colspan="2"><?php echo __('Connections'); ?></th>
@@ -942,14 +942,14 @@ function printServerTraffic() {
     </tr>
     </thead>
     <tbody>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('max. concurrent connections'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Max_used_connections'], 0); ?>  </td>
         <td class="value">--- </td>
         <td class="value">--- </td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Failed attempts'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Aborted_connects'], 4, 1, true); ?></td>
@@ -963,7 +963,7 @@ function printServerTraffic() {
                 0, 2, true) . '%'
           : '--- '; ?></td>
     </tr>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Aborted'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Aborted_clients'], 4, 1, true); ?></td>
@@ -977,7 +977,7 @@ function printServerTraffic() {
                 0, 2, true) . '%'
           : '--- '; ?></td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Total'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Connections'], 4, 0); ?></td>
@@ -1007,7 +1007,7 @@ function printServerTraffic() {
      * Displays the page
      */
     ?>
-    <table id="tableprocesslist" class="data clearfloat">
+    <table id="tableprocesslist" class="data clearfloat noclick">
     <thead>
     <tr>
         <th><?php echo __('Processes'); ?></th>
@@ -1046,7 +1046,7 @@ function printServerTraffic() {
         $url_params['kill'] = $process['Id'];
         $kill_process = 'server_status.php' . PMA_generate_common_url($url_params);
         ?>
-    <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+    <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
         <td><a href="<?php echo $kill_process ; ?>"><?php echo __('Kill'); ?></a></td>
         <td class="value"><?php echo $process['Id']; ?></td>
         <td><?php echo $process['User']; ?></td>
@@ -1251,7 +1251,7 @@ function printVariablesTable() {
     );
?>
-<table class="data sortable" id="serverstatusvariables">
+<table class="data sortable noclick" id="serverstatusvariables">
     <col class="namecol" />
     <col class="valuecol" />
     <col class="descrcol" />
@@ -1269,7 +1269,7 @@ function printVariablesTable() {
     foreach ($server_status as $name => $value) {
             $odd_row = !$odd_row;
 ?>
-        <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
+        <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
             <th class="name"><?php echo htmlspecialchars(str_replace('_',' ',$name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
             </th>
             <td class="value"><?php
diff --git a/server_variables.php b/server_variables.php
index dcbe192..ceced14 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -102,7 +102,7 @@ isSuperuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>;
     <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" />
 </div>
 </fieldset>
-<table id="serverVariables" class="data filteredData">
+<table id="serverVariables" class="data filteredData noclick">
 <thead>
 <tr><th><?php echo __('Variable'); ?></th>
     <th class="valueHeader">
@@ -118,7 +118,7 @@ echo __('Session value') . ' / ' . __('Global value');
 $odd_row = true;
 foreach ($serverVars as $name => $value) {
     ?>
-<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
     <th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
     <td class="value"><?php echo formatVariable($name,$value); ?></td>
     <td class="value"><?php
@@ -129,7 +129,7 @@ foreach ($serverVars as $name => $value) {
     if (isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value) {
         ?>
 </tr>
-<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?> ">
+<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> ">
     <td>(<?php echo __('Session value'); ?>)</td>
     <td class="value"><?php echo formatVariable($name,$serverVarsSession[$name]); ?></td>
     <td class="value"></td>
hooks/post-receive
-- 
phpMyAdmin


    