From 9badb87f1aef2f92552e5545f57628e864d7bcbf Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Wed, 14 Jul 2010 11:55:31 -0700
Subject: [PATCH] Reveal-on-hover table structure actions

---
 js/functions.js                         |  24 ++++++
 tbl_structure.php                       |  98 +++++++++++++++++++++---
 themes/original/css/theme_right.css.php |  21 ++++-
 themes/original/img/more.png            | Bin 0 -> 553 bytes
 4 files changed, 132 insertions(+), 11 deletions(-)
 create mode 100644 themes/original/img/more.png

diff --git a/js/functions.js b/js/functions.js
index 4f425b314..cbfe0e38a 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1829,4 +1829,28 @@ $(document).ready(function() {
             disable_popup();
         }
     });
+
+    /**
+     * Hides certain table structure actions, replacing them with the word "More". They are displayed
+     * in a dropdown menu when the user hovers over the word "More."
+     */
+    // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers)
+    $("table[id='tablestructure'] td[class='browse']").remove();
+    $("table[id='tablestructure'] td[class='primary']").remove();
+    $("table[id='tablestructure'] td[class='unique']").remove();
+    $("table[id='tablestructure'] td[class='index']").remove();
+    $("table[id='tablestructure'] td[class='fulltext']").remove();
+
+    // Display the "more" text
+    $("table[id='tablestructure'] td[class='more_opts']").show()
+
+    // When "more" is hovered over, show the hidden actions
+    $("table[id='tablestructure'] td[class='more_opts']").hover(
+        function() {
+            $(this).children(".structure_actions_dropdown").show();
+        },
+        function() {
+            $(this).children(".structure_actions_dropdown").hide();
+        }
+    );
 });
\ No newline at end of file
diff --git a/tbl_structure.php b/tbl_structure.php
index 8f1f26db9..cfbd961ad 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -160,6 +160,18 @@ $titles['NoUnique']             = PMA_getIcon('bd_unique.png', __('Unique'), tru
 $titles['NoIdxFulltext']        = PMA_getIcon('bd_ftext.png', __('Fulltext'), true);
 $titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), true);
 
+// 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);
+
 /**
  * Displays the table structure ('show table' works correct since 3.23.03)
  */
@@ -361,59 +373,63 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         echo '<i>' . _pgettext('None for default','None') . '</i>';
     } ?></td>
     <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td>
-    <td align="center">
+    <td align="center" class="browse">
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote(__('Rows')) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">
             <?php echo $titles['BrowseDistinctValues']; ?></a>
     </td>
     <?php if (! $tbl_is_view && ! $db_is_information_schema) { ?>
-    <td align="center">
+    <td align="center" class="edit">
         <a href="tbl_alter.php?<?php echo $url_query; ?>&amp;field=<?php echo $field_encoded; ?>">
             <?php echo $titles['Change']; ?></a>
     </td>
-    <td align="center">
+    <td align="center" class="drop">
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&amp;cpurge=1&amp;purgekey=<?php echo urlencode($row['Field']); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')">
             <?php echo $titles['Drop']; ?></a>
     </td>
-    <td align="center">
+    <td align="center" class="primary">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || ($primary && $primary->hasColumn($field_name))) {
             echo $titles['NoPrimary'] . "\n";
+            $primary = false;
         } else {
             echo "\n";
             ?>
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
             <?php echo $titles['Primary']; ?></a>
-            <?php
+            <?php $primary = true;
         }
         echo "\n";
         ?>
     </td>
-    <td align="center">
+    <td align="center" class="unique">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || isset($columns_with_unique_index[$field_name])) {
             echo $titles['NoUnique'] . "\n";
+            $unique = false;
         } else {
             echo "\n";
             ?>
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['Unique']; ?></a>
-            <?php
+            <?php $unique = true;
         }
         echo "\n";
         ?>
     </td>
-    <td align="center">
+    <td align="center" class="index">
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoIndex'] . "\n";
+            $index = false;
         } else {
             echo "\n";
             ?>
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['Index']; ?></a>
             <?php
+            $index = true;
         }
         echo "\n";
         ?>
@@ -424,22 +440,84 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
             echo "\n";
             ?>
-    <td align="center" nowrap="nowrap">
+    <td align="center" nowrap="nowrap" class="fulltext">
         <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
             <?php echo $titles['IdxFulltext']; ?></a>
+            <?php $fulltext = true; ?>
     </td>
             <?php
         } else {
             echo "\n";
         ?>
-    <td align="center" nowrap="nowrap">
+    <td align="center" nowrap="nowrap" class="fulltext">
         <?php echo $titles['NoIdxFulltext'] . "\n"; ?>
+        <?php $fulltext = false; ?>
     </td>
         <?php
         } // end if... else...
         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'; ?>">
