summaryrefslogtreecommitdiffstats
path: root/admin/users.php
diff options
context:
space:
mode:
authorMichael Gapczynski <GapczynskiM@gmail.com>2011-08-09 10:42:50 -0400
committerMichael Gapczynski <GapczynskiM@gmail.com>2011-08-09 10:42:50 -0400
commitec6aed847585565f703e0c8bef0b75782bfe4560 (patch)
treeae8e3a897143ea2198381dfb736ae82b2949dd49 /admin/users.php
parent9a8eb7298c16ea3c10019d04695be04d6205a701 (diff)
parent1419d7f2b02a2182eb746443b62572f1b4b3f655 (diff)
downloadnextcloud-server-ec6aed847585565f703e0c8bef0b75782bfe4560.tar.gz
nextcloud-server-ec6aed847585565f703e0c8bef0b75782bfe4560.zip
Merge branch 'master' into sharing
Diffstat (limited to 'admin/users.php')
-rw-r--r--admin/users.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/admin/users.php b/admin/users.php
index b87f1bb5bc8..4a83510cb72 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -28,8 +28,11 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
}
// We have some javascript foo!
-OC_Util::addScript( "admin", "users" );
-OC_App::setActiveNavigationEntry( "core_users" );
+OC_Util::addScript( 'admin', 'users' );
+OC_Util::addStyle( 'admin', 'users' );
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_App::setActiveNavigationEntry( 'core_users' );
$users = array();
$groups = array();
@@ -48,7 +51,7 @@ foreach( OC_Group::getGroups() as $i ){
$groups[] = array( "name" => $i );
}
-$tmpl = new OC_Template( "admin", "users", "admin" );
+$tmpl = new OC_Template( "admin", "users", "user" );
$tmpl->assign( "users", $users );
$tmpl->assign( "groups", $groups );
$tmpl->printPage();