Git April 2010

git@phpmyadmin.net

6 participants
240 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1233-gc9465ae

by Michal Čihař

The branch, master has been updated via c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c (commit) via d31133e60954de2513e1e720532d8709235d0b90 (commit) via b86f3c01f26d221fd010029dd02b331a477b76b3 (commit) via b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 (commit) from 7d106d4aa3ea4139f2621b517436689f4366f30a (commit) - Log ----------------------------------------------------------------- commit c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:51:23 2010 +0200 Remove not used code paths. commit d31133e60954de2513e1e720532d8709235d0b90 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:50:51 2010 +0200 Whitespace cleanup. commit b86f3c01f26d221fd010029dd02b331a477b76b3 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:42:16 2010 +0200 Merge single function for replication into other js. Separate js file with single function will only worse loading times. commit b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Apr 2 08:38:48 2010 +0200 Add missing jQuery include. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 50 +++++++++++++++++++++++++++++------------------ js/mootools_common.js | 15 -------------- navigation.php | 1 + server_replication.php | 1 - 4 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 js/mootools_common.js diff --git a/js/functions.js b/js/functions.js index 045e55a..8dea75d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -576,26 +576,23 @@ function validateConnection(form_name, form_obj) { // All the text fields are checked excluding the port field because the default port can be used. if ((form_name.elements[i].type == 'text') && (form_name.elements[i].name != 'src_port') && (form_name.elements[i].name != 'trg_port')) { - check = true; check = emptyFormElements(form_obj, form_name.elements[i].name); - - if (check==false) { - element = form_name.elements[i].name; - if (form_name.elements[i].name == 'src_host') { - src_hostfilled = false; - continue; - } - if (form_name.elements[i].name == 'trg_host') { - trg_hostfilled = false; - continue; - } - if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) - break; - else - continue; - break; - } - } + if (check==false) { + element = form_name.elements[i].name; + if (form_name.elements[i].name == 'src_host') { + src_hostfilled = false; + continue; + } + if (form_name.elements[i].name == 'trg_host') { + trg_hostfilled = false; + continue; + } + if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) + break; + else + continue; + } + } } if (!check) { form_obj.reset(); @@ -1678,3 +1675,18 @@ $(document).ready(function(){ $(".sql").html("<span class=\"syntax\">"+$oldText+"</span>"); }); }); + +/** + * Used for replication support + * + * @version $Id$ + */ + +function divShowHideFunc(ahref, id) { + $(ahref).addEvent('click', function() { + if ($(id).getStyle('display')=="none") + $(id).tween('display', 'block'); + else + $(id).tween('display', 'none'); + }); +} diff --git a/js/mootools_common.js b/js/mootools_common.js deleted file mode 100644 index 8de3bdb..0000000 --- a/js/mootools_common.js +++ /dev/null @@ -1,15 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Used for replication support - * - * @version $Id$ - */ - -function divShowHideFunc(ahref, id) { - $(ahref).addEvent('click', function() { - if ($(id).getStyle('display')=="none") - $(id).tween('display', 'block'); - else - $(id).tween('display', 'none'); - }); -} diff --git a/navigation.php b/navigation.php index 8fcc7ab..82f7f95 100644 --- a/navigation.php +++ b/navigation.php @@ -151,6 +151,7 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> + <script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript"> diff --git a/server_replication.php b/server_replication.php index 5dd4212..7397d76 100644 --- a/server_replication.php +++ b/server_replication.php @@ -17,7 +17,6 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; -$GLOBALS['js_include'][] = 'mootools_common.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php'; hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1229-g7d106d4

by Marc Delisle

The branch, master has been updated via 7d106d4aa3ea4139f2621b517436689f4366f30a (commit) from 20a402ba29776f2ed1ba3122e48df98bfc11cafe (commit) - Log ----------------------------------------------------------------- commit 7d106d4aa3ea4139f2621b517436689f4366f30a Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 16:30:59 2010 -0400 missing jQuery on login page (needed by update-location.js ----------------------------------------------------------------------- Summary of changes: libraries/auth/cookie.auth.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index ab5bae7..8c85922 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -184,7 +184,7 @@ function PMA_auth() $page_title = 'phpMyAdmin '; require './libraries/header_meta_style.inc.php'; ?> -<script src="./js/mootools.js" type="text/javascript"></script> +<script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> <script type="text/javascript"> //<![CDATA[ hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1228-g20a402b

by Dieter Adriaenssens

The branch, master has been updated via 20a402ba29776f2ed1ba3122e48df98bfc11cafe (commit) via 366d50a79b53c827926f97e14ee2f6937f161909 (commit) from 7a23444873b8a41fb379204236d27368a5427def (commit) - Log ----------------------------------------------------------------- commit 20a402ba29776f2ed1ba3122e48df98bfc11cafe Merge: 7a23444873b8a41fb379204236d27368a5427def 366d50a79b53c827926f97e14ee2f6937f161909 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Apr 1 21:07:09 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0655ba..1db24c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ $Id$ - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. +- bug #2980582 [interface] Properly format server status parameter. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/server_status.php b/server_status.php index ec6083a..a6d63bd 100644 --- a/server_status.php +++ b/server_status.php @@ -143,6 +143,10 @@ if (isset($server_status['Threads_created']) * 100; } +// Format Uptime_since_flush_status : show as days, hours, minutes, seconds +if (isset($server_status['Uptime_since_flush_status'])) { + $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']); +} /** * define some alerts hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-87-g366d50a

by Dieter Adriaenssens

The branch, QA_3_3 has been updated via 366d50a79b53c827926f97e14ee2f6937f161909 (commit) from acb30d5a2ae4d4235f95fe1087065c5562ae194f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61e090d..c02f8c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2979234 [import] Create tables with current charset and collation. - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. - bug #2973280 [export] Proper handling of temporary directory in XLS export. +- bug #2980582 [interface] Properly format server status parameter. 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/server_status.php b/server_status.php index 64048b3..9c8fe01 100644 --- a/server_status.php +++ b/server_status.php @@ -143,6 +143,10 @@ if (isset($server_status['Threads_created']) * 100; } +// Format Uptime_since_flush_status : show as days, hours, minutes, seconds +if (isset($server_status['Uptime_since_flush_status'])) { + $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']); +} /** * define some alerts hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1226-g7a23444

by Marc Delisle

The branch, master has been updated via 7a23444873b8a41fb379204236d27368a5427def (commit) from 0942aca09061689e9bfdc59eba34dc1fbcdb580b (commit) - Log ----------------------------------------------------------------- commit 7a23444873b8a41fb379204236d27368a5427def Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 14:11:55 2010 -0400 no longer needed ----------------------------------------------------------------------- Summary of changes: index.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/index.php b/index.php index fb8c977..a57be9b 100644 --- a/index.php +++ b/index.php @@ -159,7 +159,6 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); }; // ]]> </script> -<script src="./js/mootools.js" type="text/javascript"></script> <script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script src="./js/update-location.js" type="text/javascript"></script> <script src="./js/common.js" type="text/javascript"></script> hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1225-g0942aca

