From 3354881355294170c6550a2e2cbdb61887a4c321 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Apr 2015 13:52:35 +0200
Subject: [PATCH] move script and style inclusions into template

---
 apps/user_ldap/settings.php           | 46 -----------------------
 apps/user_ldap/templates/settings.php | 53 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index f8efa378c7..cc153ac682 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -29,52 +29,6 @@
 
 OC_Util::checkAdminUser();
 
-\OC_Util::addVendorScript('user_ldap', 'ui-multiselect/src/jquery.multiselect');
-\OC_Util::addVendorStyle('user_ldap', 'ui-multiselect/jquery.multiselect');
-
-\OCP\Util::addScript('user_ldap', 'wizard/controller');
-\OCP\Util::addScript('user_ldap', 'wizard/configModel');
-\OCP\Util::addScript('user_ldap', 'wizard/view');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardObject');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabGeneric');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabElementary');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabAbstractFilter');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabUserFilter');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabLoginFilter');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabGroupFilter');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabAdvanced');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardTabExpert');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorQueue');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorGeneric');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorPort');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorBaseDN');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorFeatureAbstract');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorUserObjectClasses');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorGroupObjectClasses');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorGroupsForUsers');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorGroupsForGroups');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorSimpleRequestAbstract');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorFilterUser');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorFilterLogin');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorFilterGroup');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorUserCount');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorGroupCount');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorEmailAttribute');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorUserDisplayNameAttribute');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorUserGroupAssociation');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorAvailableAttributes');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorTestAbstract');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorTestLoginName');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorTestBaseDN');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorTestConfiguration');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorClearUserMappings');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardDetectorClearGroupMappings');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardFilterOnType');
-\OCP\Util::addScript('user_ldap', 'wizard/wizardFilterOnTypeFactory');
-\OCP\Util::addScript('user_ldap', 'wizard/wizard');
-
-OCP\Util::addStyle('user_ldap', 'settings');
-
 // fill template
 $tmpl = new OCP\Template('user_ldap', 'settings');
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 833bef8c24..f40eba005d 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -1,3 +1,56 @@
+<?php
+
+vendor_script('user_ldap', 'ui-multiselect/src/jquery.multiselect');
+
+vendor_style('user_ldap', 'ui-multiselect/jquery.multiselect');
+
+script('user_ldap', [
+	'wizard/controller',
+	'wizard/configModel',
+	'wizard/view',
+	'wizard/wizardObject',
+	'wizard/wizardTabGeneric',
+	'wizard/wizardTabElementary',
+	'wizard/wizardTabAbstractFilter',
+	'wizard/wizardTabUserFilter',
+	'wizard/wizardTabLoginFilter',
+	'wizard/wizardTabGroupFilter',
+	'wizard/wizardTabAdvanced',
+	'wizard/wizardTabExpert',
+	'wizard/wizardDetectorQueue',
+	'wizard/wizardDetectorGeneric',
+	'wizard/wizardDetectorPort',
+	'wizard/wizardDetectorBaseDN',
+	'wizard/wizardDetectorFeatureAbstract',
+	'wizard/wizardDetectorUserObjectClasses',
+	'wizard/wizardDetectorGroupObjectClasses',
+	'wizard/wizardDetectorGroupsForUsers',
+	'wizard/wizardDetectorGroupsForGroups',
+	'wizard/wizardDetectorSimpleRequestAbstract',
+	'wizard/wizardDetectorFilterUser',
+	'wizard/wizardDetectorFilterLogin',
+	'wizard/wizardDetectorFilterGroup',
+	'wizard/wizardDetectorUserCount',
+	'wizard/wizardDetectorGroupCount',
+	'wizard/wizardDetectorEmailAttribute',
+	'wizard/wizardDetectorUserDisplayNameAttribute',
+	'wizard/wizardDetectorUserGroupAssociation',
+	'wizard/wizardDetectorAvailableAttributes',
+	'wizard/wizardDetectorTestAbstract',
+	'wizard/wizardDetectorTestLoginName',
+	'wizard/wizardDetectorTestBaseDN',
+	'wizard/wizardDetectorTestConfiguration',
+	'wizard/wizardDetectorClearUserMappings',
+	'wizard/wizardDetectorClearGroupMappings',
+	'wizard/wizardFilterOnType',
+	'wizard/wizardFilterOnTypeFactory',
+	'wizard/wizard'
+]);
+
+style('user_ldap', 'settings');
+
+?>
+
 <form id="ldap" class="section" action="#" method="post">
 	<h2><?php p($l->t('LDAP')); ?></h2>