Move module javascripts to a folder called js

zikula · Apr 25, 2012 · 2b1a898 · 2b1a898
1 parent f330598
commit 2b1a898
Show file tree

Hide file tree

Showing 40 changed files with 6 additions and 9 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -31,9 +31,6 @@ public function registerBundles()
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
         }
 
-        $bundles = $this->registerModuleBundles($bundles);
-        $bundles = $this->registerModuleBundles($bundles);
-
         return $bundles;
     }
 

diff --git a/src/legacy/Zikula/View/Theme.php b/src/legacy/Zikula/View/Theme.php
@@ -571,7 +571,7 @@ private function _base_vars()
         $this->imagepath     = $this->themepath . '/Resources/public/images';
         $this->imagelangpath = $this->themepath . '/Resources/public/images/' . $this->language;
         $this->stylepath     = $this->themepath . '/Resources/public/css';
-        $this->scriptpath    = $this->themepath . '/Resources/public/javascript';
+        $this->scriptpath    = $this->themepath . '/Resources/public/js';
 
         // make the base vars available to all templates
         $this->assign('module', $this->toplevelmodule)

diff --git a/src/legacy/viewplugins/function.ajaxheader.php b/src/legacy/viewplugins/function.ajaxheader.php
@@ -93,7 +93,7 @@ function smarty_function_ajaxheader($params, Zikula_View $view)
         $osfilename = DataUtil::formatForOS($filename);
 
         $base = $modinfo['type'] == ModUtil::TYPE_SYSTEM ? 'system' : 'modules';
-        if (file_exists($file = "$base/$osdirectory/Resources/public/javascript/$osfilename") || file_exists($file = "$base/$osdirectory/javascript/$osfilename")) {
+        if (file_exists($file = "$base/$osdirectory/Resources/public/js/$osfilename")) {
             $scripts[] = DataUtil::formatForDisplay($file);
         }
     }

diff --git a/...ces/public/javascript/admin_admin_ajax.js → ...e/Resources/public/js/admin_admin_ajax.js b/...ces/public/javascript/admin_admin_ajax.js → ...e/Resources/public/js/admin_admin_ajax.js
diff --git a/...ic/javascript/admin_admin_modifyconfig.js → ...ces/public/js/admin_admin_modifyconfig.js b/...ic/javascript/admin_admin_modifyconfig.js → ...ces/public/js/admin_admin_modifyconfig.js
diff --git a/web/system/BlocksModule/MenutreeTree.php b/web/system/BlocksModule/MenutreeTree.php
@@ -135,7 +135,7 @@ public function getHTML()
         PageUtil::addVar('javascript', 'prototype');
         PageUtil::addVar('javascript', 'livepipe');
         PageUtil::addVar('javascript', 'zikula.tree');
-        PageUtil::addVar('javascript', 'system/BlocksModule/Resources/public/javascript/Zikula.Menutree.Tree.js');
+        PageUtil::addVar('javascript', 'system/BlocksModule/Resources/public/js/Zikula.Menutree.Tree.js');
         $jsClass = 'Zikula.Menutree.Tree';
         $initScript = "
         <script type=\"text/javascript\">

diff --git a/...public/javascript/Zikula.Menutree.Tree.js → ...sources/public/js/Zikula.Menutree.Tree.js b/...public/javascript/Zikula.Menutree.Tree.js → ...sources/public/js/Zikula.Menutree.Tree.js
diff --git a/...ule/Resources/public/javascript/blocks.js → ...locksModule/Resources/public/js/blocks.js b/...ule/Resources/public/javascript/blocks.js → ...locksModule/Resources/public/js/blocks.js
diff --git a/...esources/public/javascript/contextmenu.js → ...Module/Resources/public/js/contextmenu.js b/...esources/public/javascript/contextmenu.js → ...Module/Resources/public/js/contextmenu.js
diff --git a/.../Resources/public/javascript/functions.js → ...ksModule/Resources/public/js/functions.js b/.../Resources/public/javascript/functions.js → ...ksModule/Resources/public/js/functions.js
diff --git a/web/system/BlocksModule/Resources/view/menutree/blocks_block_menutree_modify.tpl b/web/system/BlocksModule/Resources/view/menutree/blocks_block_menutree_modify.tpl
@@ -1,6 +1,6 @@
 {ajaxheader modname="blocksModule" ui=true}
