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

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Mike Hommé
2011-03-07 21:42:47 -05:00
parent 7f5626788f abb98084f8
commit 179cbfadc9
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db_qbe.php
View File

@@ -180,12 +180,8 @@ function showColumnSelectCell($columns, $column_number, $selected = '')
?> ?>
<div id="visual_builder_anchor" class="notice hide"> <div id="visual_builder_anchor" class="notice hide">
<span id="footnote_1"> <span id="footnote_1">
<?php echo __('Switch to'); ?> <?php echo __('Switch to') . ' <a href="' . $tab_designer['link'] . PMA_get_arg_separator('html') . 'query=1">' . __('visual builder') . '</a>'; ?>
<form action="<?php echo $tab_designer['link'] ?>" method="post"> </span>
<input type="submit" style="background-color:#FFD; border-width:0; color:#00F;
font-size: 15px;cursor: pointer" name="query" onmouseover="this.style.color='#F00';"
value="<?php echo __('visual builder'); ?>" onmouseout="this.style.color='#00F'"/></span>
</form>
</div> </div>
<?php <?php
} }

15
pmd_general.php
View File

@@ -27,6 +27,13 @@ $hidden = "hidden";
<link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" />
<title>Designer</title> <title>Designer</title>
<?php
$params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
require_once './libraries/header_scripts.inc.php';
?>
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
<?php <?php
@@ -48,14 +55,6 @@ echo '
?> ?>
// ]]> // ]]>
</script> </script>
<?php
$params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db'];
}
require_once './libraries/header_scripts.inc.php';
?>
<script src="js/messages.php<?php echo PMA_generate_common_url($params); ?>" type="text/javascript"></script>
<script src="pmd/scripts/ajax.js" type="text/javascript"></script> <script src="pmd/scripts/ajax.js" type="text/javascript"></script>
<script src="pmd/scripts/history.js" type="text/javascript"></script> <script src="pmd/scripts/history.js" type="text/javascript"></script>
<script src="pmd/scripts/move.js" type="text/javascript"></script> <script src="pmd/scripts/move.js" type="text/javascript"></script>