[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4486-gad71c5b

Michal Čihař nijel at users.sourceforge.net
Mon May 31 14:19:58 CEST 2010


The branch, master has been updated
       via  ad71c5b0ce324d15e0ec238150b01ba18aa2151a (commit)
       via  168824b38fe7654cbe6bb8850d80c3f598d77e48 (commit)
      from  9d0b7a0987e362d5b7cfca48cd54a2b76dc8c911 (commit)


- Log -----------------------------------------------------------------
commit ad71c5b0ce324d15e0ec238150b01ba18aa2151a
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 31 14:18:37 2010 +0200

    Standard look to forms on table operations page.

commit 168824b38fe7654cbe6bb8850d80c3f598d77e48
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 31 14:17:50 2010 +0200

    Standard look to all forms on database properties page.

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

Summary of changes:
 db_operations.php  |    6 ++++++
 tbl_operations.php |    6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/db_operations.php b/db_operations.php
index 44e93b2..e879f06 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -380,6 +380,8 @@ if (!$is_information_schema) {
         <input type="text" name="comment" class="textfield" size="30"
             value="<?php
             echo htmlspecialchars(PMA_getDBComment($db)); ?>" />
+    </fieldset>
+    <fieldset class="tblFooters">
         <input type="submit" value="<?php echo __('Go'); ?>" />
     </fieldset>
     </form>
@@ -422,6 +424,8 @@ if (!$is_information_schema) {
         echo 'INSERT INTO ... SELECT';
     //}
     echo ')'; ?>
+    </fieldset>
+    <fieldset class="tblFooters">
         <input type="submit" value="<?php echo __('Go'); ?>" onclick="return confirmLink(this, 'CREATE DATABASE ... <?php echo __('and then'); ?> DROP DATABASE <?php echo PMA_jsFormat($db); ?>')" />
     </fieldset>
     </form>
@@ -599,6 +603,8 @@ if (!$is_information_schema) {
        . '    </legend>' . "\n"
        . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION,
             'db_collation', 'select_db_collation', $db_collation, false, 3)
+       . '</fieldset>'
+       . '<fieldset class="tblFooters">'
        . '    <input type="submit" name="submitcollation"'
        . ' value="' . __('Go') . '" />' . "\n"
        . '</fieldset>' . "\n"
diff --git a/tbl_operations.php b/tbl_operations.php
index a5b1357..4e0738a 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -157,7 +157,7 @@ if (isset($_REQUEST['submitoptions'])) {
         $reread_info    = true;
         unset($table_alters);
         foreach (PMA_DBI_get_warnings() as $warning) {
-            // In MariaDB 5.1.44, when altering a table from Maria to MyISAM 
+            // In MariaDB 5.1.44, when altering a table from Maria to MyISAM
             // and if TRANSACTIONAL was set, the system reports an error;
             // I discussed with a Maria developer and he agrees that this
             // should not be reported with a Level of Error, so here
@@ -194,7 +194,7 @@ if (isset($_REQUEST['submit_partition']) && ! empty($_REQUEST['partition_operati
 if ($reread_info) {
     // to avoid showing the old value (for example the AUTO_INCREMENT) after
     // a change, clear the cache
-    PMA_Table::$cache = array(); 
+    PMA_Table::$cache = array();
     $page_checksum = $checksum = $delay_key_write = 0;
     require './libraries/tbl_info.inc.php';
 }
@@ -260,6 +260,8 @@ unset($columns);
         <option value="asc"><?php echo __('Ascending'); ?></option>
         <option value="desc"><?php echo __('Descending'); ?></option>
     </select>
+</fieldset>
+<fieldset class="tblFooters">
     <input type="submit" name="submitorderby" value="<?php echo __('Go'); ?>" />
 </fieldset>
 </form>


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list