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

Consistent function naming and corrected documentation

Browse Source
This commit is contained in:
Michal Čihař 2013-05-10 09:42:17 +02:00
parent 636ba8a1c8
commit 0ebf0a1324
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server_status_advisor.php
View File

@ -28,19 +28,17 @@ $scripts->addFile('server_status_advisor.js');
*/
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(getPrintAdvisorHtml($ServerStatusData));
$response->addHTML(PMA_getAdvisorHtml($ServerStatusData));
$response->addHTML('</div>');
exit;
/**
* Prints html with Advisor
*
* @param null
* Returns html with Advisor
*
* @return string
*/
function getPrintAdvisorHtml()
function PMA_getAdvisorHtml()
{
$output = '<a href="#openAdvisorInstructions">';
$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
@ -84,7 +82,7 @@ function getPrintAdvisorHtml()
)
);
$output .= '</div>';
return $output;
}

18
server_status_monitor.php
View File

@ -452,7 +452,7 @@ $links .= '</div>';
*/
$response->addHTML('<div>');
$response->addHTML($ServerStatusData->getMenuHtml());
$response->addHTML(getPrintMonitorHtml($ServerStatusData));
$response->addHTML(PMA_getMonitorHtml($ServerStatusData));
$response->addHTML($form);
$response->addHTML($links);
$response->addHTML('</div>');
@ -465,9 +465,9 @@ exit;
*
* @return string
*/
function getPrintMonitorHtml($ServerStatusData)
function PMA_getMonitorHtml($ServerStatusData)
{
$retval = getTabLinksHtml();
$retval = PMA_getTabLinksHtml();
$retval .= getPopContentHtml();
$retval .= '<div id="monitorInstructionsDialog" title="';
@ -684,13 +684,11 @@ function PMA_getRefreshList($name,
}
/**
* Prints html with Tab Links
*
* @param null
* Returns html with Tab Links
*
* @return string
*/
function getTabLinksHtml()
function PMA_getTabLinksHtml()
{
$retval = '<div class="tabLinks">';
$retval .= '<a href="#pauseCharts">';
@ -708,14 +706,12 @@ function getTabLinksHtml()
$retval .= __('Done rearranging/editing charts');
$retval .= '</a>';
$retval .= '</div>';
return $retval;
}
/**
* Prints html with Pop Content
*
* @param null
* Returns html with Pop Content
*
* @return string
*/