by Michal Čihař

The branch, master has been updated via 0942aca09061689e9bfdc59eba34dc1fbcdb580b (commit) via acb30d5a2ae4d4235f95fe1087065c5562ae194f (commit) from a2a0d9bb38ac32403a753a089a9d7e9f07775652 (commit) - Log ----------------------------------------------------------------- commit 0942aca09061689e9bfdc59eba34dc1fbcdb580b Merge: a2a0d9bb38ac32403a753a089a9d7e9f07775652 acb30d5a2ae4d4235f95fe1087065c5562ae194f Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 1 18:05:50 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: setup/lib/FormDisplay.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php index b0e03a9..e3c8b0a 100644 --- a/setup/lib/FormDisplay.class.php +++ b/setup/lib/FormDisplay.class.php @@ -455,7 +455,7 @@ class FormDisplay break; case 'select': if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) { - $this->errors[$work_path][] = $GLOBALS["strstrSetuperror_incorrect_value"]; + $this->errors[$work_path][] = $GLOBALS["strSetuperror_incorrect_value"]; $result = false; continue; } hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-86-gacb30d5

by Michal Čihař

The branch, QA_3_3 has been updated via acb30d5a2ae4d4235f95fe1087065c5562ae194f (commit) from 58c33c410e2699484d6183b3fb0318d108cebd8d (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: setup/lib/FormDisplay.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup/lib/FormDisplay.class.php b/setup/lib/FormDisplay.class.php index 5483b00..b229a1a 100644 --- a/setup/lib/FormDisplay.class.php +++ b/setup/lib/FormDisplay.class.php @@ -456,7 +456,7 @@ class FormDisplay break; case 'select': if (!$this->_validateSelect($_POST[$key], $form->getOptionValueList($system_path))) { - $this->errors[$work_path][] = $GLOBALS["strstrSetuperror_incorrect_value"]; + $this->errors[$work_path][] = $GLOBALS["strSetuperror_incorrect_value"]; $result = false; continue; } hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1223-ga2a0d9b

by Michal Čihař

The branch, master has been updated via a2a0d9bb38ac32403a753a089a9d7e9f07775652 (commit) from b9364ac3575bae4a2e3980487d804dfd49b45bcb (commit) - Log ----------------------------------------------------------------- commit a2a0d9bb38ac32403a753a089a9d7e9f07775652 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Apr 1 17:18:52 2010 +0200 Avoid multiple loading of jQuery. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 11 +++++------ main.php | 1 - sql.php | 5 ++--- tbl_replace.php | 5 ++--- tbl_select.php | 5 ++--- tbl_structure.php | 13 ++++++------- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/db_structure.php b/db_structure.php index f5b5639..479980e 100644 --- a/db_structure.php +++ b/db_structure.php @@ -12,7 +12,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** @@ -195,7 +194,7 @@ foreach ($tables as $keyname => $each_table) { $each_table['Rows'] = PMA_Table::countRecords($db, $each_table['Name']); } - + if ($is_show_stats) { $tblsize = doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']); $sum_size += $tblsize; @@ -348,15 +347,15 @@ foreach ($tables as $keyname => $each_table) { <?php PMA_TableHeader(false, $server_slave_status); } - + $ignored = false; $do = false; - + if ($server_slave_status) { //////////////////////////////////////////////////////////////// - if ((strlen(array_search($truename, $server_slave_Do_Table)) > 0) - || (strlen(array_search($db, $server_slave_Do_DB)) > 0) + if ((strlen(array_search($truename, $server_slave_Do_Table)) > 0) + || (strlen(array_search($db, $server_slave_Do_DB)) > 0) || (count($server_slave_Do_DB) == 1 && count($server_slave_Ignore_DB) == 1) ) { $do = true; diff --git a/main.php b/main.php index f942b40..376ee55 100644 --- a/main.php +++ b/main.php @@ -12,7 +12,6 @@ define('PMA_COLORPICKER', true); require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; $GLOBALS['js_include'][] = 'main_custom_color.js'; diff --git a/sql.php b/sql.php index 9234af8..ce9a0d2 100644 --- a/sql.php +++ b/sql.php @@ -15,7 +15,6 @@ require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** @@ -296,7 +295,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } // fisharebest: release the session lock, otherwise we won't be able to run other - // scripts until the query has finished (which could take a very long time). + // scripts until the query has finished (which could take a very long time). // Note: footer.inc.php writes debug info to $_SESSION, so debuggers will have to wait. if (empty($_SESSION['debug'])) { session_write_close(); @@ -388,7 +387,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { // If we are "just browsing", there is only one table, // and no WHERE clause (or just 'WHERE 1 '), - // we do a quick count (which uses MaxExactCount) because + // we do a quick count (which uses MaxExactCount) because // SQL_CALC_FOUND_ROWS is not quick on large InnoDB tables // However, do not count again if we did it previously diff --git a/tbl_replace.php b/tbl_replace.php index 3167baa..5e7b977 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -96,7 +96,7 @@ if (isset($_REQUEST['after_insert']) // must find a unique condition based on unique key, // not a combination of all fields list($unique_condition, $clause_is_unique) = PMA_getUniqueCondition($res, count($meta), $meta, $row, true); - if (! empty($unique_condition)) { + if (! empty($unique_condition)) { $_SESSION['edit_next'] = $unique_condition; } unset($unique_condition, $clause_is_unique); @@ -346,7 +346,7 @@ if (! empty($GLOBALS['sql_query'])) { $return_to_sql_query = $GLOBALS['sql_query']; } $GLOBALS['sql_query'] = implode('; ', $query) . ';'; -// to ensure that the query is displayed in case of +// to ensure that the query is displayed in case of // "insert as new row" and then "insert another new row" $GLOBALS['display_query'] = $GLOBALS['sql_query']; @@ -431,7 +431,6 @@ if (isset($return_to_sql_query)) { $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'functions.js'; // in case we call sql.php which needs those: -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; $active_page = $goto_include; diff --git a/tbl_select.php b/tbl_select.php index 0fbd24c..8d23c95 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -19,7 +19,6 @@ require_once './libraries/relation.lib.php'; // foreign keys require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { @@ -341,8 +340,8 @@ else { $param = PMA_backquote($param); $sql_query .= implode(', ', $param); } // end if - - // avoid a loop, for example when $cfg['DefaultTabTable'] is set + + // avoid a loop, for example when $cfg['DefaultTabTable'] is set // to 'tbl_select.php' unset($param); diff --git a/tbl_structure.php b/tbl_structure.php index 0f3aae2..ba80464 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/relation.lib.php'; -$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js'; /** @@ -117,7 +116,7 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) { $columns = $index->getColumns(); foreach ($columns as $column_name => $dummy) { $columns_with_unique_index[$column_name] = 1; - } + } } } unset($index, $columns, $column_name, $dummy); @@ -519,20 +518,20 @@ if (! $tbl_is_view && ! $db_is_information_schema) { echo $strStructPropose; ?></a><?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; - - + + if(PMA_Tracker::isActive()) { echo '<a href="tbl_tracking.php?' . $url_query . '">'; - - if ($cfg['PropertiesIconic']) + + if ($cfg['PropertiesIconic']) { echo '<img class="icon" src="' . $pmaThemeImage . 'eye.png" width="16" height="16" alt="' . $strTrackingTrackTable . '" /> '; } echo $strTrackingTrackTable . '</a>'; } ?> - + <br /> <form method="post" action="tbl_addfield.php" onsubmit="return checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidFieldAddCount']); ?>', 1)"> hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1222-gb9364ac

by Marc Delisle

The branch, master has been updated via b9364ac3575bae4a2e3980487d804dfd49b45bcb (commit) from 14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326 (commit) - Log ----------------------------------------------------------------- commit b9364ac3575bae4a2e3980487d804dfd49b45bcb Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 10:56:47 2010 -0400 reverting as CSS in themes already deals with this issue ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 99cc5c5..045e55a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1667,8 +1667,6 @@ $(document).ready(function(){ $token=$("input[name='token']").val(); $sql_query=$("input[name='sql_query']").val(); $(".syntax").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ $sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\"><input type=\"button\" id=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">"); - // to help seeing the buttons without scrolling - $('#sql_query_edit').css({height: '6em', width: '75%'}); return false; }); hooks/post-receive -- phpMyAdmin

14 years, 5 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1221-g14d12d1

by Marc Delisle

The branch, master has been updated via 14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326 (commit) via 46eb3e47211f5b187291462f94541f1f440cadcf (commit) from d9008701482252d3c8f35b8bcaafec4afa3b6310 (commit) - Log ----------------------------------------------------------------- commit 14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326 Merge: 46eb3e47211f5b187291462f94541f1f440cadcf d9008701482252d3c8f35b8bcaafec4afa3b6310 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 10:30:59 2010 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 46eb3e47211f5b187291462f94541f1f440cadcf Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Apr 1 10:30:26 2010 -0400 inline edit: help seeing the buttons without scrolling; XHTML compliancy ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 ++ libraries/common.lib.php | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 045e55a..99cc5c5 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1667,6 +1667,8 @@ $(document).ready(function(){ $token=$("input[name='token']").val(); $sql_query=$("input[name='sql_query']").val(); $(".syntax").replaceWith("<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">"+ $sql_query +"</textarea><input type=\"button\" id=\"btnSave\" value=\"" + PMA_messages['strGo'] + "\"><input type=\"button\" id=\"btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\">"); + // to help seeing the buttons without scrolling + $('#sql_query_edit').css({height: '6em', width: '75%'}); return false; }); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3a53d04..816bdbe 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1270,11 +1270,15 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($refresh_link)) { PMA_profilingCheckbox($sql_query); } - $inline_edit = "<script language=\"javascript\">document.write('[<a href=\"#\" title=\"" . + $inline_edit = "<script type=\"text/javascript\">\n" . + "//<![CDATA[\n" . + "document.write('[<a href=\"#\" title=\"" . PMA_escapeJsString(__('Inline edit of this query')) . "\" id=\"inline_edit\">" . PMA_escapeJsString(__('Inline')) . - "</a>]');</script>"; + "</a>]');\n" . + "//]]>\n" . + "</script>"; echo $inline_edit . $edit_link . $explain_link . $php_link . $refresh_link . $validate_link; echo '</div>'; } hooks/post-receive -- phpMyAdmin

14 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git April 2010