<?php if(x($page,'title')) echo $page['title'] ?>

From 404189f88c65d9287ca5b740af00e61b79cf685d Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 20 May 2023 12:40:28 +0000 Subject: backgound url must be between quotation marks --- view/tpl/oembed_video.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl index b0cfed2e5..d821ebdb2 100644 --- a/view/tpl/oembed_video.tpl +++ b/view/tpl/oembed_video.tpl @@ -1,4 +1,4 @@

-- cgit v1.2.3 From e6eb2a847637fe4cc2f9d3e0f5c137f9b56b419d Mon Sep 17 00:00:00 2001 From: ivan zlax Date: Thu, 25 May 2023 08:53:03 +0000 Subject: double columns templates --- view/css/doubleleft.css | 31 +++++++++++++++++++++++++++++++ view/css/doubleright.css | 31 +++++++++++++++++++++++++++++++ view/php/doubleleft.php | 36 ++++++++++++++++++++++++++++++++++++ view/php/doubleright.php | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 view/css/doubleleft.css create mode 100644 view/css/doubleright.css create mode 100644 view/php/doubleleft.php create mode 100644 view/php/doubleright.php (limited to 'view') diff --git a/view/css/doubleleft.css b/view/css/doubleleft.css new file mode 100644 index 000000000..f26b66824 --- /dev/null +++ b/view/css/doubleleft.css @@ -0,0 +1,31 @@ +main { + position: relative; + min-height: 100vh; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + flex: 1; +} + +.columns { + display: flex; + flex:1; + min-width: 0; +} + +#region_1 { + position: relative; + order: 1; + padding: 4.5rem 7px 0px 7px; +} + +#region_2 { + position: relative; + flex: 1; + order: 2; + padding: 4.5rem 7px 200px 7px; + min-width: 0; +} diff --git a/view/css/doubleright.css b/view/css/doubleright.css new file mode 100644 index 000000000..29a09c007 --- /dev/null +++ b/view/css/doubleright.css @@ -0,0 +1,31 @@ +main { + position: relative; + min-height: 100vh; + display: flex; + flex-direction: column; +} + +.content { + display: flex; + flex: 1; +} + +.columns { + display: flex; + flex:1; + min-width: 0; +} + +#region_1 { + position: relative; + flex: 1; + order: 1; + padding: 4.5rem 7px 200px 7px; + min-width: 0; +} + +#region_2 { + position: relative; + order: 2; + padding: 4.5rem 7px 0px 7px; +} diff --git a/view/php/doubleleft.php b/view/php/doubleleft.php new file mode 100644 index 000000000..26dcf6983 --- /dev/null +++ b/view/php/doubleleft.php @@ -0,0 +1,36 @@ + + +> + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + > + +

+ +

+ + + diff --git a/view/php/doubleright.php b/view/php/doubleright.php new file mode 100644 index 000000000..2a470109a --- /dev/null +++ b/view/php/doubleright.php @@ -0,0 +1,36 @@ + + +> + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + > + +

+ +

+ + + -- cgit v1.2.3 From 43a18a2569fc3a65df77c3654b0415b81fdebfdb Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 25 May 2023 09:01:29 +0000 Subject: update description --- view/php/doubleleft.php | 2 +- view/php/doubleright.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/php/doubleleft.php b/view/php/doubleleft.php index 26dcf6983..2d1571bf8 100644 --- a/view/php/doubleleft.php +++ b/view/php/doubleleft.php @@ -1,7 +1,7 @@ Date: Fri, 2 Jun 2023 11:33:44 +0000 Subject: ocap initial checkin --- view/tpl/settings_privacy.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/settings_privacy.tpl b/view/tpl/settings_privacy.tpl index 77d125e41..ae81cee78 100644 --- a/view/tpl/settings_privacy.tpl +++ b/view/tpl/settings_privacy.tpl @@ -11,6 +11,7 @@ {{include file="field_checkbox.tpl" field=$index_opt_out}} {{include file="field_checkbox.tpl" field=$autoperms}} {{include file="field_checkbox.tpl" field=$permit_all_mentions}} + {{include file="field_checkbox.tpl" field=$ocap_enabled}} {{if $sec_addon}} {{$sec_addon}} -- cgit v1.2.3 From 0ee03a565f58f3e66d7b7f40163c188cc7d5496f Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 2 Jun 2023 12:02:50 +0000 Subject: remove custom acl from rpost --- view/tpl/cloud_directory.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 587adaeea..7bc298203 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -173,7 +173,7 @@ {{else}} {{if $is_owner}} - + {{/if}} {{/if}} -- cgit v1.2.3 From a532a70ac02e3967d87587c210370494c9b32b26 Mon Sep 17 00:00:00 2001 From: ivan zlax Date: Fri, 2 Jun 2023 19:54:59 +0000 Subject: Update 'full' and 'minimal' layouts to use color_mode functionality --- view/php/full.php | 2 +- view/php/minimal.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/php/full.php b/view/php/full.php index d855fb650..cb554724a 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -9,7 +9,7 @@ */ ?> - +> <?php if(x($page,'title')) echo $page['title'] ?> diff --git a/view/php/minimal.php b/view/php/minimal.php index 3fab0c5f9..b21cefc5e 100644 --- a/view/php/minimal.php +++ b/view/php/minimal.php @@ -9,7 +9,7 @@ */ ?> - +> <?php if(x($page,'title')) echo $page['title'] ?> -- cgit v1.2.3 From 18b7b3f125b88143d4edefec22a0df67869788d9 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 16 Jun 2023 12:16:22 +0000 Subject: deprecate ActivityStreams::fetch() and provide the possibility to fetch local items directly --- view/tpl/navbar_default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index c0bcd02c2..ea8723e8b 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -187,7 +187,7 @@ {{if $name}}

