The branch, master has been updated via cf004d89ca6786cff687f064740aa9b9fdaa77d5 (commit) from 1ec0b69e6bf3378188a051b45fb2c0e7ea93b990 (commit)

- Log ----------------------------------------------------------------- commit cf004d89ca6786cff687f064740aa9b9fdaa77d5 Author: Michal Čihař mcihar@suse.cz Date: Fri Aug 5 14:52:47 2011 +0200

Move PMD scripts to js directory.

We should have all scripts in single place and this will include them in compression on release.

-----------------------------------------------------------------------

Summary of changes: js/messages.php | 4 ++-- {pmd/scripts => js/pmd}/ajax.js | 0 {pmd/scripts => js/pmd}/history.js | 0 {pmd/scripts => js/pmd}/iecanvas.js | 0 {pmd/scripts => js/pmd}/move.js | 0 pmd_general.php | 8 ++++---- 6 files changed, 6 insertions(+), 6 deletions(-) rename {pmd/scripts => js/pmd}/ajax.js (100%) rename {pmd/scripts => js/pmd}/history.js (100%) rename {pmd/scripts => js/pmd}/iecanvas.js (100%) rename {pmd/scripts => js/pmd}/move.js (100%)

diff --git a/js/messages.php b/js/messages.php index 4d9be93..d5565ac 100644 --- a/js/messages.php +++ b/js/messages.php @@ -244,14 +244,14 @@ $js_messages['strIgnore'] = __('Ignore'); /* For tbl_structure.js */ $js_messages['strAddColumns'] = __('Add columns');

-/* Designer (pmd/scripts/move.js) */ +/* Designer (js/pmd/move.js) */ $js_messages['strSelectReferencedKey'] = __('Select referenced key'); $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); $js_messages['strChangeDisplay'] = __('Choose column to display'); $js_messages['strLeavingDesigner'] = __('You haven't saved the changes in the layout. They will be lost if you don't save them.Do you want to continue?');

-/* Visual query builder (pmd/scripts/move.js) */ +/* Visual query builder (js/pmd/move.js) */ $js_messages['strAddOption'] = __('Add an option for column ');

/* password generation */ diff --git a/pmd/scripts/ajax.js b/js/pmd/ajax.js similarity index 100% rename from pmd/scripts/ajax.js rename to js/pmd/ajax.js diff --git a/pmd/scripts/history.js b/js/pmd/history.js similarity index 100% rename from pmd/scripts/history.js rename to js/pmd/history.js diff --git a/pmd/scripts/iecanvas.js b/js/pmd/iecanvas.js similarity index 100% rename from pmd/scripts/iecanvas.js rename to js/pmd/iecanvas.js diff --git a/pmd/scripts/move.js b/js/pmd/move.js similarity index 100% rename from pmd/scripts/move.js rename to js/pmd/move.js diff --git a/pmd_general.php b/pmd_general.php index a93265e..be504ac 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -55,11 +55,11 @@ echo ' ?> // ]]> </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/move.js" type="text/javascript"></script> + <script src="js/pmd/ajax.js" type="text/javascript"></script> + <script src="js/pmd/history.js" type="text/javascript"></script> + <script src="js/pmd/move.js" type="text/javascript"></script> <!--[if IE]> - <script src="pmd/scripts/iecanvas.js" type="text/javascript"></script> + <script src="js/pmd/iecanvas.js" type="text/javascript"></script> <![endif]--> <?php echo $script_tabs . $script_contr . $script_display_field;

hooks/post-receive