archive/nextcloud_server
0
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-03-18 02:03:18 +00:00
Code Issues Projects Releases Wiki Activity

Template css order

Browse source 
Select2 systemtags removal
Settings again
Fix Script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ 2016-10-20 18:29:57 +02:00 committed by John Molakvoæ (skjnldsv)
parent ed4ed7911a
commit 3e5e07aa64
No known key found for this signature in database
GPG key ID: FB5ACEED51955BF8
5 changed files with 6 additions and 16 deletions
apps/systemtags
appinfo
app.php
templates
admin.php
lib/private/legacy
template.php
settings/templates
admin
frame.php
apps.php

3
apps/systemtags/appinfo/app.php
View file

@ -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');

2
apps/systemtags/templates/admin.php
View file

@ -19,8 +19,6 @@
*
*/
vendor_script('core', 'select2/select2');
vendor_style('core', 'select2/select2');
script('core', [
'oc-backbone-webdav',
'systemtags/systemtags',

6
lib/private/legacy/template.php
View file

@ -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);

2
settings/templates/admin/frame.php
View file

@ -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');
?>

9
settings/templates/apps.php
View file

@ -1,16 +1,9 @@
<?php
style('settings', 'settings');
vendor_style(
'core',
[
'select2/select2',
]
);
vendor_script(
'core',
[
'handlebars/handlebars',
'select2/select2'
'handlebars/handlebars'
]
);
script(