From 8c32798e055179a93a56066be88068e890e298ee Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Wed, 14 Jul 2010 13:05:43 -0700
Subject: [PATCH 1/2] Changed variable names that conflict with other existing
 variable names, causing table rows to become missing

---
 tbl_structure.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tbl_structure.php b/tbl_structure.php
index cfbd961ad..64e2b14c2 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -391,14 +391,14 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || ($primary && $primary->hasColumn($field_name))) {
             echo $titles['NoPrimary'] . "\n";
-            $primary = false;
+            $primary_enabled = 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 $primary = true;
+            <?php $primary_enabled = true;
         }
         echo "\n";
         ?>
@@ -407,13 +407,13 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || isset($columns_with_unique_index[$field_name])) {
             echo $titles['NoUnique'] . "\n";
-            $unique = false;
+            $unique_enabled = 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 $unique = true;
+            <?php $unique_enabled = true;
         }
         echo "\n";
         ?>
@@ -422,14 +422,14 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         <?php
         if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
             echo $titles['NoIndex'] . "\n";
-            $index = false;
+            $index_enabled = 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;
+            $index_enabled = true;
         }
         echo "\n";
         ?>
@@ -443,7 +443,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
     <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; ?>
+            <?php $fulltext_enabled = true; ?>
     </td>
             <?php
         } else {
@@ -451,7 +451,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         ?>
     <td align="center" nowrap="nowrap" class="fulltext">
         <?php echo $titles['NoIdxFulltext'] . "\n"; ?>
-        <?php $fulltext = false; ?>
+        <?php $fulltext_enabled = false; ?>
     </td>
         <?php
         } // end if... else...

From 622dcd5eedfeffd26a807131e7f1d7bf8fceda84 Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Wed, 14 Jul 2010 13:10:18 -0700
Subject: [PATCH 2/2] Copying over new styles from the original theme

---
 .../darkblue_orange/css/theme_right.css.php   | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index fe64ca925..a44567c44 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -234,7 +234,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']; ?>;
 }
@@ -375,11 +376,16 @@ img.lightbulb {
 }
 
 /* leave some space between icons and text */
-.icon {
+.icon, img.footnotemarker {
     vertical-align:     middle;
     margin-right:       0.3em;
     margin-left:        0.3em;
 }
+
+img.footnotemarker {
+    display: none;
+}
+
 /* no extra space in table cells */
 td .icon {
     margin: 0;
@@ -1328,7 +1334,7 @@ table#serverconnection_trg_local  {
 }
 
 .exportoptions, .importoptions {
-    margin: 30px 30px 30px 10px
+    margin: 20px 30px 30px 10px
 }
 
 .exportoptions #buttonGo, .importoptions #buttonGo {
@@ -1373,6 +1379,10 @@ select#db_select, select#table_select {
     border-bottom: 1px #999999 solid;
 }
 
+#quick_or_custom, #output_quick_export {
+    display: none;
+}
+
 /**
  * Import styles only
  */
@@ -1449,4 +1459,18 @@ 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;
 }
\ No newline at end of file