+        <div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>">
+
+            <div class="action_browse">
+                <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote(__('Rows')) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>">
+                    <?php echo $hidden_titles['BrowseDistinctValues']; ?>
+                </a>
+            </div>
+            <div class="action_primary">
+                <?php
+                if($primary) { ?>
+                     <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"
+                     onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table) . ($primary ? ' DROP PRIMARY KEY,' : ''); ?> ADD PRIMARY KEY(<?php echo PMA_jsFormat($row['Field']); ?>)')">
+                        <?php echo $hidden_titles['Primary']; ?>
+                    </a>
+                <?php
+                } else {
+                    echo $hidden_titles['NoPrimary'];
+                }
+                ?>
+            </div>
+            <div class="action_unique">
+                <?php
+                if($unique) { ?>
+                    <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
+                        <?php echo $hidden_titles['Unique']; ?>
+                    </a>
+                <?php
+                } else {
+                    echo $hidden_titles['NoUnique'];
+                }
+                ?>
+            </div>
+            <div class="action_index">
+               <?php
+                if($index) { ?>
+                    <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
+                        <?php echo $hidden_titles['Index']; ?>
+                    </a>
+                <?php
+                } else {
+                    echo $hidden_titles['NoIndex'];
+                }
+                ?>
+             </div>
+            <div class="action_fulltext">
+                <?php
+                if($fulltext) { ?>
+                    <a href="sql.php?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&amp;zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>">
+                        <?php echo $hidden_titles['IdxFulltext']; ?>
+                    </a>
+                <?php
+                } else {
+                    echo $hidden_titles['NoIdxFulltext'];
+                }
+                ?>
+             </div>
+        </div>
+    </td>
 </tr>
     <?php
     unset($field_charset);
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 367fbdc49..c0dfd7e1c 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -210,7 +210,8 @@ table tr.marked {
 /* hovered items */
 .odd:hover,
 .even:hover,
-.hover {
+.hover,
+.structure_actions_dropdown {
     background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
     color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
 }
@@ -1391,4 +1392,22 @@ a.close_enum_editor {
 
 #enum_editor_output {
     margin-top: 50px;
+}
+
+/**
+ * Table structure styles
+ */
+.structure_actions_dropdown {
+    position: absolute;
+    padding: 3px;
+    display: none;
+    margin-left: 30px;
+}
+
+td.more_opts {
+    display: none;
+}
+
+table#tablestructure {
+    margin-right: 50px;
 }
\ No newline at end of file
diff --git a/themes/original/img/more.png b/themes/original/img/more.png
new file mode 100644
index 0000000000000000000000000000000000000000..e83694b3b67f35cc5f73fdfc466a1e9d12c18caa
GIT binary patch
literal 553
zcmeAS@N?(olHy`uVBq!ia0vp@3=9k$9Bd2>3`%OH=NT9nSkfJR9T^zbpD<_bdda}R
zI5X4PIl$A|Ss|b(KP@vSm4TsxaqXn@-b{`n$M@&82wYSB?I`f(q)kSLkcP_wIjuJd
zN)h+2l?FRrPc7T>i+LCK-9^s!3xZvizjz`4K=*}!Aj@CI#tW(`)tj9wJYHSmG5$Ss
z`~AxNdwUqC%u9<bWpz0GL}&ZFpz^ZrRo^+|Ugcdbx$Tv<Il9O+>t98S`wjU+hpuZJ
z)i;x0+|Y2`U#i}<D4@Xe)2auxd4-o!SYL;(_3>d=oOXU`r}dFw(Ua*--jniKw}0)r
zaa*--#?x7zfBa<hrMK~ED2ZLyb(4BJ#X{%Pa(&ZzjMu~(H{QDtwx#j4c7mS47S`vD
zGnoqHrEmSZ{cdhWTJ^U$omaa){|Gwpqx<m}=7#SQ5+yRvKOZV&n=bNL^2MyG?ya%9
zvO%5<^=nh}F6~~!xN${mbpL#v&*fhQAJi~w_%O^=e(*#zVi)7G_YH4UCipva?yu#q
z41c$;bxYX#sWXoCZql0Py(==`==P<O!+-zQ3!C$;P;=OoDZ43Z>8YzKd-a-`%+`pR
zM|j*d`TBH%RIf`|%RBC}+QJlF%Mbnx3=GzuE{-7*lF11Q%mz+h|EN3aEBgq0@Eb}U
zd^OQj@DfKjce;Wl|Lk6kR{<6lCXa%em&hDElBVo5EkumL(2b3?zx16u0|Nttr>mdK
II;Vst02H+9BLDyZ

literal 0
HcmV?d00001