rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-19 08:52:22 +01:00
Code Issues Releases Activity

Merge pull request #696 from owncloud/new-md5-and-jcrop-locations

Browse Source 
Load md5 and Jcrop scripts and styles from their new locations.
This commit is contained in:
jbtbnl 2014-11-08 17:11:07 +01:00
commit dd35cf54be
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/controller/pagecontroller.php
View File

@ -42,29 +42,6 @@ class PageController extends Controller {
$maxUploadFilesize = \OCP\Util::maxUploadFilesize('/');
\OCP\Util::addScript('', 'jquery.multiselect');
\OCP\Util::addScript('', 'tags');
\OCP\Util::addScript('placeholder');
\OCP\Util::addScript('3rdparty', 'md5/md5.min');
\OCP\Util::addScript('jquery.avatar');
\OCP\Util::addScript('avatar');
\OCP\Util::addScript('contacts', 'jquery.combobox');
\OCP\Util::addScript('contacts', 'modernizr.custom');
\OCP\Util::addScript('contacts', 'app');
\OCP\Util::addScript('contacts', 'addressbooks');
\OCP\Util::addScript('contacts', 'contacts');
\OCP\Util::addScript('contacts', 'storage');
\OCP\Util::addScript('contacts', 'groups');
\OCP\Util::addScript('contacts', 'jquery.ocaddnew');
\OCP\Util::addScript('contacts', 'otherbackendconfig');
\OCP\Util::addScript('files', 'jquery.fileupload');
\OCP\Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop');
\OCP\Util::addStyle('', 'jquery.multiselect');
\OCP\Util::addStyle('contacts', 'jquery.combobox');
\OCP\Util::addStyle('contacts', 'jquery.ocaddnew');
\OCP\Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop');
\OCP\Util::addStyle('contacts', 'contacts');
$response = new TemplateResponse($this->appName, 'contacts');
$response->setParams(array(
'uploadMaxFilesize' => $maxUploadFilesize,

38
templates/contacts.php
View File

@ -1,5 +1,43 @@
<?php
use OCA\Contacts\ImportManager;
script('', [
'jquery.multiselect',
'tags',
'placeholder',
'jquery.avatar',
'avatar',
]);
vendor_script('', [
'blueimp-md5/js/md5',
'jcrop/js/jquery.Jcrop',
]);
script('files', 'jquery.fileupload');
script('contacts', [
'jquery.combobox',
'modernizr.custom',
'app',
'addressbooks',
'contacts',
'storage',
'groups',
'jquery.ocaddnew',
'otherbackendconfig',
]);
style('', 'jquery.multiselect');
vendor_style('jcrop/css/jquery.Jcrop');
style('contacts', [
'jquery.combobox',
'jquery.ocaddnew',
'contacts',
]);
?>
<div id="app">
<div id="app-navigation" class="loading">