[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15434-gf63345e

[Michal Čihař]

The branch, master has been updated
       via  f63345e9c0bf35cabd73bb0783db7bc0a14e3ea6 (commit)
       via  54bf837b33165d8a6c8424ee5ef4ca0c6f370121 (commit)
       via  26958461e4ec10c3d92ec2787bb9485e09e7f202 (commit)
      from  a4305a2672789deebba9d21a887796be47f31542 (commit)


- Log -----------------------------------------------------------------
commit f63345e9c0bf35cabd73bb0783db7bc0a14e3ea6
Merge: a4305a2 54bf837
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Aug 17 08:31:57 2011 +0200

    Merge remote-tracking branch 'tyron/master'

commit 54bf837b33165d8a6c8424ee5ef4ca0c6f370121
Merge: 2695846 79f7461
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Tue Aug 16 17:22:37 2011 +0300

    Merge remote-tracking branch 'origin/master'

commit 26958461e4ec10c3d92ec2787bb9485e09e7f202
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Tue Aug 16 17:17:06 2011 +0300

    Better lookings with js disabled

-----------------------------------------------------------------------

Summary of changes:
 server_status.php |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server_status.php b/server_status.php
index 9eb493c..8d196ad 100644
--- a/server_status.php
+++ b/server_status.php
@@ -686,12 +686,12 @@ echo __('Runtime Information');
             <li><a href="#statustabs_traffic"><?php echo __('Server'); ?></a></li>
             <li><a href="#statustabs_queries"><?php echo __('Query statistics'); ?></a></li>
             <li><a href="#statustabs_allvars"><?php echo __('All status variables'); ?></a></li>
-            <li><a href="#statustabs_charting"><?php echo __('Monitor'); ?></a></li>
-            <li><a href="#statustabs_advisor"><?php echo __('Advisor'); ?></a></li>
+            <li class="jsfeature"><a href="#statustabs_charting"><?php echo __('Monitor'); ?></a></li>
+            <li class="jsfeature"><a href="#statustabs_advisor"><?php echo __('Advisor'); ?></a></li>
         </ul>
 
-        <div id="statustabs_traffic">
-            <div class="buttonlinks">
+        <div id="statustabs_traffic" class="clearfloat">
+            <div class="buttonlinks jsfeature">
                 <a class="tabRefresh" href="<?php echo $PMA_PHP_SELF . '?show=server_traffic&' . PMA_generate_common_url(); ?>" >
                     <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
                     <?php echo __('Refresh'); ?>
@@ -712,8 +712,8 @@ echo __('Runtime Information');
                 <?php printServerTraffic(); ?>
             </div>
         </div>
-        <div id="statustabs_queries">
-            <div class="buttonlinks">
+        <div id="statustabs_queries" class="clearfloat">
+            <div class="buttonlinks jsfeature">
                 <a class="tabRefresh"  href="<?php echo $PMA_PHP_SELF . '?show=query_statistics&' . PMA_generate_common_url(); ?>" >
                     <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
                     <?php echo __('Refresh'); ?>
@@ -730,8 +730,8 @@ echo __('Runtime Information');
                 <?php printQueryStatistics(); ?>
             </div>
         </div>
-        <div id="statustabs_allvars">
-            <fieldset id="tableFilter">
+        <div id="statustabs_allvars" class="clearfloat">
+            <fieldset id="tableFilter" class="jsfeature">
                 <div class="buttonlinks">
                     <a class="tabRefresh" href="<?php echo $PMA_PHP_SELF . '?show=variables_table&' . PMA_generate_common_url(); ?>" >
                         <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" />
@@ -791,11 +791,11 @@ echo __('Runtime Information');
             </div>
         </div>
 
-        <div id="statustabs_charting">
+        <div id="statustabs_charting" class="jsfeature">
             <?php printMonitor(); ?>
         </div>
 
-        <div id="statustabs_advisor">
+        <div id="statustabs_advisor" class="jsfeature">
             <div class="tabLinks">
                 <img src="themes/dot.gif" class="icon ic_play" alt="" /> <a href="#startAnalyzer"><?php echo __('Run analyzer'); ?></a>
                 <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> <a href="#openAdvisorInstructions"><?php echo __('Instructions'); ?></a>


hooks/post-receive
-- 
phpMyAdmin