[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6022-g2816b87

[Marc Delisle]

The branch, master has been updated
       via  2816b870c3126a0d176aefd39d7c4a87a18f7a95 (commit)
      from  2047ae28a5044d2b6f80090dc4bb2636e27fe71d (commit)


- Log -----------------------------------------------------------------
commit 2816b870c3126a0d176aefd39d7c4a87a18f7a95
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jul 28 05:44:03 2010 -0400

    new labels for table operations; fix CSS

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

Summary of changes:
 tbl_operations.php                             |    4 ++--
 themes/darkblue_orange/css/theme_right.css.php |    2 +-
 themes/original/css/theme_right.css.php        |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tbl_operations.php b/tbl_operations.php
index baab85a..e2de481 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -639,7 +639,7 @@ $this_url_params = array_merge($url_params,
 <?php if (! (isset($db_is_information_schema) && $db_is_information_schema)) { ?>
 <div id="div_table_removal">
 <fieldset class="caution">
- <legend><?php echo __('Table removal'); ?></legend>
+ <legend><?php echo __('Delete data or table'); ?></legend>
 
 <ul>
 <?php
@@ -672,7 +672,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
         ));
     ?>
     <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')">
-            <?php echo __('Drop the table (DROP)'); ?></a>
+            <?php echo __('Delete the table (DROP)'); ?></a>
         <?php echo PMA_showMySQLDocu('SQL-Syntax', 'DROP_TABLE'); ?>
     </li>
 <?php
diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php
index 86b21ea..8a21e15 100644
--- a/themes/darkblue_orange/css/theme_right.css.php
+++ b/themes/darkblue_orange/css/theme_right.css.php
@@ -1216,7 +1216,7 @@ li#li_flush_privileges {
     float: <?php echo $left; ?>;
 }
 
-#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_maintenance {
+#div_table_copy, #div_partition_maintenance, #div_referential_integrity, #div_table_removal, #div_table_maintenance {
     min-width: 48%;
     float: <?php echo $left; ?>;
 }
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b3554ce..5583fa8 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1167,6 +1167,7 @@ li#li_flush_privileges {
 #div_table_copy,
 #div_partition_maintenance,
 #div_referential_integrity,
+#div_table_removal,
 #div_table_maintenance {
     min-width: 48%;
     float: <?php echo $left; ?>;


hooks/post-receive
-- 
phpMyAdmin