From 618f2d7408a14dee3e049b9864c107da6e7c849a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 23 Nov 2005 19:10:30 +0000
Subject: [PATCH] Move javascript stuff out of libraries folder.

---
 ChangeLog                              |  5 +++++
 browse_foreigners.php                  |  2 +-
 calendar.php                           |  2 +-
 header.inc.php                         | 14 +++++++-------
 index.php                              |  2 +-
 {libraries => js}/dom-drag.js          |  0
 {libraries => js}/functions.js         |  0
 {libraries => js}/indexes.js           |  0
 {libraries => js}/keyhandler.js        |  0
 {libraries => js}/querywindow.js       |  0
 {libraries => js}/server_privileges.js |  0
 {libraries => js}/tbl_change.js        |  0
 {libraries => js}/tooltip.js           |  0
 {libraries => js}/user_password.js     |  0
 libraries/display_tbl_links.lib.php    |  2 +-
 pdf_pages.php                          |  2 +-
 querywindow.php                        |  2 +-
 tbl_change.php                         |  2 +-
 tbl_properties.inc.php                 |  2 +-
 test/theme.php                         |  6 +++---
 20 files changed, 23 insertions(+), 18 deletions(-)
 rename {libraries => js}/dom-drag.js (100%)
 mode change 100755 => 100644
 rename {libraries => js}/functions.js (100%)
 rename {libraries => js}/indexes.js (100%)
 rename {libraries => js}/keyhandler.js (100%)
 rename {libraries => js}/querywindow.js (100%)
 rename {libraries => js}/server_privileges.js (100%)
 rename {libraries => js}/tbl_change.js (100%)
 rename {libraries => js}/tooltip.js (100%)
 rename {libraries => js}/user_password.js (100%)

diff --git a/ChangeLog b/ChangeLog
index e5c0f9310..5a8a4816b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/browse_foreigners.php b/browse_foreigners.php
index aaecd0e7d..75cb5ba1a 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -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();
diff --git a/calendar.php b/calendar.php
index d8d46f244..e24ca43af 100644
--- a/calendar.php
+++ b/calendar.php
@@ -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); ?>");
diff --git a/header.inc.php b/header.inc.php
index ae174388c..d33497380 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -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>
diff --git a/index.php b/index.php
index d09f5101a..8056ed567 100644
--- a/index.php
+++ b/index.php
@@ -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">
diff --git a/libraries/dom-drag.js b/js/dom-drag.js
old mode 100755
new mode 100644
similarity index 100%
rename from libraries/dom-drag.js
rename to js/dom-drag.js
diff --git a/libraries/functions.js b/js/functions.js
similarity index 100%
rename from libraries/functions.js
rename to js/functions.js
diff --git a/libraries/indexes.js b/js/indexes.js
similarity index 100%
rename from libraries/indexes.js
rename to js/indexes.js
diff --git a/libraries/keyhandler.js b/js/keyhandler.js
similarity index 100%
rename from libraries/keyhandler.js
rename to js/keyhandler.js
diff --git a/libraries/querywindow.js b/js/querywindow.js
similarity index 100%
rename from libraries/querywindow.js
rename to js/querywindow.js
diff --git a/libraries/server_privileges.js b/js/server_privileges.js
similarity index 100%
rename from libraries/server_privileges.js
rename to js/server_privileges.js
diff --git a/libraries/tbl_change.js b/js/tbl_change.js
similarity index 100%
rename from libraries/tbl_change.js
rename to js/tbl_change.js
diff --git a/libraries/tooltip.js b/js/tooltip.js
similarity index 100%
rename from libraries/tooltip.js
rename to js/tooltip.js
diff --git a/libraries/user_password.js b/js/user_password.js
similarity index 100%
rename from libraries/user_password.js
rename to js/user_password.js
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index 1b7256e9e..b09496c60 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -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' ){
 
diff --git a/pdf_pages.php b/pdf_pages.php
index 439938d01..baa4c1f52 100644
--- a/pdf_pages.php
+++ b/pdf_pages.php
@@ -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();" />
diff --git a/querywindow.php b/querywindow.php
index bacd07518..2f02ed8f1 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -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; ?> >
diff --git a/tbl_change.php b/tbl_change.php
index 596ba6dc2..0159e1b32 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -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;
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index 947a86ac5..72c002eb3 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -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'; ?>;
diff --git a/test/theme.php b/test/theme.php
index 5fb0b7026..9456801b5 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -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>
\ No newline at end of file
+</html>