From 1faaa80b515c6e086a797e0cdf16c052d048f60e Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Wed, 28 Jul 2010 15:00:36 -0700
Subject: [PATCH] Fixing HTML markup

---
 js/functions.js                  |  4 ++-
 libraries/common.lib.php         |  2 +-
 libraries/display_export.lib.php |  2 +-
 libraries/display_import.lib.php |  2 +-
 main.php                         |  2 +-
 tbl_structure.php                | 42 +++++++++++++++++---------------
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 0d693e681..c510f71c2 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1867,7 +1867,9 @@ $(document).ready(function() {
          var left_offset = cell_right_edge_offset - $(".structure_actions_dropdown").innerWidth();
 
          $.each($(".structure_actions_dropdown"), function() {
-             $(this).offset({ left: left_offset });
+              // The top offset must be set for IE even if it didn't change
+             var top_offset = $(this).parent().offset().top + $(this).parent().innerHeight();
+             $(this).offset({ top: top_offset, left: left_offset });
          });
 
          // When "more" is hovered over, show the hidden actions
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 331797605..ab12b67aa 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -491,7 +491,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
     // footnotemarker used in js/tooltip.js
     return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '">' . $nr . '</sup>' .
     '<img class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '" src="' .
-    $GLOBALS['pmaThemeImage'] . 'b_help.png" />';
+    $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="tooltip" />';
 }
 
 /**
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 5f87197fa..a0e3ca5a5 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -62,7 +62,7 @@ if (! empty($sql_query)) {
 
 <div class="exportoptions" id="header">
     <h2>
-        <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" />
+        <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" alt="export" />
         <?php
         if($export_type == 'server') {
             echo __('Exporting databases in the current server');
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 6ea341e9d..daa97c3c5 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -123,7 +123,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
 
     <div class="exportoptions" id="header">
         <h2>
-            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" />
+            <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" alt="import" />
             <?php
             if($import_type == 'server') {
                 echo __('Importing into the current server');
diff --git a/main.php b/main.php
index 285cb63d9..3933c94aa 100644
--- a/main.php
+++ b/main.php
@@ -130,7 +130,7 @@ if ($GLOBALS['cfg']['ThemeManager']) {
     // see js/main_custom_color.js
     echo '<li id="li_custom_color" class="hide">';
     echo PMA_escapeJsString(__('Background color')) . ': ';
-    echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '"';
+    echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />';
     echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
     echo PMA_generate_common_hidden_inputs();
     echo '<input type="hidden" id="custom_color" name="custom_color" value="" />';
diff --git a/tbl_structure.php b/tbl_structure.php
index 70a41efab..e8d1c0efc 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -160,15 +160,15 @@ $titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinc
 
 // hidden action titles (image and string)
 $hidden_titles = array();
-$hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), true, true);
-$hidden_titles['Primary']              = PMA_getIcon('b_primary.png', __('Primary'), true, true);
-$hidden_titles['NoPrimary']            = PMA_getIcon('bd_primary.png', __('Primary'), true, true);
-$hidden_titles['Index']                = PMA_getIcon('b_index.png', __('Index'), true, true);
-$hidden_titles['NoIndex']              = PMA_getIcon('bd_index.png', __('Index'), true, true);
-$hidden_titles['Unique']               = PMA_getIcon('b_unique.png', __('Unique'), true, true);
-$hidden_titles['NoUnique']             = PMA_getIcon('bd_unique.png', __('Unique'), true, true);
-$hidden_titles['IdxFulltext']          = PMA_getIcon('b_ftext.png', __('Fulltext'), true, true);
-$hidden_titles['NoIdxFulltext']        = PMA_getIcon('bd_ftext.png', __('Fulltext'), true, true);
+$hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), false, true);
+$hidden_titles['Primary']              = PMA_getIcon('b_primary.png', __('Primary'), false, true);
+$hidden_titles['NoPrimary']            = PMA_getIcon('bd_primary.png', __('Primary'), false, true);
+$hidden_titles['Index']                = PMA_getIcon('b_index.png', __('Index'), false, true);
+$hidden_titles['NoIndex']              = PMA_getIcon('bd_index.png', __('Index'), false, true);
+$hidden_titles['Unique']               = PMA_getIcon('b_unique.png', __('Unique'), false, true);
+$hidden_titles['NoUnique']             = PMA_getIcon('bd_unique.png', __('Unique'), false, true);
+$hidden_titles['IdxFulltext']          = PMA_getIcon('b_ftext.png', __('Fulltext'), false, true);
+$hidden_titles['NoIdxFulltext']        = PMA_getIcon('bd_ftext.png', __('Fulltext'), false, true);
 
 /**
  * Displays the table structure ('show table' works correct since 3.23.03)
@@ -178,7 +178,16 @@ $hidden_titles['NoIdxFulltext']        = PMA_getIcon('bd_ftext.png', __('Fulltex
 $i = 0;
 ?>
 <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm">
-    <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+    <?php echo PMA_generate_common_hidden_inputs($db, $table);
+    echo '<input type="hidden" name="table_type" value=';
+	if($db_is_information_schema) {
+	     echo '"information_schema" />';
+	} else if ($tbl_is_view) {
+	     echo '"view" />';
+	} else {
+	     echo '"table" />';
+	} ?>
+
 <table id="tablestructure" class="data">
 <thead>
 <tr>
@@ -202,14 +211,7 @@ $i = 0;
 
 <?php
 unset($i);
-echo '<input type="hidden" name="table_type" value=';
-if($db_is_information_schema) {
-     echo '"information_schema" />';
-} else if ($tbl_is_view) {
-     echo '"view" />';
-} else {
-     echo '"table" />';
-}
+
 // table body
 
 // prepare comments
@@ -465,8 +467,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         echo "\n";
     } // end if (! $tbl_is_view && ! $db_is_information_schema)
     ?>
-    <td class="more_opts" id="<?php echo $rownum; ?>">
-        More <img src="<?php echo $pmaThemeImage . 'more.png'; ?>">
+    <td class="more_opts" id="more_opts<?php echo $rownum; ?>">
+        More <img src="<?php echo $pmaThemeImage . 'more.png'; ?>" alt="show more actions" />
         <div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>">
 
             <div class="action_browse">