diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/mod_cloud.js | 4 | ||||
| -rw-r--r-- | view/php/theme_init.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/narrow_navbar.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 21 | ||||
| -rw-r--r-- | view/tpl/cdav_calendar.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/contact_edit_modal.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/invite.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/totp_setup.tpl | 4 |
9 files changed, 10 insertions, 42 deletions
diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index e0f59beab..fc9219bff 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -73,7 +73,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); + toast(aStr.download_info, 'info'); let data = [ {name: 'attach_path', value: window.location.pathname}, @@ -301,7 +301,7 @@ $(document).ready(function () { close_and_deactivate_all_panels(); $('body').css('cursor', 'wait'); - $.jGrowl(aStr.download_info, { sticky: false, theme: 'info', life: 10000 }); + toast(aStr.download_info, 'info'); post_data.push( {name: 'attach_path', value: window.location.pathname}, diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 50da8b5f9..821e9b46e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -3,7 +3,6 @@ require_once('include/plugin.php'); head_add_css('/library/tiptip/tipTip.css'); -head_add_css('/library/jgrowl/jquery.jgrowl.css'); head_add_css('/library/jRange/jquery.range.css'); head_add_css('/view/css/conversation.css'); @@ -23,7 +22,6 @@ head_add_js('autocomplete.js'); head_add_js('/library/jquery.timeago.js'); head_add_js('/library/readmore.js/readmore.js'); -head_add_js('/library/jgrowl/jquery.jgrowl.min.js'); head_add_js('/library/sjcl/sjcl.js'); head_add_js('/library/sodium-plus/dist/sodium-plus.min.js'); diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 9f915418e..2b0ec9a05 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -4,9 +4,4 @@ --bs-navbar-padding-y: 1px; } - #jGrowl.top-right { - top: 3.5rem; - right: 15px; - } - } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 05cd75422..d4f839701 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -713,27 +713,6 @@ nav .acpopup { color:#cc0000; } -/* popup notifications */ -div.jGrowl div.notice { - background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; -} -div.jGrowl div.info { - background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center; - color: #ffffff; - padding-left: 58px; -} - -#jGrowl.top-right { - top: 4.5rem; - right: .25rem; -} - -div.jGrowl div.jGrowl-notification { - min-height: 60px; -} - .jslider .jslider-scale ins { color: #333; font-size: 1rem; diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 88aa0789d..5d8c6115f 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -480,7 +480,7 @@ function on_submit() { eventSource.refetch(); } else { - $.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 }); + toast('{{$disabled_warning}}', 'danger'); } reset_form(); }); @@ -506,7 +506,7 @@ function on_submit() { eventSource.refetch(); } else { - $.jGrowl('{{$disabled_warning}}', { sticky: false, theme: 'notice', life: 10000 }); + toast('{{$disabled_warning}}', 'danger'); } reset_form(); }); diff --git a/view/tpl/contact_edit_modal.tpl b/view/tpl/contact_edit_modal.tpl index 72feb7138..b9d9ead08 100644 --- a/view/tpl/contact_edit_modal.tpl +++ b/view/tpl/contact_edit_modal.tpl @@ -54,11 +54,11 @@ $.post('contactedit/' + poi, form_data, function(data) { if (!data.success) { - $.jGrowl(data.message, {sticky: false, theme: 'notice', life: 10000}); + toast(data.message, 'danger'); return; } activate(data); - $.jGrowl(data.message, {sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: ((data.success) ? 3000 : 10000)}); + toast(data.message, ((data.success) ? 'info' : 'danger')); // $('#edit-modal').modal('hide'); }); @@ -70,7 +70,7 @@ $.get('contactedit/' + poi + '/' + cmd, function(data) { $('#edit-modal-tools').html(data.tools); - $.jGrowl(data.message, {sticky: false, theme: ((data.success) ? 'info' : 'notice'), life: ((data.success) ? 3000 : 10000)}); + toast(data.message, ((data.success) ? 'info' : 'danger')); if (cmd === 'drop') { if ($('#contact-entry-wrapper-' + poi).length) { $('#contact-entry-wrapper-' + poi).fadeOut(); @@ -110,7 +110,7 @@ $('.contact-edit-icon-' + poi).hide(); $.get('contactedit/' + poi, function(data) { if (!data.success) { - $.jGrowl(data.message, {sticky: false, theme: 'notice', life: 10000}); + toast(data.message, 'danger'); return; } $('#edit-modal').modal('show'); diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl index 304816e0b..08c984a5e 100644 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -76,7 +76,6 @@ ' .zai_n { width: 5em; text-align: center; }'+ ' #id_zaiexpire_fs { display: inline-block; }'+ ' .invites { text-transform: capitalize; }'+ - ' .jGrowl-message { font-family: monospace; }'+ '</style>'); $('#zai-txt').attr('placeholder','{{$personal_pointer}}'); zaitx(); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index aa53905ad..a9d98dae9 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -337,19 +337,16 @@ sse_setNotificationsStatus(); // notice and info - //$.jGrowl.defaults.closerTemplate = '<div>[ ' + aStr.closeAll + ']</div>'; if(obj.notice) { $(obj.notice.notifications).each(function() { toast(this, 'danger'); - //$.jGrowl(this, { sticky: true, theme: 'notice' }); }); } if(obj.info) { $(obj.info.notifications).each(function(){ toast(this, 'info'); - //$.jGrowl(this, { sticky: false, theme: 'info', life: 10000 }); }); } diff --git a/view/tpl/totp_setup.tpl b/view/tpl/totp_setup.tpl index 6f995edf1..1f028f6f9 100644 --- a/view/tpl/totp_setup.tpl +++ b/view/tpl/totp_setup.tpl @@ -50,12 +50,12 @@ {totp_code: document.getElementById('totp_test').value}, function(data) { if (data['status']) { - $.jGrowl('{{$test_pass}}', { sticky: false, theme: 'info', life: 10000 }); + toast('{{$test_pass}}', 'info'); let e = document.getElementById('mfa-submit-wrapper'); e.classList.remove('d-none'); return; } - $.jGrowl('{{$test_fail}}', { sticky: false, theme: 'notice', life: 10000 }); + toast('{{$test_fail}}', 'danger'); } ); } |