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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař
2010-04-03 02:40:27 +02:00
parent 6d374e4db2 5c26356379
commit fae8e48818
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/replication.js Normal file
View File

@@ -0,0 +1,25 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* for server_replication.php
*
*/
$(document).ready(function() {
$('#master_status_href').click(function() {
$('#replication_master_section').toggle();
});
$('#master_slaves_href').click(function() {
$('#replication_slaves_section').toggle();
});
$('#slave_status_href').click(function() {
$('#replication_slave_section').toggle();
});
$('#slave_control_href').click(function() {
$('#slave_control_gui').toggle();
});
$('#slave_errormanagement_href').click(function() {
$('#slave_errormanagement_gui').toggle();
});
$('#slave_synchronization_href').click(function() {
$('#slave_synchronization_gui').toggle();
});
});

4
libraries/common.lib.php
View File

@@ -2750,8 +2750,8 @@ function PMA_js_mootools_domready($code, $print=true)
$out .= "\n" . '// ]]>' . "\n";
$out .= '</script>';
if ($print)
echo $out;
//if ($print)
// echo $out;
return $out;
}

11
libraries/replication_gui.lib.php
View File

@@ -9,9 +9,6 @@ if (! defined('PHPMYADMIN')) {
exit;
}
$jscode['master_replication'] = 'divShowHideFunc(\'master_status_href\', \'replication_master_section\');' . "\n"
. 'divShowHideFunc(\'master_slaves_href\', \'replication_slaves_section\');' . "\n";
// Add JS events to generate example my.cnf config lines
$jscode['configure_master'] =
'var c_output = "";' . "\n" .
@@ -53,14 +50,6 @@ $jscode['configure_master'] =
' });' . "\n" .
'});' . "\n";
$jscode['slave_control'] =
'divShowHideFunc(\'slave_status_href\', \'replication_slave_section\');' . "\n" .
'divShowHideFunc(\'slave_control_href\', \'slave_control_gui\');' . "\n" .
'divShowHideFunc(\'slave_errormanagement_href\',\'slave_errormanagement_gui\'); ' . "\n";
$jscode['slave_control_sync'] =
'divShowHideFunc(\'slave_synchronization_href\', \'slave_synchronization_gui\');' . "\n";
/**
* returns code for selecting databases
*

4
server_replication.php
View File

@@ -17,6 +17,7 @@ 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'][] = 'replication.js';
require './libraries/server_common.inc.php';
require './libraries/replication.inc.php';
@@ -177,7 +178,6 @@ if (isset($_SESSION['replication']['sr_action_status']) && isset($_SESSION['repl
if ($server_master_status) {
if (! isset($GLOBALS['repl_clear_scr'])) {
echo PMA_js_mootools_domready($jscode['master_replication']);
echo '<fieldset>';
echo '<legend>' . $GLOBALS['strReplicationMaster'] . '</legend>';
echo $GLOBALS['strReplicationConfiguredMaster'];
@@ -249,7 +249,6 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
echo '<fieldset>';
echo '<legend>' . $GLOBALS['strReplicationSlave'] . '</legend>';
if ($server_slave_status) {
echo PMA_js_mootools_domready($jscode['slave_control']);
echo '<div id="slave_configuration_gui">';
$_url_params = $GLOBALS['url_params'];
@@ -311,7 +310,6 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
echo ' <li><a href="#" id="slave_status_href">' . $GLOBALS['strReplicationSlaveSeeStatus'] . '</a></li>';
echo PMA_replication_print_status_table('slave', true, false);
if (isset($_SESSION['replication']['m_correct']) && $_SESSION['replication']['m_correct'] == true) {
echo PMA_js_mootools_domready($jscode['slave_control_sync']);
echo ' <li><a href="#" id="slave_synchronization_href">' . $GLOBALS['strReplicationSynchronize'] . '</a></li>';
echo ' <div id="slave_synchronization_gui" style="display: none">';
echo ' <form method="post" action="server_replication.php">';