From b139e5bb0054b97beff22bae65f145bc29874e08 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 25 Mar 2024 12:26:06 +0100 Subject: Fix smarty deprecation warning in category widget. --- view/tpl/categories_widget.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl index fd27dca44..a7be796d6 100644 --- a/view/tpl/categories_widget.tpl +++ b/view/tpl/categories_widget.tpl @@ -5,7 +5,7 @@ -- cgit v1.2.3 From f72f5c7321398881243bb509211958414708e43e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 21:42:32 +0000 Subject: wrong dreport link in blog mode --- view/tpl/conv_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index fe9167a88..2d6c6fe8e 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -205,7 +205,7 @@ {{/if}} {{if $item.edpost && $item.dreport}} - {{$item.dreport}} + {{$item.dreport}} {{/if}} {{if $item.settings}} -- cgit v1.2.3 From 80d1e0790852c4df4768820cad8a4557dcfecd73 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 25 Mar 2024 21:48:25 +0000 Subject: deprecated bootstrap namespace in list mode --- view/tpl/conv_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 2d6c6fe8e..374c3f53f 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -209,7 +209,7 @@ {{/if}} {{if $item.settings}} - {{$item.settings}} + {{$item.settings}} {{/if}} -- cgit v1.2.3 From 7de629a8c325a02a62e43b3ad357feaac844564a Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 5 Apr 2024 12:56:51 +0000 Subject: update siteinfo --- view/tpl/siteinfo.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index 6cf7da756..08e4790f2 100644 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -55,7 +55,7 @@
{{$prj_src}}


-
{{$prj_transport}} ({{$transport_link}})
+
{{$prj_transport}} {{$transport_link}}
{{if $additional_fed}}
{{$additional_text}} {{$additional_fed}}
-- cgit v1.2.3 From 7c34a3676d294c9a1acc69f71ab3061074509160 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 30 Apr 2024 06:59:19 +0000 Subject: Rework Help module + begin tests for Setup module --- view/tpl/help.tpl | 8 ++++---- view/tpl/widget.tpl | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 view/tpl/widget.tpl (limited to 'view/tpl') diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 5022e7b1b..ba61a43ce 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -13,19 +13,19 @@ -

{{$title}}: {{$heading}}

+

{{$module->get_page_title()}}

- {{$tocHeading}} + {{$module->get_toc_heading()}}

- {{$content}} + {{$module->render_content()}}
diff --git a/view/tpl/widget.tpl b/view/tpl/widget.tpl new file mode 100644 index 000000000..3fb3b1200 --- /dev/null +++ b/view/tpl/widget.tpl @@ -0,0 +1,10 @@ +{{* Generic template for widgets. + * + * To use this template, pass the `$this` object reference of the widget, + * and implement the `title()` and `contents()` functions as public methods + * on the widget class. + *}} +
+

{{$widget->title()}}

