[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1340-g2d8b20a

Michal Čihař nijel at users.sourceforge.net
Wed Apr 7 13:04:28 CEST 2010


The branch, master has been updated
       via  2d8b20a28c0b16da7dbcff9c937b5bd7160f7d04 (commit)
       via  96674738f7f2150f94272028b7159266fe3853ab (commit)
      from  149b8c89014a1d0e9317508fe71480e7587a5daf (commit)


- Log -----------------------------------------------------------------
commit 2d8b20a28c0b16da7dbcff9c937b5bd7160f7d04
Author: s.troxler <stroxler at users.sourceforge.net>
Date:   Wed Apr 7 13:03:48 2010 +0200

    Fix slider on table properties page.
    
    patch #2983090, bug #2983050

commit 96674738f7f2150f94272028b7159266fe3853ab
Author: Michal Čihař <mcihar at novell.com>
Date:   Wed Apr 7 13:01:52 2010 +0200

    Revert "removed some XHTML problems (slider effect)"
    
    This reverts commit 777a5f7844b2e6aa5f5cdcf96e2e864e0d454fd1.
    
    The div needs to be open because each usage of
    PMA_generate_slider_effect includes end of div.

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

Summary of changes:
 libraries/common.lib.php |    6 +++---
 tbl_structure.php        |    4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f161013..97e7f85 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2456,7 +2456,7 @@ function PMA_generate_slider_effect($id, $message)
     ?>
     <script type="text/javascript">
 // <![CDATA[
-    document.write('<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none;"' : ''; ?>>');
+    document.write('<div id="<?php echo $id; ?>" <?php echo $GLOBALS['cfg']['InitialSlidersState'] == 'closed' ? ' style="display: none; overflow:auto;"' : ''; ?>>');
 
     function PMA_set_status_label_<?php echo $id; ?>() {
         if ($('#<?php echo $id; ?>').css('display') == 'none') {
@@ -2473,7 +2473,7 @@ function PMA_generate_slider_effect($id, $message)
 
         PMA_set_status_label_<?php echo $id; ?>();
 
-        $('<a href="#" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>')
+        $('<a href="#<?php echo $id; ?>" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>')
             .insertBefore('#<?php echo $id; ?>')
             .click(function() {
                 // the callback should be the 4th parameter but
@@ -2486,7 +2486,7 @@ function PMA_generate_slider_effect($id, $message)
     //]]>
     </script>
     <noscript>
-    <div id="<?php echo $id; ?>" />
+    <div id="<?php echo $id; ?>">
     </noscript>
     <?php
 }
diff --git a/tbl_structure.php b/tbl_structure.php
index ba80464..001ac33 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -831,6 +831,10 @@ if ($cfg['ShowStats']) {
     ?>
     </tbody>
     </table>
+
+    <!-- close slider div -->
+    </div>
+
     <?php
 }
 // END - Calc Table Space


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list