From 2b86f1e677ff9630159f264d4d89ca73b9fbfd9f Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 13 Jul 2016 09:57:49 +0200 Subject: [PATCH 1/4] Remove unneeded usage of tipsy * tooltip is already initialized --- apps/federatedfilesharing/js/settings-admin.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/federatedfilesharing/js/settings-admin.js b/apps/federatedfilesharing/js/settings-admin.js index 95578bff54..257c864b04 100644 --- a/apps/federatedfilesharing/js/settings-admin.js +++ b/apps/federatedfilesharing/js/settings-admin.js @@ -8,5 +8,4 @@ $(document).ready(function() { OC.AppConfig.setValue('files_sharing', $(this).attr('name'), value); }); - $('.section .icon-info').tipsy({gravity: 'w'}); }); From e9eb94e8995f5c845868bd4e099f8eb591204943 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 13 Jul 2016 09:59:08 +0200 Subject: [PATCH 2/4] Use tooltip for app management badges --- settings/js/apps.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/settings/js/apps.js b/settings/js/apps.js index 525a34d906..5584716235 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -119,11 +119,27 @@ OC.Settings.Apps = OC.Settings.Apps || { $('#apps-list-empty').removeClass('hidden').find('h2').text(t('settings', 'No apps found for your version')); } - $('.enable.needs-download').tipsy({fallback: t('settings', 'The app will be downloaded from the app store')}); + $('.enable.needs-download').tooltip({ + title: t('settings', 'The app will be downloaded from the app store'), + placement: 'bottom', + container: 'body' + }); - $('.app-level .official').tipsy({fallback: t('settings', 'Official apps are developed by and within the community. They offer central functionality and are ready for production use.')}); - $('.app-level .approved').tipsy({fallback: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.')}); - $('.app-level .experimental').tipsy({fallback: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.')}); + $('.app-level .official').tooltip({ + title: t('settings', 'Official apps are developed by and within the community. They offer central functionality and are ready for production use.'), + placement: 'bottom', + container: 'body' + }); + $('.app-level .approved').tooltip({ + title: t('settings', 'Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use.'), + placement: 'bottom', + container: 'body' + }); + $('.app-level .experimental').tooltip({ + title: t('settings', 'This app is not checked for security issues and is new or known to be unstable. Install at your own risk.'), + placement: 'bottom', + container: 'body' + }); }, complete: function() { var availableUpdates = 0; From cf79417490c5b093165f68f57effc44780844e22 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 13 Jul 2016 09:59:42 +0200 Subject: [PATCH 3/4] Use tooltip for background job execution time --- settings/js/admin.js | 2 +- settings/templates/admin.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/settings/js/admin.js b/settings/js/admin.js index 34e258065c..fb59b3ba02 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -35,7 +35,7 @@ $(document).ready(function(){ } ); }); - $('#backgroundjobs span.crondate').tipsy({gravity: 's', live: true}); + $('#backgroundjobs span.crondate').tooltip({placement: 'top'}); $('#backgroundjobs input').change(function(){ if($(this).is(':checked')){ diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 93c9dca715..e5b0908944 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -290,12 +290,12 @@ if ($_['cronErrors']) { $absolute_time = OC_Util::formatDate($_['lastcron']); if (time() - $_['lastcron'] <= 3600): ?> - + t("Last cron job execution: %s.", [$relative_time]));?> - + t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?> Date: Wed, 13 Jul 2016 10:00:02 +0200 Subject: [PATCH 4/4] Use tooltip for ssl certs table --- settings/js/certificates.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/certificates.js b/settings/js/certificates.js index 7e62a4f515..f73ceea23f 100644 --- a/settings/js/certificates.js +++ b/settings/js/certificates.js @@ -13,7 +13,7 @@ $(document).ready(function () { return true; }); - $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); + $('#sslCertificate tr > td').tooltip({placement: 'bottom', container: 'body'}); $('#rootcert_import').fileupload({ pasteZone: null,