+ {{$widget->contents()}} +
-- cgit v1.2.3 From 058c7d6c13e4cb76efd001ca5be39769825587b0 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 13:00:45 +0000 Subject: start removing jgrowl --- view/tpl/hdr.tpl | 1 + view/tpl/notifications_widget.tpl | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index e69de29bb..7d20633bc 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -0,0 +1 @@ +
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9ea5ffec6..aa53905ad 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -337,17 +337,19 @@ sse_setNotificationsStatus(); // notice and info - $.jGrowl.defaults.closerTemplate = '
[ ' + aStr.closeAll + ']
'; + //$.jGrowl.defaults.closerTemplate = '
[ ' + aStr.closeAll + ']
'; if(obj.notice) { $(obj.notice.notifications).each(function() { - $.jGrowl(this, { sticky: true, theme: 'notice' }); + toast(this, 'danger'); + //$.jGrowl(this, { sticky: true, theme: 'notice' }); }); } if(obj.info) { $(obj.info.notifications).each(function(){ - $.jGrowl(this, { sticky: false, theme: 'info', life: 10000 }); + toast(this, 'info'); + //$.jGrowl(this, { sticky: false, theme: 'info', life: 10000 }); }); } -- cgit v1.2.3 From 2e575dee526305f1c0c2b8184179167f1b0756ec Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 14:09:09 +0000 Subject: css fix --- view/tpl/hdr.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index 7d20633bc..ba63830eb 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1 +1 @@ -
+
-- cgit v1.2.3 From 98c3e2f93f18554364e26e9cf25473d36641a173 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 14:44:16 +0000 Subject: remove jgrowl --- view/tpl/cdav_calendar.tpl | 4 ++-- view/tpl/contact_edit_modal.tpl | 8 ++++---- view/tpl/invite.tpl | 1 - view/tpl/notifications_widget.tpl | 3 --- view/tpl/totp_setup.tpl | 4 ++-- 5 files changed, 8 insertions(+), 12 deletions(-) (limited to 'view/tpl') 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; }'+ ''); $('#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 = '
[ ' + aStr.closeAll + ']
'; 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'); } ); } -- cgit v1.2.3 From 977e6a02f4c21bbfc15e49f9b7247e3c216ba171 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 17:21:53 +0000 Subject: another css fix --- view/tpl/hdr.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index ba63830eb..f4f346fb7 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1 +1 @@ -
+
-- cgit v1.2.3 From 07696d4bd144be03819122bfa2c78cd8aa3d4770 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 2 May 2024 19:24:13 +0000 Subject: fix the test - we do not use a title anymore since it does not make much sense in combination of the sub titles --- view/tpl/widget.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/widget.tpl b/view/tpl/widget.tpl index 3fb3b1200..4bbbb2df9 100644 --- a/view/tpl/widget.tpl +++ b/view/tpl/widget.tpl @@ -5,6 +5,8 @@ * on the widget class. *}}
+ {{if $widget->title()}}

{{$widget->title()}}

