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:
Pootle server
2011-01-02 14:40:25 +01:00
parent f66fa34976 bc49e8b30b
commit e37d3d52d1
9 changed files with 2079 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db_search.php
View File

@@ -37,7 +37,7 @@
*/
require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js';
$GLOBALS['js_include'][] = 'db_search.js';
/**

2
index.php
View File

@@ -152,7 +152,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
};
// ]]>
</script>
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="./js/update-location.js" type="text/javascript"></script>
<script src="./js/common.js" type="text/javascript"></script>
</head>

3203
js/jquery/jquery-1.4.2.js → js/jquery/jquery-1.4.4.js vendored
View File

File diff suppressed because it is too large Load Diff

2
libraries/auth/cookie.auth.lib.php
View File

@@ -170,7 +170,7 @@ function PMA_auth()
$page_title = 'phpMyAdmin ';
require './libraries/header_meta_style.inc.php';
?>
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script src="./js/update-location.js" type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[

2
libraries/common.inc.php
View File

@@ -539,7 +539,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
* @global array $js_include
*/
$GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2.js';
$GLOBALS['js_include'][] = 'jquery/jquery-1.4.4.js';
$GLOBALS['js_include'][] = 'update-location.js';
/**

2
navigation.php
View File

@@ -130,7 +130,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('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
<script src="./js/jquery/jquery-1.4.4.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">

2
pmd_general.php
View File

@@ -27,7 +27,7 @@ $hidden = "hidden";
<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" />
<title>Designer</title>
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
<script src="./js/jquery/jquery-1.4.4.js" type="text/javascript"></script>
<script type="text/javascript">
// <![CDATA[
<?php

2
setup/index.php
View File

@@ -33,7 +33,7 @@ require './libraries/header_http.inc.php';
<link href="../favicon.ico" rel="icon" type="image/x-icon" />
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="styles.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../js/jquery/jquery-1.4.2.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-1.4.4.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.custom.js"></script>
<script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script>
<script type="text/javascript" src="../js/config.js"></script>

3
tbl_change.php
View File

@@ -427,8 +427,7 @@ foreach ($rows as $row_id => $vrow) {
<input type="hidden" name="fields_name<?php echo $field_name_appendix; ?>" value="<?php echo $field['Field_html']; ?>"/>
</td>
<?php if ($cfg['ShowFieldTypesInDataEditView']) { ?>
<td align="center"<?php echo $field['wrap']; ?>><span class="column_type">
<?php echo $field['pma_type']; ?></span>
<td align="center"<?php echo $field['wrap']; ?>><span class="column_type"><?php echo $field['pma_type']; ?></span>
</td>
<?php } //End if