[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3656-gb459819

[Marc Delisle]

The branch, master has been updated
       via  b4598190d0c189f74043f6b3f58fd2bcee3bd181 (commit)
      from  abc229d0b055d7328bedfc1d2eed916335b2310a (commit)


- Log -----------------------------------------------------------------
commit b4598190d0c189f74043f6b3f58fd2bcee3bd181
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun May 23 08:44:58 2010 -0400

    style is already in theme CSS

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

Summary of changes:
 db_operations.php |   12 ++++++------
 db_qbe.php        |    4 ++--
 tbl_relation.php  |    2 +-
 tbl_select.php    |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/db_operations.php b/db_operations.php
index fad0d00..8ba13a2 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -463,18 +463,18 @@ if (!$is_information_schema) {
 ?>
         <input type="checkbox" name="create_database_before_copying" value="1"
             id="checkbox_create_database_before_copying"
-            style="vertical-align: middle" checked="checked" />
+            checked="checked" />
         <label for="checkbox_create_database_before_copying">
             <?php echo __('CREATE DATABASE before copying'); ?></label><br />
         <input type="checkbox" name="drop_if_exists" value="true"
-            id="checkbox_drop" style="vertical-align: middle" />
+            id="checkbox_drop" />
         <label for="checkbox_drop"><?php echo sprintf(__('Add %s'), $drop_clause); ?></label><br />
         <input type="checkbox" name="sql_auto_increment" value="1" checked="checked"
-            id="checkbox_auto_increment" style="vertical-align: middle" />
+            id="checkbox_auto_increment" />
         <label for="checkbox_auto_increment">
             <?php echo __('Add AUTO_INCREMENT value'); ?></label><br />
         <input type="checkbox" name="add_constraints" value="1"
-            id="checkbox_constraints" style="vertical-align: middle" />
+            id="checkbox_constraints" />
         <label for="checkbox_constraints">
             <?php echo __('Add constraints'); ?></label><br />
     <?php
@@ -488,7 +488,7 @@ if (!$is_information_schema) {
         <input type="checkbox" name="switch_to_new" value="true"
             id="checkbox_switch"
             <?php echo ((isset($pma_switch_to_new) && $pma_switch_to_new == 'true') ? ' checked="checked"' : ''); ?>
-            style="vertical-align: middle" />
+            />
         <label for="checkbox_switch"><?php echo __('Switch to copied database'); ?></label>
     </fieldset>
     <fieldset class="tblFooters">
@@ -600,7 +600,7 @@ if (!$is_information_schema) {
        . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION,
             'db_collation', 'select_db_collation', $db_collation, false, 3)
        . '    <input type="submit" name="submitcollation"'
-       . ' value="' . __('Go') . '" style="vertical-align: middle" />' . "\n"
+       . ' value="' . __('Go') . '" />' . "\n"
        . '</fieldset>' . "\n"
        . '</form>' . "\n";
 
diff --git a/db_qbe.php b/db_qbe.php
index 984180a..dce1c67 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -582,7 +582,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
 <tr>
     <td nowrap="nowrap">
         <?php echo __('Add/Delete Criteria Row'); ?>:
-        <select size="1" name="add_row" style="vertical-align: middle">
+        <select size="1" name="add_row">
             <option value="-3">-3</option>
             <option value="-2">-2</option>
             <option value="-1">-1</option>
@@ -594,7 +594,7 @@ echo PMA_generate_common_hidden_inputs($url_params);
     </td>
     <td width="10"> </td>
     <td nowrap="nowrap"><?php echo __('Add/Delete Field Columns'); ?>:
-        <select size="1" name="add_col" style="vertical-align: middle">
+        <select size="1" name="add_col">
             <option value="-3">-3</option>
             <option value="-2">-2</option>
             <option value="-1">-1</option>
diff --git a/tbl_relation.php b/tbl_relation.php
index 4a9afa9..c9dbc43 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -546,7 +546,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) {
         ?>
     <fieldset>
         <label><?php echo __('Choose field to display') . ': '; ?></label>
-        <select name="display_field" style="vertical-align: middle">
+        <select name="display_field">
             <option value="">---</option>
         <?php
         foreach ($save_row AS $row) {
diff --git a/tbl_select.php b/tbl_select.php
index f4eb39f..67ff8a8 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -299,7 +299,7 @@ $(function() {
 
 <fieldset id="fieldset_display_order">
     <legend><?php echo __('Display order:'); ?></legend>
-    <select name="orderField" style="vertical-align: middle">
+    <select name="orderField">
         <option value="--nil--"></option>
     <?php
     foreach ($fields_list as $each_field) {


hooks/post-receive
-- 
phpMyAdmin