-{pageaddvar name="javascript" value="system/Blocks/Resources/public/javascript/functions.js"}
-{pageaddvar name="javascript" value="system/Blocks/Resources/public/javascript/contextmenu.js"}
+{pageaddvar name="javascript" value="system/Blocks/Resources/public/js/functions.js"}
+{pageaddvar name="javascript" value="system/Blocks/Resources/public/js/contextmenu.js"}
 {pageaddvar name="stylesheet" value="system/Blocks/Resources/public/css/menutree/adminstyle.css"}
 {pageaddvar name="stylesheet" value="system/Blocks/Resources/public/css/menutree/contextmenu.css"}
 

diff --git a/...ublic/javascript/categories_admin_edit.js → ...ources/public/js/categories_admin_edit.js b/...ublic/javascript/categories_admin_edit.js → ...ources/public/js/categories_admin_edit.js
diff --git a/...ublic/javascript/categories_admin_view.js → ...ources/public/js/categories_admin_view.js b/...ublic/javascript/categories_admin_view.js → ...ources/public/js/categories_admin_view.js
diff --git a/...ources/public/javascript/extendedhooks.js → ...dule/Resources/public/js/extendedhooks.js b/...ources/public/javascript/extendedhooks.js → ...dule/Resources/public/js/extendedhooks.js
diff --git a/...dule/Resources/public/javascript/hooks.js → ...nsionsModule/Resources/public/js/hooks.js b/...dule/Resources/public/javascript/hooks.js → ...nsionsModule/Resources/public/js/hooks.js
diff --git a/...ule/Resources/public/javascript/hookui.js → ...sionsModule/Resources/public/js/hookui.js b/...ule/Resources/public/javascript/hookui.js → ...sionsModule/Resources/public/js/hookui.js
diff --git a/...ule/Resources/public/javascript/groups.js → ...roupsModule/Resources/public/js/groups.js b/...ule/Resources/public/javascript/groups.js → ...roupsModule/Resources/public/js/groups.js
diff --git a/...c/javascript/mailer_admin_modifyconfig.js → ...es/public/js/mailer_admin_modifyconfig.js b/...c/javascript/mailer_admin_modifyconfig.js → ...es/public/js/mailer_admin_modifyconfig.js
diff --git a/...lic/javascript/mailer_admin_testconfig.js → ...rces/public/js/mailer_admin_testconfig.js b/...lic/javascript/mailer_admin_testconfig.js → ...rces/public/js/mailer_admin_testconfig.js
diff --git a/web/system/PageLockModule/Api/UserApi.php b/web/system/PageLockModule/Api/UserApi.php
@@ -36,7 +36,7 @@ public function pageLock($args)
 
         if (!empty($lockName) || !$ignoreEmptyLock) {
             PageUtil::AddVar('javascript', 'zikula.ui');
-            PageUtil::AddVar('javascript', 'system/PageLockModule/Resources/public/javascript/pagelock.js');
+            PageUtil::AddVar('javascript', 'system/PageLockModule/Resources/public/js/pagelock.js');
             PageUtil::AddVar('stylesheet', ThemeUtil::getModuleStylesheet('PagelockModule'));
 
             $lockInfo = ModUtil::apiFunc('pagelockModule', 'user', 'requireLock',

diff --git a/...e/Resources/public/javascript/pagelock.js → ...ockModule/Resources/public/js/pagelock.js b/...e/Resources/public/javascript/pagelock.js → ...ockModule/Resources/public/js/pagelock.js
diff --git a/...esources/public/javascript/permissions.js → ...Module/Resources/public/js/permissions.js b/...esources/public/javascript/permissions.js → ...Module/Resources/public/js/permissions.js
diff --git a/...ces/public/javascript/search_user_form.js → ...e/Resources/public/js/search_user_form.js b/...ces/public/javascript/search_user_form.js → ...e/Resources/public/js/search_user_form.js
diff --git a/...script/securitycenter_admin_allowedhtm.js → ...lic/js/securitycenter_admin_allowedhtm.js b/...script/securitycenter_admin_allowedhtm.js → ...lic/js/securitycenter_admin_allowedhtm.js
diff --git a/...ript/securitycenter_admin_modifyconfig.js → ...c/js/securitycenter_admin_modifyconfig.js b/...ript/securitycenter_admin_modifyconfig.js → ...c/js/securitycenter_admin_modifyconfig.js
diff --git a/...pt/securitycenter_admin_purifierconfig.js → ...js/securitycenter_admin_purifierconfig.js b/...pt/securitycenter_admin_purifierconfig.js → ...js/securitycenter_admin_purifierconfig.js
diff --git a/...javascript/settings_admin_modifyconfig.js → .../public/js/settings_admin_modifyconfig.js b/...javascript/settings_admin_modifyconfig.js → .../public/js/settings_admin_modifyconfig.js
diff --git a/...javascript/settings_admin_multilingual.js → .../public/js/settings_admin_multilingual.js b/...javascript/settings_admin_multilingual.js → .../public/js/settings_admin_multilingual.js
diff --git a/.../Resources/public/javascript/form/form.js → ...meModule/Resources/public/js/form/form.js b/.../Resources/public/javascript/form/form.js → ...meModule/Resources/public/js/form/form.js
diff --git a/...ic/javascript/form/form_tabbedpanelset.js → ...ces/public/js/form/form_tabbedpanelset.js b/...ic/javascript/form/form_tabbedpanelset.js → ...ces/public/js/form/form_tabbedpanelset.js
diff --git a/...ic/javascript/theme_admin_modifyconfig.js → ...ces/public/js/theme_admin_modifyconfig.js b/...ic/javascript/theme_admin_modifyconfig.js → ...ces/public/js/theme_admin_modifyconfig.js
diff --git a/...ources/public/javascript/themeswitcher.js → ...dule/Resources/public/js/themeswitcher.js b/...ources/public/javascript/themeswitcher.js → ...dule/Resources/public/js/themeswitcher.js
diff --git a/...c/javascript/Zikula.Users.Admin.Config.js → ...es/public/js/Zikula.Users.Admin.Config.js b/...c/javascript/Zikula.Users.Admin.Config.js → ...es/public/js/Zikula.Users.Admin.Config.js
diff --git a/.../javascript/Zikula.Users.Admin.NewUser.js → ...s/public/js/Zikula.Users.Admin.NewUser.js b/.../javascript/Zikula.Users.Admin.NewUser.js → ...s/public/js/Zikula.Users.Admin.NewUser.js
diff --git a/...s/public/javascript/Zikula.Users.Login.js → ...Resources/public/js/Zikula.Users.Login.js b/...s/public/javascript/Zikula.Users.Login.js → ...Resources/public/js/Zikula.Users.Login.js
diff --git a/...lic/javascript/Zikula.Users.LoginBlock.js → ...rces/public/js/Zikula.Users.LoginBlock.js b/...lic/javascript/Zikula.Users.LoginBlock.js → ...rces/public/js/Zikula.Users.LoginBlock.js
diff --git a/...public/javascript/Zikula.Users.NewUser.js → ...sources/public/js/Zikula.Users.NewUser.js b/...public/javascript/Zikula.Users.NewUser.js → ...sources/public/js/Zikula.Users.NewUser.js
diff --git a/...blic/javascript/Zikula.Users.PassMeter.js → ...urces/public/js/Zikula.Users.PassMeter.js b/...blic/javascript/Zikula.Users.PassMeter.js → ...urces/public/js/Zikula.Users.PassMeter.js
diff --git a/...dule/Resources/public/javascript/users.js → .../UsersModule/Resources/public/js/users.js b/...dule/Resources/public/javascript/users.js → .../UsersModule/Resources/public/js/users.js
diff --git a/...ascript/users_admin_modifyregistration.js → ...blic/js/users_admin_modifyregistration.js b/...ascript/users_admin_modifyregistration.js → ...blic/js/users_admin_modifyregistration.js