Template css order

Select2 systemtags removal
Settings again
Fix Script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php
index af91e5fdbcd54bce9f0c1642b897cd552c495639..e3be0d7556ea039c9097e4fab2b44a548912bf3e 100644 (file)
--- a/apps/systemtags/appinfo/app.php
+++ b/apps/systemtags/appinfo/app.php
@@ -31,9 +31,6 @@ $eventDispatcher->addListener(
        'OCA\Files::loadAdditionalScripts',
        function() {
                // FIXME: no public API for these ?
-               \OC_Util::addVendorScript('select2/select2');
-               \OC_Util::addVendorStyle('select2/select2');
-               \OCP\Util::addScript('select2-toggleselect');
                \OCP\Util::addScript('oc-backbone-webdav');
                \OCP\Util::addScript('systemtags/systemtags');
                \OCP\Util::addScript('systemtags/systemtagmodel');

diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index 883e998ed61bb7b752d6d6cdec9a4227935c1841..de97b283d091e994f1250bbb3b1be930325f82f5 100644 (file)
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -19,8 +19,6 @@
  *
  */
 
-vendor_script('core', 'select2/select2');
-vendor_style('core', 'select2/select2');
 script('core', [
        'oc-backbone-webdav',
        'systemtags/systemtags',

diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index b43b4da839a9a6a440029c86fbfba2cf334eca77..7520ffd44edfeec21451a33e4bb262018a635b56 100644 (file)
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -117,7 +117,7 @@ class OC_Template extends \OC\Template\Base {
                        OC_Util::addStyle("fonts",null,true);
                        OC_Util::addStyle("icons",null,true);
                        OC_Util::addStyle("header",null,true);
-                       OC_Util::addStyle("inputs",null,true);
+                       OC_Util::addStyle("inputs");
                        OC_Util::addStyle("styles",null,true);
 
                        // avatars
@@ -126,6 +126,10 @@ class OC_Template extends \OC\Template\Base {
                                \OC_Util::addScript('placeholder', null, true);
                        }
 
+                       OC_Util::addVendorScript('select2/select2');
+                       OC_Util::addVendorStyle('select2/select2', null, true);
+                       OC_Util::addScript('select2-toggleselect');
+
                        OC_Util::addScript('oc-backbone', null, true);
                        OC_Util::addVendorScript('core', 'backbone/backbone', true);
                        OC_Util::addVendorScript('snapjs/dist/latest/snap', null, true);

diff --git a/settings/templates/admin/frame.php b/settings/templates/admin/frame.php
index 1d9f6dc7a7845a85d73efa84ccf8d6b6f7a25da3..761d76c443477ec2876e8904d1ff47b0bf2fa987 100644 (file)
--- a/settings/templates/admin/frame.php
+++ b/settings/templates/admin/frame.php
@@ -25,8 +25,6 @@ style('settings', 'settings');
 script('settings', [ 'settings', 'admin', 'log', 'certificates'] );
 script('core', ['multiselect', 'setupchecks']);
 script('files', 'jquery.fileupload');
-vendor_script('select2/select2');
-vendor_style('select2/select2');
 
 ?>
 

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index ea62acd9945cdf987a01db4989275f04a452d511..46fd5bd0e40d87a563d50a1bec7b5255e4924185 100644 (file)
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -1,16 +1,9 @@
 <?php
 style('settings', 'settings');
-vendor_style(
-       'core',
-       [
-               'select2/select2',
-       ]
-);
 vendor_script(
        'core',
        [
-               'handlebars/handlebars',
-               'select2/select2'
+               'handlebars/handlebars'
        ]
 );
 script(