{{/if}} -- cgit v1.2.3 From d9f855b97e2851c7c55ff53a7293c9a667a2bf6e Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 18 Jun 2023 09:00:54 +0000 Subject: fix bogus html --- view/theme/redbasic/css/style.css | 4 ++++ view/tpl/cdav_calendar.tpl | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1696f10bd..3e34fff95 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -255,6 +255,10 @@ input[type=text], textarea { display: none; } +span.spinner { + display: block; +} + .spinner.s { height: 1rem; width: 1rem; diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index edfa2a422..1bf54103c 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -572,17 +572,17 @@ function exportDate() {

- +

-- cgit v1.2.3 From 9550a7a954b4c9267aa75fa5083a96a65dd65808 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 18 Jun 2023 09:02:10 +0000 Subject: more html fix --- view/tpl/cal_calendar.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/cal_calendar.tpl b/view/tpl/cal_calendar.tpl index 68ec318bd..2f3140ce3 100644 --- a/view/tpl/cal_calendar.tpl +++ b/view/tpl/cal_calendar.tpl @@ -86,7 +86,7 @@ function updateSize() {

- +

-- cgit v1.2.3 From e49d2f6b8f0dc9039b9c1435a4e2f99c783a9ab1 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 18 Jun 2023 09:20:57 +0000 Subject: remove deprecated templates --- view/tpl/mail_conv.tpl | 40 ----------------------- view/tpl/mail_display.tpl | 24 -------------- view/tpl/mail_head.tpl | 8 ----- view/tpl/mail_list.tpl | 7 ---- view/tpl/message_side.tpl | 11 ------- view/tpl/msg-header.tpl | 82 ----------------------------------------------- 6 files changed, 172 deletions(-) delete mode 100644 view/tpl/mail_conv.tpl delete mode 100644 view/tpl/mail_display.tpl delete mode 100644 view/tpl/mail_head.tpl delete mode 100644 view/tpl/mail_list.tpl delete mode 100644 view/tpl/message_side.tpl delete mode 100644 view/tpl/msg-header.tpl (limited to 'view') diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl deleted file mode 100644 index 948890312..000000000 --- a/view/tpl/mail_conv.tpl +++ /dev/null @@ -1,40 +0,0 @@ -

- ${{$mail.from_name}}$ -

- {{if $mail.is_recalled}}{{$mail.is_recalled}}{{/if}} -

- {{$mail.body}} -

- {{if $mail.attachments}} - - {{/if}} - -

diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl deleted file mode 100644 index 80ce40838..000000000 --- a/view/tpl/mail_display.tpl +++ /dev/null @@ -1,24 +0,0 @@ -

- - - {{if $mailbox == 'combined'}} - {{$delete}} - {{/if}} -

- {{foreach $mails as $mail}} - {{include file="mail_conv.tpl"}} - {{/foreach}} - - {{if $canreply}} - {{include file="prv_message.tpl"}} - {{else}} - {{$unknown_text}} - {{/if}} -

diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl deleted file mode 100644 index aac592a5f..000000000 --- a/view/tpl/mail_head.tpl +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl deleted file mode 100644 index a1784e1e6..000000000 --- a/view/tpl/mail_list.tpl +++ /dev/null @@ -1,7 +0,0 @@ -

- - {{$message.subject}}
- {{$message.from_name}} > {{$message.to_name}}
- - -

diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl deleted file mode 100644 index a45d1d177..000000000 --- a/view/tpl/message_side.tpl +++ /dev/null @@ -1,11 +0,0 @@ - diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl deleted file mode 100644 index d49303453..000000000 --- a/view/tpl/msg-header.tpl +++ /dev/null @@ -1,82 +0,0 @@ -{{** - - - - -**}} -- cgit v1.2.3 From cd26ead043f9cb92ca4d59e587480520cb51f117 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 23 Jun 2023 09:13:51 +0000 Subject: implement optional moderation of unsolicited comments, minor css fixes and some more work on ocap --- view/js/main.js | 12 ++++++++++++ view/theme/redbasic/css/style.css | 1 - view/theme/redbasic/schema/Focus-Boxy.css | 1 + view/tpl/conv_item.tpl | 7 ++++++- view/tpl/profile_vcard.tpl | 16 ++++++++-------- view/tpl/settings_privacy.tpl | 1 + 6 files changed, 28 insertions(+), 10 deletions(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index dcdf58396..9c2480795 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1314,6 +1314,18 @@ function dounsubthread(ident) { liking = 1; } +function moderate_approve(ident) { + $('#like-rotator-' + ident.toString()).show(); + $.get('moderate/' + ident.toString() + '/approve', updateInit ); + liking = 1; +} + +function moderate_drop(ident) { + $('#like-rotator-' + ident.toString()).show(); + $.get('moderate/' + ident.toString() + '/drop', $('#thread-wrapper-' + ident.toString()).fadeOut(function() { this.remove(); })); + liking = 1; +} + function dostar(ident) { ident = ident.toString(); $('#like-rotator-' + ident).show(); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3e34fff95..4ba65c112 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1380,7 +1380,6 @@ blockquote { overflow: auto; } -.dropdown-item.active, .textcomplete-item.active { color: #fff; background-color: var(--bs-tertiary-bg); diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css index e5f3280f6..df5bf2d75 100644 --- a/view/theme/redbasic/schema/Focus-Boxy.css +++ b/view/theme/redbasic/schema/Focus-Boxy.css @@ -25,6 +25,7 @@ } .vcard-card .card { + border: 1px solid var(--bs-border-color); border-top: 0; border-right: 0; border-left: 0; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 3f760998d..cd2130295 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -7,7 +7,7 @@

{{$item.photo}} @@ -120,6 +120,10 @@

{{/if}} + {{if $item.moderate}} + {{$item.moderate_approve}} + {{$item.moderate_delete}} + {{else}}

+ {{/if}}

{{if $item.responses || $item.attachments}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 6cf40bf79..37339a40a 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -48,10 +48,10 @@ {{/if}}

- {{if $details}} -

+ {{if $details && ($location || $hometown || $gender || $marital || $homepage)}} +

{{if $location}} -

{{$location}}: {{if $profile.address}} @@ -71,30 +71,30 @@

{{/if}} {{if $hometown}} -

{{$hometown}}: {{$profile.hometown}}

{{/if}} {{if $gender}} -

{{$gender}}: {{if $profile.gender_icon}} {{/if}}{{$profile.gender}}

{{/if}} {{if $marital}} -

{{$marital}}: {{$profile.marital}}

{{/if}} {{if $homepage}} -

{{$homepage}}: {{$profile.homepage}}

{{/if}} -

diff --git a/view/tpl/settings_privacy.tpl b/view/tpl/settings_privacy.tpl index ae81cee78..03224ae65 100644 --- a/view/tpl/settings_privacy.tpl +++ b/view/tpl/settings_privacy.tpl @@ -11,6 +11,7 @@ {{include file="field_checkbox.tpl" field=$index_opt_out}} {{include file="field_checkbox.tpl" field=$autoperms}} {{include file="field_checkbox.tpl" field=$permit_all_mentions}} + {{include file="field_checkbox.tpl" field=$moderate_unsolicited_comments}} {{include file="field_checkbox.tpl" field=$ocap_enabled}} {{if $sec_addon}} -- cgit v1.2.3 From 762e1c9c2bfbfac5c4ea1d2bc4816867ddc4f881 Mon Sep 17 00:00:00 2001 From: mjfriaza Date: Thu, 22 Jun 2023 16:35:21 +0200 Subject: Update Spanish translation-2 (cherry picked from commit 1baa34894f6799cac3d973db8c1205239ad6179b) --- view/es-es/hmessages.po | 2 +- view/es-es/hstrings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index eb2d6fafd..8d4c4ea60 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -1797,7 +1797,7 @@ msgstr "Insertar enlace web" #: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1352 msgid "Embed (existing) photo from your photo albums" -msgstr "Insertar una foto de sus álbumes" +msgstr "Insertar una foto (existente) de sus álbumes" #: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1385 #: ../../Zotlabs/Module/Chat.php:217 diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index cb4a70a3d..db074bd4d 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -321,7 +321,7 @@ App::$strings["Until modified date yyyy-mm-dd"] = "Modificado hasta la fecha yyy App::$strings["Set your location"] = "Establecer su ubicación"; App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador"; App::$strings["Insert web link"] = "Insertar enlace web"; -App::$strings["Embed (existing) photo from your photo albums"] = "Insertar una foto de sus álbumes"; +App::$strings["Embed (existing) photo from your photo albums"] = "Insertar una foto (existente) de sus álbumes"; App::$strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:"; App::$strings["Tag term:"] = "Término de la etiqueta:"; App::$strings["Where are you right now?"] = "¿Donde está ahora?"; -- cgit v1.2.3 From 12b2137a044ff6fd48239e207e5ad9350ceaf5e5 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 23 Jun 2023 12:35:41 +0000 Subject: fix relaying and syncing in Activity::drop(), change wording for moderation request notices and redirect moderation request for reactions to mod moderate --- view/tpl/search_item.tpl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b2a99b64a..da5bac5dc 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -107,6 +107,10 @@

+ {{if $item.mode === 'moderate'}} + {{$item.approve}} + {{$item.delete}} + {{else}} {{if $item.star || $item.thread_action_menu || $item.drop.dropping}}

{{/if}} + {{/if}} {{if $item.star && $item.star.isstarred}}

@@ -139,14 +144,6 @@

{{/if}} - -

- {{if $item.mode === 'moderate'}} - {{$item.approve}} - {{$item.delete}} - {{/if}} -

- {{if $item.conv}} -- cgit v1.2.3 From 750641ef196d9e113b0e80da9734f70400b55652 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 27 Jun 2023 14:53:23 +0000 Subject: implement inline moderation of reactions --- view/tpl/conv_item.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index cd2130295..5f6c4f6c6 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -121,8 +121,8 @@ {{/if}} {{if $item.moderate}} - {{$item.moderate_approve}} - {{$item.moderate_delete}} + {{$item.moderate_approve}} + {{$item.moderate_delete}} {{else}}

{{if $item.like}} -- cgit v1.2.3 From a3092204a1583b58cd9680f2902a6982bd8dd807 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 3 Jul 2023 18:35:10 +0000 Subject: fix issue #1771 --- view/tpl/cdav_calendar.tpl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 1bf54103c..88aa0789d 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -357,8 +357,16 @@ $(document).ready(function() { $('#calendar_select').val('channel_calendar').attr('disabled', true); $('#id_title').val(resource.summary); - $('#id_dtstart').val(new Date(resource.dtstart).toUTCString().slice(0, -4)); - $('#id_dtend').val(new Date(resource.dtend).toUTCString().slice(0, -4)); + + // A hack to match with internal workings of fullcalendar. + // See https://fullcalendar.io/docs/timeZone#UTC-coercion + let start_d = new Date(resource.dtstart); + let start_o = start_d.getTimezoneOffset(); + let end_d = new Date(resource.dtend); + let end_o = start_d.getTimezoneOffset(); + $('#id_dtstart').val(new Date(start_d - start_o * 60000).toUTCString().slice(0, -4)); + $('#id_dtend').val(new Date(end_d - end_o * 60000).toUTCString().slice(0, -4)); + $('#id_categories').tagsinput('add', '{{$categories}}'), $('#id_description').val(resource.description); $('#id_location').val(resource.location); -- cgit v1.2.3 From 342460fa17b1358f3377366739d3e6311448fe03 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 4 Jul 2023 11:19:04 +0000 Subject: css fixes --- view/theme/redbasic/css/style.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4ba65c112..658a3cf6e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1019,14 +1019,10 @@ img.mail-conv-sender-photo { .wall-item-content-wrapper { background-color: var(--bs-tertiary-bg); - border-top-right-radius: var(--bs-border-radius); - border-top-left-radius: var(--bs-border-radius); } .wall-item-content-wrapper.comment { background-color: var(--bs-body-bg); - border-top-right-radius: 0px; - border-top-left-radius: 0px; } .hide-comments-outer { @@ -1203,6 +1199,7 @@ img.mail-conv-sender-photo { } .generic-content-wrapper { + background-color: var(--bs-body-bg); border: 1px solid var(--bs-border-color); border-radius: var(--bs-border-radius); margin-bottom: 1.5rem; -- cgit v1.2.3 From 7e21aeedcd7dd34faccc67d1e063860d52bc1c17 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 4 Jul 2023 17:51:16 +0000 Subject: css fix --- view/css/mod_directory.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css index fce3a47fc..775fc3a68 100644 --- a/view/css/mod_directory.css +++ b/view/css/mod_directory.css @@ -22,7 +22,7 @@ } .contact-info-element { - word-break: break-all; + word-break: break-word; } .contact-info-label { -- cgit v1.2.3

{{$prvmsg_header}}

{{$header}}

{{$title}}