nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into gettext

Browse Source
This commit is contained in:
Michal Čihař
2010-03-24 09:39:30 +01:00
parent 237c009be8 58ebfd4591
commit c7441a5a54
8 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
db_structure.php
View File

@@ -12,7 +12,8 @@
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php'; require_once './libraries/Table.class.php';
$GLOBALS['js_include'][] = 'jquery.js'; $GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
/** /**
* Prepares the tables list if the user where not redirected to this script * Prepares the tables list if the user where not redirected to this script

0
js/jquery.js → js/jquery/jquery-1.4.2-min.js vendored
View File

42
js/jquery/jquery-ui-1.8.custom.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
libraries/common.lib.php
View File

@@ -2462,7 +2462,9 @@ function PMA_generate_slider_effect($id, $message)
$('<a href="#" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>') $('<a href="#" id="anchor_<?php echo $id; ?>"><?php echo htmlspecialchars($message); ?></a>')
.insertBefore('#<?php echo $id; ?>') .insertBefore('#<?php echo $id; ?>')
.click(function() { .click(function() {
$('#<?php echo $id; ?>').slideToggle('normal', function() { // the callback should be the 4th parameter but
// it only works as the second parameter
$('#<?php echo $id; ?>').toggle('drop', function() {
PMA_set_status_label_<?php echo $id; ?>(); PMA_set_status_label_<?php echo $id; ?>();
}); });
}); });

2
libraries/db_events.inc.php
View File

@@ -51,7 +51,7 @@ if ($events) {
($ct%2 == 0) ? 'even' : 'odd', ($ct%2 == 0) ? 'even' : 'odd',
$event['EVENT_NAME'], $event['EVENT_NAME'],
! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;', ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&amp;sql_query=' . urlencode($definition) . '&amp;show_query=1&amp;delimiter=' . urlencode($delimiter), $titles['Structure']) : '&nbsp;',
'<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>', '<a href="sql.php?' . $url_query . '&amp;sql_query=' . urlencode($sqlDrop) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($sqlDrop, false) . '\')">' . $titles['Drop'] . '</a>',
$event['EVENT_TYPE']); $event['EVENT_TYPE']);
$ct++; $ct++;
} }

3
sql.php
View File

@@ -15,7 +15,8 @@ require_once './libraries/Table.class.php';
require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php'; require_once './libraries/bookmark.lib.php';
$GLOBALS['js_include'][] = 'jquery.js'; $GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
/** /**
* Defines the url to return to in case of error in a sql statement * Defines the url to return to in case of error in a sql statement

3
tbl_select.php
View File

@@ -19,7 +19,8 @@ require_once './libraries/relation.lib.php'; // foreign keys
require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/mysql_charsets.lib.php';
$GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery.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) { if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
$titles['Browse'] = $titles['Browse'] =

3
tbl_structure.php
View File

@@ -14,7 +14,8 @@ require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php'; require_once './libraries/mysql_charsets.lib.php';
require_once './libraries/relation.lib.php'; require_once './libraries/relation.lib.php';
$GLOBALS['js_include'][] = 'jquery.js'; $GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
/** /**
* handle multiple field commands if required * handle multiple field commands if required