Move javascript stuff out of libraries folder.

This commit is contained in:
Michal Čihař
2005-11-23 19:10:30 +00:00
parent 075972b8ac
commit 618f2d7408
20 changed files with 23 additions and 18 deletions

View File

@@ -58,6 +58,11 @@ $Source$
* Documentation.html, tbl_properties.inc.php,
transformation_overview.php, libraries/transformations/overview.php
(deleted): Move transformation overview out of libraries folder.
* js/*.js, libraries/*.js (deleted), browse_foreigners.php, calendar.php,
header.inc.php, index.php, pdf_pages.php, querywindow.php,
tbl_change.php, tbl_properties.inc.php,
libraries/display_tbl_links.lib.php, test/theme.php: Move javascript
stuff out of libraries folder.
2005-11-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* added test/theme.php: for testing themes

View File

@@ -95,7 +95,7 @@ if (isset($disp_row) && is_array($disp_row)) {
<base<?php if (!empty($cfg['PmaAbsoluteUri'])) echo ' href="' . $cfg['PmaAbsoluteUri'] . '"'; ?> />
<link rel="stylesheet" type="text/css"
href="./css/phpmyadmin.css.php?<?php echo PMA_generate_common_url( '', '' ); ?>&amp;js_frame=right" />
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript">
//<![CDATA[
self.focus();

View File

@@ -6,7 +6,7 @@ require_once('./libraries/header_http.inc.php');
$page_title = $strCalendar;
require('./libraries/header_meta_style.inc.php');
?>
<script type="text/javascript" src="./libraries/tbl_change.js"></script>
<script type="text/javascript" src="./js/tbl_change.js"></script>
<script type="text/javascript">
<!--
var month_names = new Array("<?php echo implode('","', $month); ?>");

View File

@@ -61,7 +61,7 @@ if (empty($GLOBALS['is_header_sent'])) {
var confirmMsgDropDB = '<?php echo(($GLOBALS['cfg']['Confirm']) ? str_replace('\'', '\\\'', $GLOBALS['strDropDatabaseStrongWarning']) : ''); ?>';
//-->
</script>
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script>
<?php
} else if (isset($js_to_run) && $js_to_run == 'user_password.js') {
echo "\n";
@@ -73,7 +73,7 @@ if (empty($GLOBALS['is_header_sent'])) {
var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
//-->
</script>
<script src="libraries/user_password.js" type="text/javascript" language="javascript"></script>
<script src="./js/user_password.js" type="text/javascript" language="javascript"></script>
<?php
} else if (isset($js_to_run) && $js_to_run == 'server_privileges.js') {
echo "\n";
@@ -85,8 +85,8 @@ if (empty($GLOBALS['is_header_sent'])) {
var jsPasswordNotSame = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strPasswordNotSame']); ?>';
//-->
</script>
<script src="libraries/server_privileges.js" type="text/javascript" language="javascript"></script>
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
<script src="./js/server_privileges.js" type="text/javascript" language="javascript"></script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script>
<?php
} else if (isset($js_to_run) && $js_to_run == 'indexes.js') {
echo "\n";
@@ -96,14 +96,14 @@ if (empty($GLOBALS['is_header_sent'])) {
var errorMsg1 = '<?php echo str_replace('\'', '\\\'', $GLOBALS['strNotNumber']); ?>';
//-->
</script>
<script src="libraries/indexes.js" type="text/javascript" language="javascript"></script>
<script src="./js/indexes.js" type="text/javascript" language="javascript"></script>
<?php
} else if (isset($js_to_run) && $js_to_run == 'tbl_change.js') {
echo "\n";
?>
//-->
</script>
<script src="libraries/tbl_change.js" type="text/javascript" language="javascript"></script>
<script src="./js/tbl_change.js" type="text/javascript" language="javascript"></script>
<?php
} else {
echo "\n";
@@ -117,7 +117,7 @@ if (empty($GLOBALS['is_header_sent'])) {
// Reloads the navigation frame via JavaScript if required
PMA_reloadNavigation();
?>
<script src="libraries/tooltip.js" type="text/javascript"
<script src="./js/tooltip.js" type="text/javascript"
language="javascript"></script>
<meta name="OBGZip" content="<?php echo ($cfg['OBGzip'] ? 'true' : 'false'); ?>" />
</head>

View File

@@ -148,7 +148,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
var pma_absolute_uri = '<?php echo $GLOBALS['cfg']['PmaAbsoluteUri']; ?>';
//]]>
</script>
<script src="libraries/querywindow.js" type="text/javascript"
<script src="./js/querywindow.js" type="text/javascript"
language="javascript"></script>
</head>
<frameset cols="<?php echo $GLOBALS['cfg']['LeftWidth']; ?>,*" rows="*" id="mainFrameset">

0
libraries/dom-drag.js → js/dom-drag.js Executable file → Normal file
View File

View File

@@ -6,7 +6,7 @@
// - bugfix for select all checkboxes
// - copy right to left (or left to right) if user click on a check box
// - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
// - also changes made in libraries/functions.js
// - also changes made in js/functions.js
if ( $doWriteModifyAt == 'left' ){

View File

@@ -303,7 +303,7 @@ if ($cfg['WYSIWYG-PDF']) {
$with_field_names = TRUE;
}
?>
<script type="text/javascript" src="./libraries/dom-drag.js"></script>
<script type="text/javascript" src="./js/dom-drag.js"></script>
<form method="post" action="pdf_pages.php" name="dragdrop">
<input type="button" name="dragdrop" value="<?php echo $strToggleScratchboard; ?>" onclick="ToggleDragDrop('pdflayout');" />
<input type="button" name="dragdropreset" value="<?php echo $strReset; ?>" onclick="resetDrag();" />

View File

@@ -109,7 +109,7 @@ function resize() {
?>
//]]>
</script>
<script src="libraries/functions.js" type="text/javascript" language="javascript"></script>
<script src="./js/functions.js" type="text/javascript" language="javascript"></script>
</head>
<body id="bodyquerywindow" <?php echo $onload; ?> >

View File

@@ -174,7 +174,7 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
<?php if ($cfg['CtrlArrowsMoving']) { ?>
<!-- Set on key handler for moving using by Ctrl+arrows -->
<script src="libraries/keyhandler.js" type="text/javascript" language="javascript"></script>
<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript">
<!--
var switch_movement = 0;

View File

@@ -13,7 +13,7 @@ require_once('./libraries/storage_engines.lib.php');
if ($cfg['CtrlArrowsMoving']) {
?>
<script src="libraries/keyhandler.js" type="text/javascript" language="javascript"></script>
<script src="./js/keyhandler.js" type="text/javascript" language="javascript"></script>
<script type="text/javascript" language="javascript">
<!--
var switch_movement = <?php echo $cfg['DefaultPropDisplay'] == 'horizontal' ? '0' : '1'; ?>;

View File

@@ -39,7 +39,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
href="../css/phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right" />
<link rel="stylesheet" type="text/css" media="print"
href="../css/print.css?<?php echo PMA_generate_common_url(); ?>" />
<script src="../libraries/functions.js" type="text/javascript"
<script src="../js/functions.js" type="text/javascript"
language="javascript"></script>
</head>
<body>
@@ -161,7 +161,7 @@ echo sprintf( $strWelcome,
<hr class="clearfloat" />
<form method="post" action="theme_test.php" target="_parent">
<form method="post" action="theme.php" target="_parent">
<fieldset>
<legend><?php echo $strTheme; ?></legend>
<?php
@@ -300,4 +300,4 @@ foreach ($available_themes_choices AS $cur_theme) {
</tbody>
</table>
</body>
</html>
</html>