mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #386 from nextcloud/use-tooltip-instead-of-tipsy 

Use tooltip instead of tipsy
This commit is contained in:
Morris Jobke 2016-07-13 12:51:15 +02:00 committed by GitHub
parent afef11f84a 3c432a8afe
commit 27ba288804
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/federatedfilesharing/js/settings-admin.js
View File

@ -8,5 +8,4 @@ $(document).ready(function() {
OC.AppConfig.setValue('files_sharing', $(this).attr('name'), value);
});
$('.section .icon-info').tipsy({gravity: 'w'});
});

2
settings/js/admin.js
View File

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

24
settings/js/apps.js
View File

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

2
settings/js/certificates.js
View File

@ -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,

4
settings/templates/admin.php
View File

@ -290,12 +290,12 @@ if ($_['cronErrors']) {
$absolute_time = OC_Util::formatDate($_['lastcron']);
if (time() - $_['lastcron'] <= 3600): ?>
<span class="status success"></span>
<span class="crondate" original-title="<?php p($absolute_time);?>">
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
</span>
<?php else: ?>
<span class="status error"></span>
<span class="crondate" original-title="<?php p($absolute_time);?>">
<span class="crondate" title="<?php p($absolute_time);?>">
<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
</span>
<?php endif;