+ {{/if}} {{$widget->contents()}}
-- cgit v1.2.3 From 7a5bb99d87f85a4ea93c270beaa27ecee0c0b853 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 8 May 2024 12:18:00 +0200 Subject: make sure the hcard addon markup will be available even if other profile entries are missing --- view/tpl/profile_vcard.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index dd372beac..de08cfc19 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -99,8 +99,11 @@ {{/if}} + {{/if}} + {{if $details}}
{{/if}} + {{if $details}} {{$chanmenu}} -- cgit v1.2.3 From 76ce4705e23f286cf6b568191840404e5cb94e9f Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 May 2024 14:34:44 +0000 Subject: more fixes for issue #1843 --- view/tpl/oembed_video.tpl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl index d821ebdb2..f1513a5d5 100644 --- a/view/tpl/oembed_video.tpl +++ b/view/tpl/oembed_video.tpl @@ -1,4 +1 @@ - - -
-
+ -- cgit v1.2.3 From 960354b16cab06915a2f85fcc5e55d380765d858 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 8 May 2024 19:27:48 +0000 Subject: make mod regate return to system.workflow_channel_next and show register message field only if registration is set to register_approve --- view/tpl/register.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 8e1530eb4..cc2b8e47b 100644 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -47,7 +47,7 @@ {{include file="field_input.tpl" field=$email}} {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} - {{if $reg_is}} + {{if $register_msg}} {{include file="field_textarea.tpl" field=$register_msg}} {{/if}} {{if $enable_tos}} -- cgit v1.2.3 From 5da0cc138f4330fd07e9c117b3f4261dc1bcbc19 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 15 May 2024 08:28:19 +0000 Subject: Refactor and cleanup Rbmark module + add tests --- view/tpl/field_input.tpl | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index 2f9f83ac5..1b548221f 100644 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,7 +1,18 @@
- - - {{$field.3}} + + + + {{$field.3}} +
{{* COMMENTS for this template: -- cgit v1.2.3 From 59b8c8ad487e9695d7d85f2529adc9e0b2cd6cc1 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 7 Jun 2024 09:11:09 +0000 Subject: move button class to the right dom --- view/tpl/cal_event.tpl | 2 +- view/tpl/event.tpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/cal_event.tpl b/view/tpl/cal_event.tpl index d7662786b..0719d5262 100644 --- a/view/tpl/cal_event.tpl +++ b/view/tpl/cal_event.tpl @@ -6,7 +6,7 @@ {{$event.html}}
- {{if $event.item.plink}}{{/if}} + {{if $event.item.plink}}{{/if}}
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl index cc0bfc1c7..91dc53421 100644 --- a/view/tpl/event.tpl +++ b/view/tpl/event.tpl @@ -6,9 +6,9 @@ {{$event.html}}
- {{if $event.item.plink}}{{/if}} - {{if $event.edit}}{{/if}} - {{if $event.drop}}{{/if}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} + {{if $event.drop}}{{/if}}
-- cgit v1.2.3 From 13c074f8b8f8340efc7c5912c615b6cfa693409d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 22 May 2024 19:20:57 +0200 Subject: Module\Setup: Pass all required params for the template. Non-existing keys in the array passed to the template causes a warning. Also make optional parts of the template actually optional by skipping them if the value is empty. --- view/tpl/install.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl index 5ab722b12..56faa0527 100644 --- a/view/tpl/install.tpl +++ b/view/tpl/install.tpl @@ -2,7 +2,9 @@

{{$title}}


+ {{if $icon}}

  {{$pass}}

+ {{/if}}
{{if $status}} @@ -11,5 +13,5 @@
{{$text}}

- {{$what_next}} + {{if $what_next}}{{$what_next}}{{/if}} -- cgit v1.2.3 From fb1c66fbc9705961454d86770511642b97b41c1a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jun 2024 17:08:29 +0200 Subject: Fix warnings exposed by tests. Mainly missing variables for templates, and channel entries. --- view/tpl/jot-header.tpl | 2 -- 1 file changed, 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ca3cabd61..67ba1824b 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -184,7 +184,6 @@ var activeCommentText = ''; } function jotGetExpiry() { - //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); $('#expiryModal').modal('show'); $('#expiry-modal-OKButton').on('click', function() { reply=$('#expiration-date').val(); @@ -196,7 +195,6 @@ var activeCommentText = ''; } function jotGetPubDate() { - //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); $('#createdModal').modal('show'); $('#created-modal-OKButton').on('click', function() { reply=$('#created-date').val(); -- cgit v1.2.3 From 0f02553d129e2bc533cf98a590f3c9e04dc55bf3 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jun 2024 09:07:05 +0000 Subject: move template to wiki addon --- view/tpl/nwiki_page_history.tpl | 59 ----------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 view/tpl/nwiki_page_history.tpl (limited to 'view/tpl') diff --git a/view/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl deleted file mode 100644 index 6926cca2d..000000000 --- a/view/tpl/nwiki_page_history.tpl +++ /dev/null @@ -1,59 +0,0 @@ - - - {{foreach $pageHistory as $commit}} - - {{/foreach}} -
- - - - - -
{{$date_lbl}}{{$commit.date}} - {{if $permsWrite}} - -

- {{/if}} - -
{{$name_lbl}}{{$commit.name}}
{{$msg_label}}{{$commit.title}}
-
\ No newline at end of file -- cgit v1.2.3 From a50b3181ad76f682fcb4ff60c4cc5ae2083f9c28 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Jun 2024 10:27:13 +0000 Subject: make sure we get a scrollbar if everything else breaks and remove some unused css --- view/tpl/admin_accounts.tpl | 2 +- view/tpl/admin_channels.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index 1f5617f00..4e2b79876 100644 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -1,4 +1,4 @@ -
+

{{$title}} - {{$page}}

diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 75db77593..19b3c292f 100644 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -10,7 +10,7 @@ return false; } -
+

{{$title}} - {{$page}}

-- cgit v1.2.3