From: Frank Karlitschek Date: Tue, 1 May 2012 18:03:41 +0000 (+0200) Subject: ported addSyript and other small stuff X-Git-Tag: v4.0.0beta~118 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a2bbd2ee49db8ec2c83b87718c943f47f91be28;p=nextcloud-server.git ported addSyript and other small stuff --- diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php old mode 100644 new mode 100755 index b9c308ca053..d2381e3ef98 --- a/apps/bookmarks/appinfo/app.php +++ b/apps/bookmarks/appinfo/app.php @@ -16,6 +16,6 @@ $l = new OC_l10n('bookmarks'); OC_App::addNavigationEntry( array( 'id' => 'bookmarks_index', 'order' => 70, 'href' => OC_Helper::linkTo( 'bookmarks', 'index.php' ), 'icon' => OC_Helper::imagePath( 'bookmarks', 'bookmarks.png' ), 'name' => $l->t('Bookmarks'))); OC_App::registerPersonal('bookmarks', 'settings'); -OC_Util::addScript('bookmarks','bookmarksearch'); +OCP\Util::addscript('bookmarks','bookmarksearch'); OC_Search::registerProvider('OC_Search_Provider_Bookmarks'); diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php old mode 100644 new mode 100755 index d36321a1ef9..575c14c114c --- a/apps/bookmarks/index.php +++ b/apps/bookmarks/index.php @@ -29,7 +29,7 @@ OC_Util::checkAppEnabled('bookmarks'); OC_App::setActiveNavigationEntry( 'bookmarks_index' ); -OC_Util::addScript('bookmarks','bookmarks'); +OCP\Util::addscript('bookmarks','bookmarks'); OCP\Util::addStyle('bookmarks', 'bookmarks'); $tmpl = new OC_Template( 'bookmarks', 'list', 'user' ); diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php old mode 100644 new mode 100755 index ccd7ff4c1a0..e42358422cf --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -8,8 +8,8 @@ OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre OC::$CLASSPATH['OC_Calendar_Share'] = 'apps/calendar/lib/share.php'; OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.php'; OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser'); -OC_Util::addScript('calendar','loader'); -OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min"); +OCP\Util::addscript('calendar','loader'); +OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min"); OCP\Util::addStyle("3rdparty", "chosen/chosen"); OC_App::register( array( 'order' => 10, diff --git a/apps/calendar/index.php b/apps/calendar/index.php index beb6ac0c372..cc6b19a0402 100755 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -39,19 +39,19 @@ if(OC_Preferences::getValue(OCP\USER::getUser(), 'calendar', 'currentview', 'mon OC_Preferences::setValue(OCP\USER::getUser(), "calendar", "currentview", "list"); } -OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar'); +OCP\Util::addscript('3rdparty/fullcalendar', 'fullcalendar'); OCP\Util::addStyle('3rdparty/fullcalendar', 'fullcalendar'); -OC_Util::addScript('3rdparty/timepicker', 'jquery.ui.timepicker'); +OCP\Util::addscript('3rdparty/timepicker', 'jquery.ui.timepicker'); OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker'); if(OC_Preferences::getValue(OCP\USER::getUser(), "calendar", "timezone") == null || OC_Preferences::getValue(OCP\USER::getUser(), 'calendar', 'timezonedetection') == 'true'){ - OC_UTIL::addScript('calendar', 'geo'); + OCP\Util::addscript('calendar', 'geo'); } -OC_Util::addScript('calendar', 'calendar'); +OCP\Util::addscript('calendar', 'calendar'); OCP\Util::addStyle('calendar', 'style'); -OC_Util::addScript('', 'jquery.multiselect'); +OCP\Util::addscript('', 'jquery.multiselect'); OCP\Util::addStyle('', 'jquery.multiselect'); -OC_Util::addScript('contacts','jquery.multi-autocomplete'); -OC_Util::addScript('','oc-vcategories'); +OCP\Util::addscript('contacts','jquery.multi-autocomplete'); +OCP\Util::addscript('','oc-vcategories'); OC_App::setActiveNavigationEntry('calendar_index'); $tmpl = new OC_Template('calendar', 'calendar', 'user'); $tmpl->assign('eventSources', $eventSources); diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php index a76c5d1e34a..d6195108a2d 100755 --- a/apps/calendar/settings.php +++ b/apps/calendar/settings.php @@ -11,6 +11,6 @@ $timezone=OC_Preferences::getValue(OCP\USER::getUser(),'calendar','timezone','') $tmpl->assign('timezone',$timezone); $tmpl->assign('timezones',DateTimeZone::listIdentifiers()); -OC_Util::addScript('calendar','settings'); +OCP\Util::addscript('calendar','settings'); return $tmpl->fetchPage(); diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php old mode 100644 new mode 100755 index 7e44219ce99..20dfaccde77 --- a/apps/contacts/appinfo/app.php +++ b/apps/contacts/appinfo/app.php @@ -23,5 +23,5 @@ OC_App::addNavigationEntry( array( OC_APP::registerPersonal('contacts','settings'); -OC_UTIL::addScript('contacts', 'loader'); +OCP\Util::addscript('contacts', 'loader'); OC_Search::registerProvider('OC_Search_Provider_Contacts'); diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 70daf4abe99..a680da3fa97 100755 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -45,13 +45,13 @@ $freeSpace=OC_Filesystem::free_space('/'); $freeSpace=max($freeSpace,0); $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace); -OC_Util::addScript('','jquery.multiselect'); -OC_Util::addScript('','oc-vcategories'); -OC_Util::addScript('contacts','contacts'); -OC_Util::addScript('contacts','jquery.combobox'); -OC_Util::addScript('contacts','jquery.inview'); -OC_Util::addScript('contacts','jquery.Jcrop'); -OC_Util::addScript('contacts','jquery.multi-autocomplete'); +OCP\Util::addscript('','jquery.multiselect'); +OCP\Util::addscript('','oc-vcategories'); +OCP\Util::addscript('contacts','contacts'); +OCP\Util::addscript('contacts','jquery.combobox'); +OCP\Util::addscript('contacts','jquery.inview'); +OCP\Util::addscript('contacts','jquery.Jcrop'); +OCP\Util::addscript('contacts','jquery.multi-autocomplete'); OCP\Util::addStyle('','jquery.multiselect'); OCP\Util::addStyle('contacts','jquery.combobox'); OCP\Util::addStyle('contacts','jquery.Jcrop'); diff --git a/apps/external/settings.php b/apps/external/settings.php old mode 100644 new mode 100755 index 416c9a5c11f..a0c4bb0523d --- a/apps/external/settings.php +++ b/apps/external/settings.php @@ -2,7 +2,7 @@ OC_Util::checkAdminUser(); -OC_Util::addScript( "external", "admin" ); +OCP\Util::addscript( "external", "admin" ); $tmpl = new OC_Template( 'external', 'settings'); diff --git a/apps/files/index.php b/apps/files/index.php old mode 100644 new mode 100755 index 65a428a6c9d..c1b99cfaf5a --- a/apps/files/index.php +++ b/apps/files/index.php @@ -26,13 +26,13 @@ OC_Util::checkLoggedIn(); // Load the files we need OCP\Util::addStyle( "files", "files" ); -OC_Util::addScript( "files", "jquery.iframe-transport" ); -OC_Util::addScript( "files", "jquery.fileupload" ); -OC_Util::addScript( "files", "files" ); -OC_Util::addScript( 'files', 'filelist' ); -OC_Util::addScript( 'files', 'fileactions' ); +OCP\Util::addscript( "files", "jquery.iframe-transport" ); +OCP\Util::addscript( "files", "jquery.fileupload" ); +OCP\Util::addscript( "files", "files" ); +OCP\Util::addscript( 'files', 'filelist' ); +OCP\Util::addscript( 'files', 'fileactions' ); if(!isset($_SESSION['timezone'])){ - OC_Util::addScript( 'files', 'timezone' ); + OCP\Util::addscript( 'files', 'timezone' ); } OC_App::setActiveNavigationEntry( "files_index" ); // Load the files diff --git a/apps/files/settings.php b/apps/files/settings.php old mode 100644 new mode 100755 index 5016630d192..46d557b43ca --- a/apps/files/settings.php +++ b/apps/files/settings.php @@ -30,7 +30,7 @@ OC_Util::checkLoggedIn(); // Load the files we need OCP\Util::addStyle( "files", "files" ); -OC_Util::addScript( "files", "files" ); +OCP\Util::addscript( "files", "files" ); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php old mode 100644 new mode 100755 index 01fe1105260..c89070ce52e --- a/apps/files/templates/admin.php +++ b/apps/files/templates/admin.php @@ -1,4 +1,4 @@ - +
diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php old mode 100644 new mode 100755 index 67809ec980a..5d402b61ff7 --- a/apps/files_archive/appinfo/app.php +++ b/apps/files_archive/appinfo/app.php @@ -16,4 +16,4 @@ OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php'; OC_Hook::connect('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount'); -OC_Util::addScript( 'files_archive', 'archive' ); +OCP\Util::addscript( 'files_archive', 'archive' ); diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php old mode 100644 new mode 100755 index 01caefd1249..facd6580f00 --- a/apps/files_encryption/settings.php +++ b/apps/files_encryption/settings.php @@ -12,7 +12,7 @@ $enabled=(OC_Appconfig::getValue('files_encryption','enable_encryption','true')= $tmpl->assign('blacklist',$blackList); $tmpl->assign('encryption_enabled',$enabled); -OC_Util::addScript('files_encryption','settings'); -OC_Util::addScript('core','multiselect'); +OCP\Util::addscript('files_encryption','settings'); +OCP\Util::addscript('core','multiselect'); return $tmpl->fetchPage(); diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php old mode 100644 new mode 100755 index cf357d2e318..6c8d8c30cad --- a/apps/files_imageviewer/appinfo/app.php +++ b/apps/files_imageviewer/appinfo/app.php @@ -1,8 +1,8 @@ diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php old mode 100644 new mode 100755 index fbcb30bb973..06b15670674 --- a/apps/files_pdfviewer/appinfo/app.php +++ b/apps/files_pdfviewer/appinfo/app.php @@ -1,7 +1,7 @@ diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php old mode 100644 new mode 100755 index 7c547be3ca1..cf7c48d5fb9 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -12,9 +12,9 @@ OC_Hook::connect('OC_User', 'post_addToGroup', 'OC_Share', 'addToGroupShare'); OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC_Share', 'removeFromGroupShare'); $dir = isset($_GET['dir']) ? $_GET['dir'] : '/'; if ($dir != '/Shared' || OC_Appconfig::getValue('files_sharing', 'resharing', 'yes') == 'yes') { - OC_Util::addScript("files_sharing", "share"); + OCP\Util::addscript("files_sharing", "share"); } -OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min"); +OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min"); OCP\Util::addStyle( 'files_sharing', 'sharing' ); OCP\Util::addStyle("3rdparty", "chosen/chosen"); diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php old mode 100644 new mode 100755 index a9006faf1a9..9a8a36219ae --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -28,7 +28,7 @@ OC_Util::checkAppEnabled('files_sharing'); OC_App::setActiveNavigationEntry("files_sharing_list"); -OC_Util::addScript("files_sharing", "list"); +OCP\Util::addscript("files_sharing", "list"); $tmpl = new OC_Template("files_sharing", "list", "user"); $tmpl->assign("shared_items", OC_Share::getMySharedItems()); diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php old mode 100644 new mode 100755 index b30c4f45cde..da38b88d79e --- a/apps/files_sharing/settings.php +++ b/apps/files_sharing/settings.php @@ -1,7 +1,7 @@ assign('allowResharing', OC_Appconfig::getValue('files_sharing', 'resharing', 'yes')); return $tmpl->fetchPage(); diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php old mode 100644 new mode 100755 index b3937236ecd..a08077ebb67 --- a/apps/files_texteditor/appinfo/app.php +++ b/apps/files_texteditor/appinfo/app.php @@ -1,6 +1,6 @@ diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php old mode 100644 new mode 100755 index 32e4c0ce81b..385f2922d9f --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -9,7 +9,7 @@ OC_App::register( array( 'name' => 'Versioning' )); OC_APP::registerAdmin('files_versions', 'settings'); -OC_UTIL::addScript('files_versions', 'versions'); +OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals OC_Hook::connect(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook"); diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php old mode 100644 new mode 100755 index eb154d3edd3..c6312b7be7b --- a/apps/files_versions/settings.php +++ b/apps/files_versions/settings.php @@ -2,7 +2,7 @@ OC_Util::checkAdminUser(); -OC_Util::addScript( 'files_versions', 'versions' ); +OCP\Util::addscript( 'files_versions', 'versions' ); $tmpl = new OC_Template( 'files_versions', 'settings'); diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php index 078333ab21e..b550d262a0a 100755 --- a/apps/gallery/templates/index.php +++ b/apps/gallery/templates/index.php @@ -1,11 +1,11 @@ diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php old mode 100644 new mode 100755 index 9abfef901d2..c16ed69c065 --- a/apps/gallery/templates/view_album.php +++ b/apps/gallery/templates/view_album.php @@ -1,9 +1,9 @@ diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php old mode 100644 new mode 100755 index b0891874f7b..10f5ec0ff11 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -24,7 +24,7 @@ $l=OC_L10N::get('media'); require_once('apps/media/lib_media.php'); -OC_Util::addScript('media','loader'); +OCP\Util::addscript('media','loader'); OC_APP::registerPersonal('media','settings'); OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); diff --git a/apps/media/index.php b/apps/media/index.php old mode 100644 new mode 100755 index a102068740c..ee0681668a5 --- a/apps/media/index.php +++ b/apps/media/index.php @@ -31,12 +31,12 @@ OC_Util::checkAppEnabled('media'); require_once(OC::$APPSROOT . '/apps/media/lib_collection.php'); require_once(OC::$APPSROOT . '/apps/media/lib_scanner.php'); -OC_Util::addScript('media','player'); -OC_Util::addScript('media','music'); -OC_Util::addScript('media','playlist'); -OC_Util::addScript('media','collection'); -OC_Util::addScript('media','scanner'); -OC_Util::addScript('media','jquery.jplayer.min'); +OCP\Util::addscript('media','player'); +OCP\Util::addscript('media','music'); +OCP\Util::addscript('media','playlist'); +OCP\Util::addscript('media','collection'); +OCP\Util::addscript('media','scanner'); +OCP\Util::addscript('media','jquery.jplayer.min'); OCP\Util::addStyle('media','music'); OC_App::setActiveNavigationEntry( 'media_index' ); diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php old mode 100644 new mode 100755 index 16e452fe156..40d333a057f --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -22,7 +22,7 @@ */ $params = array('ldap_host', 'ldap_port', 'ldap_dn', 'ldap_password', 'ldap_base', 'ldap_base_users', 'ldap_base_groups', 'ldap_userlist_filter', 'ldap_login_filter', 'ldap_display_name', 'ldap_tls', 'ldap_nocase'. 'ldap_quota_def', 'ldap_quota_attr', 'ldap_email_attr'); -OC_Util::addScript('user_ldap', 'settings'); +OCP\Util::addscript('user_ldap', 'settings'); OCP\Util::addStyle('user_ldap', 'settings'); if ($_POST) { diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php old mode 100644 new mode 100755 index a59b6dd705c..91e69fe1913 --- a/apps/user_migrate/appinfo/app.php +++ b/apps/user_migrate/appinfo/app.php @@ -23,7 +23,7 @@ OC_APP::registerPersonal( 'user_migrate', 'settings' ); OC_APP::registerAdmin( 'user_migrate', 'admin' ); -OC_Util::addScript( 'user_migrate', 'export'); +OCP\Util::addscript( 'user_migrate', 'export'); // add settings page to navigation $entry = array( diff --git a/apps/user_openid/settings.php b/apps/user_openid/settings.php index 01ab4d16fc9..33a3f232a17 100755 --- a/apps/user_openid/settings.php +++ b/apps/user_openid/settings.php @@ -4,7 +4,7 @@ $tmpl = new OC_Template( 'user_openid', 'settings'); $identity=OC_Preferences::getValue(OCP\USER::getUser(),'user_openid','identity',''); $tmpl->assign('identity',$identity); -OC_Util::addScript('user_openid','settings'); +OCP\Util::addscript('user_openid','settings'); return $tmpl->fetchPage(); ?> \ No newline at end of file