move loading of JS and CSS to template

diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index d2b7652f142ad8ebf1d36018ef80df013f3f2077..1923f4b0493af043d66cbba58069f01bae726ccb 100644 (file)
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -4,6 +4,19 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
+
+script('settings', [
+       'users/deleteHandler',
+       'users/filter',
+       'users/users',
+       'users/groups'
+]);
+script('core', [
+       'multiselect',
+       'singleselect'
+]);
+style('settings', 'settings');
+
 $userlistParams = array();
 $allGroups=array();
 foreach($_["groups"] as $group) {

diff --git a/settings/users.php b/settings/users.php
index a327cab9b282c04bc4b4ca6e0923e1f5ebe7f791..75109f9ef7495cdafa30cbaf01b2c443eb33ac16 100644 (file)
--- a/settings/users.php
+++ b/settings/users.php
@@ -7,14 +7,6 @@
 
 OC_Util::checkSubAdminUser();
 
-// We have some javascript foo!
-OC_Util::addScript('settings', 'users/deleteHandler');
-OC_Util::addScript('settings', 'users/filter');
-OC_Util::addScript( 'settings', 'users/users' );
-OC_Util::addScript( 'settings', 'users/groups' );
-OC_Util::addScript( 'core', 'multiselect' );
-OC_Util::addScript( 'core', 'singleselect' );
-OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
 $userManager = \OC_User::getManager();