From 22a8be5f96488fdbe5dd1fcba090fc1355ccd106 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 20 Nov 2021 02:16:30 -0500 Subject: [PATCH 1/6] [frio] Make accordions keyboard actionable --- view/theme/frio/css/style.css | 10 ++++- .../templates/admin/blocklist/contact.tpl | 8 ++-- view/theme/frio/templates/admin/features.tpl | 4 +- view/theme/frio/templates/admin/site.tpl | 40 +++++++++---------- view/theme/frio/templates/admin/storage.tpl | 4 +- view/theme/frio/templates/contact_edit.tpl | 12 +++--- .../frio/templates/settings/connectors.tpl | 4 +- .../theme/frio/templates/settings/display.tpl | 16 ++++---- .../frio/templates/settings/features.tpl | 4 +- .../frio/templates/settings/profile/index.tpl | 16 ++++---- .../frio/templates/settings/settings.tpl | 32 +++++++-------- 11 files changed, 78 insertions(+), 72 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index ed2bd66cf3..3891f6d24e 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2901,13 +2901,13 @@ ul li:hover .contact-wrapper .contact-action-link:hover { padding: 1px 10px; } details.profile-jot-net[open] summary:before, -.panel .section-subtitle-wrapper a.accordion-toggle:before { +.panel .section-subtitle-wrapper .accordion-toggle:before { font-family: ForkAwesome; content: "\f0d7"; padding-right: 5px; } details.profile-jot-net summary:before, -.panel .section-subtitle-wrapper a.accordion-toggle.collapsed:before { +.panel .section-subtitle-wrapper .accordion-toggle.collapsed:before { font-family: ForkAwesome; content: "\f0da"; } @@ -2965,6 +2965,12 @@ details.profile-jot-net[open] summary:before { margin-bottom: 10px; } +.section-subtitle-wrapper > h3 { + font-size: 16px; + margin-top: 8px; + margin-bottom: 8px; +} + .fakelink > h3:before { padding-right: 10px; } diff --git a/view/theme/frio/templates/admin/blocklist/contact.tpl b/view/theme/frio/templates/admin/blocklist/contact.tpl index 8f9fd282fc..e6acce2e9d 100644 --- a/view/theme/frio/templates/admin/blocklist/contact.tpl +++ b/view/theme/frio/templates/admin/blocklist/contact.tpl @@ -11,9 +11,9 @@
@@ -37,9 +37,9 @@
diff --git a/view/theme/frio/templates/admin/features.tpl b/view/theme/frio/templates/admin/features.tpl index 13db0a300c..3fe63bdc28 100644 --- a/view/theme/frio/templates/admin/features.tpl +++ b/view/theme/frio/templates/admin/features.tpl @@ -8,9 +8,9 @@
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index e17dd57ac1..3bd1a49af2 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -29,9 +29,9 @@
@@ -64,9 +64,9 @@
@@ -93,9 +93,9 @@
@@ -118,9 +118,9 @@
@@ -179,9 +179,9 @@
@@ -209,9 +209,9 @@
@@ -235,9 +235,9 @@
@@ -265,9 +265,9 @@
@@ -290,9 +290,9 @@
@@ -331,9 +331,9 @@
diff --git a/view/theme/frio/templates/admin/storage.tpl b/view/theme/frio/templates/admin/storage.tpl index 04d2e4cf27..1a63d1817f 100644 --- a/view/theme/frio/templates/admin/storage.tpl +++ b/view/theme/frio/templates/admin/storage.tpl @@ -15,9 +15,9 @@
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl index 5353801ee5..3457be6997 100644 --- a/view/theme/frio/templates/contact_edit.tpl +++ b/view/theme/frio/templates/contact_edit.tpl @@ -68,9 +68,9 @@
@@ -127,9 +127,9 @@
@@ -161,9 +161,9 @@
diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl index 1f49743491..1138a9d553 100644 --- a/view/theme/frio/templates/settings/connectors.tpl +++ b/view/theme/frio/templates/settings/connectors.tpl @@ -11,9 +11,9 @@
diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl index 35a1f061df..004f1884e2 100644 --- a/view/theme/frio/templates/settings/display.tpl +++ b/view/theme/frio/templates/settings/display.tpl @@ -7,9 +7,9 @@
@@ -31,9 +31,9 @@
@@ -50,9 +50,9 @@
@@ -77,9 +77,9 @@
diff --git a/view/theme/frio/templates/settings/features.tpl b/view/theme/frio/templates/settings/features.tpl index 61fecf57f7..106f197e49 100644 --- a/view/theme/frio/templates/settings/features.tpl +++ b/view/theme/frio/templates/settings/features.tpl @@ -8,9 +8,9 @@
diff --git a/view/theme/frio/templates/settings/profile/index.tpl b/view/theme/frio/templates/settings/profile/index.tpl index 95fcbe4b53..3c3834c311 100644 --- a/view/theme/frio/templates/settings/profile/index.tpl +++ b/view/theme/frio/templates/settings/profile/index.tpl @@ -52,9 +52,9 @@
{{* for the $detailed_profile we use bootstraps collapsable panel-groups to have expandable groups *}} @@ -78,9 +78,9 @@
@@ -118,9 +118,9 @@
@@ -145,9 +145,9 @@
diff --git a/view/theme/frio/templates/settings/settings.tpl b/view/theme/frio/templates/settings/settings.tpl index 5c66e4600e..bf129cc12e 100644 --- a/view/theme/frio/templates/settings/settings.tpl +++ b/view/theme/frio/templates/settings/settings.tpl @@ -12,9 +12,9 @@
@@ -38,9 +38,9 @@
@@ -63,9 +63,9 @@
@@ -102,9 +102,9 @@
@@ -126,9 +126,9 @@
@@ -210,9 +210,9 @@
@@ -231,9 +231,9 @@
@@ -252,9 +252,9 @@
From 0ca420c9499f9a0a24afc9fb9f516db009b7c794 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 20 Nov 2021 04:46:45 -0500 Subject: [PATCH 2/6] [frio] Make addon settings panels keyboard actionable - Keep the addon panel open after form was submitted --- doc/Addons.md | 52 ++++++++++++++++++- mod/settings.php | 25 +++++++-- view/templates/settings/addon/link.tpl | 1 + view/templates/settings/addon/panel.tpl | 33 ++++++++++++ view/templates/settings/addons.tpl | 4 +- .../frio/templates/settings/addon/link.tpl | 1 + .../frio/templates/settings/addon/panel.tpl | 36 +++++++++++++ view/theme/frio/templates/settings/addons.tpl | 18 +++---- 8 files changed, 153 insertions(+), 17 deletions(-) create mode 100644 view/templates/settings/addon/link.tpl create mode 100644 view/templates/settings/addon/panel.tpl create mode 100644 view/theme/frio/templates/settings/addon/link.tpl create mode 100644 view/theme/frio/templates/settings/addon/panel.tpl diff --git a/doc/Addons.md b/doc/Addons.md index 708a2e0f04..cf4fbdab12 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -242,7 +242,57 @@ Called when the Settings pages are submitted. ### addon_settings Called when generating the HTML for the addon settings page. -`$b` is the (string) HTML of the addon settings page before the final `` tag. +`$data` is an array containing: + +- **addon** (output): Required. The addon folder name. +- **title** (output): Required. The addon settings panel title. +- **href** (output): Optional. If set, will reduce the panel to a link pointing to this URL, can be relative. Incompatible with the following keys. +- **html** (output): Optional. Raw HTML of the addon form elements. Both the `
` tags and the submit buttons are taken care of elsewhere. +- **submit** (output): Optional. If unset, a default submit button with `name="-submit"` will be generated. + Can take different value types: + - **string**: The label to replace the default one. + - **associative array**: A list of submit button, the key is the value of the `name` attribute, the value is the displayed label. + The first submit button in this list is considered the main one and themes might emphasize its display. + +#### Examples + +##### With link +```php +$data = [ + 'addon' => 'advancedcontentfilter', + 'title' => DI::l10n()->t('Advanced Content Filter'), + 'href' => 'advancedcontentfilter', +]; +``` +##### With default submit button +```php +$data = [ + 'addon' => 'fromapp', + 'title' => DI::l10n()->t('FromApp Settings'), + 'html' => $html, +]; +``` +##### With no HTML, just a submit button +```php +$data = [ + 'addon' => 'opmlexport', + 'title' => DI::l10n()->t('OPML Export'), + 'submit' => DI::l10n()->t('Export RSS/Atom contacts'), +]; +``` +##### With multiple submit buttons +```php +$data = [ + 'addon' => 'catavar', + 'title' => DI::l10n()->t('Cat Avatar Settings'), + 'html' => $html, + 'submit' => [ + 'catavatar-usecat' => DI::l10n()->t('Use Cat as Avatar'), + 'catavatar-morecat' => DI::l10n()->t('Another random Cat!'), + 'catavatar-emailcat' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null, + ], +]; +``` ### addon_settings_post Called when the Addon Settings pages are submitted. diff --git a/mod/settings.php b/mod/settings.php index 1643b19fc3..54484d8a90 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -62,9 +62,10 @@ function settings_post(App $a) } if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'addon')) { - BaseModule::checkFormSecurityTokenRedirectOnError('/settings/addon', 'settings_addon'); + BaseModule::checkFormSecurityTokenRedirectOnError(DI::args()->getQueryString(), 'settings_addon'); Hook::callAll('addon_settings_post', $_POST); + DI::baseUrl()->redirect(DI::args()->getQueryString()); return; } @@ -438,11 +439,27 @@ function settings_content(App $a) if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'addon')) { $addon_settings_forms = []; - foreach (DI::dba()->selectToArray('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) { - $data = ''; + $data = []; Hook::callSingle(DI::app(), 'addon_settings', [$hook['file'], $hook['function']], $data); - $addon_settings_forms[] = $data; + + if (!empty($data['href'])) { + $tpl = Renderer::getMarkupTemplate('settings/addon/link.tpl'); + $addon_settings_forms[] = Renderer::replaceMacros($tpl, [ + '$addon' => $data['addon'], + '$title' => $data['title'], + '$href' => $data['href'], + ]); + } elseif(!empty($data['addon'])) { + $tpl = Renderer::getMarkupTemplate('settings/addon/panel.tpl'); + $addon_settings_forms[$data['addon']] = Renderer::replaceMacros($tpl, [ + '$addon' => $data['addon'], + '$title' => $data['title'], + '$open' => (DI::args()->getArgv()[2] ?? '') === $data['addon'], + '$html' => $data['html'] ?? '', + '$submit' => $data['submit'] ?? DI::l10n()->t('Save Settings'), + ]); + } } $tpl = Renderer::getMarkupTemplate('settings/addons.tpl'); diff --git a/view/templates/settings/addon/link.tpl b/view/templates/settings/addon/link.tpl new file mode 100644 index 0000000000..4fb8178ccf --- /dev/null +++ b/view/templates/settings/addon/link.tpl @@ -0,0 +1 @@ +

{{$title}}

\ No newline at end of file diff --git a/view/templates/settings/addon/panel.tpl b/view/templates/settings/addon/panel.tpl new file mode 100644 index 0000000000..f401f01231 --- /dev/null +++ b/view/templates/settings/addon/panel.tpl @@ -0,0 +1,33 @@ + +

{{$title}}

+ +
+ +

{{$title}}

+ + {{$html nofilter}} +{{if $submit}} +
+ {{if $submit|is_string}} + + {{else}} + {{$count = 1}} + {{foreach $submit as $name => $label}}{{if $label}} + {{if $count == 1}} + + {{/if}} + {{if $count == 2}} +
+ {{/if}} + {{if $count != 1}} + + {{/if}} + {{$count = $count + 1}} + {{/if}}{{/foreach}} + {{if $submit|count > 1}} +
+ {{/if}} + {{/if}} +
+{{/if}} +
diff --git a/view/templates/settings/addons.tpl b/view/templates/settings/addons.tpl index e30732d17a..03313c9244 100644 --- a/view/templates/settings/addons.tpl +++ b/view/templates/settings/addons.tpl @@ -1,8 +1,8 @@

{{$title}}

-{{foreach $addon_settings_forms as $addon_settings_form}} +{{foreach $addon_settings_forms as $addon => $addon_settings_form}} - + {{$addon_settings_form nofilter}} diff --git a/view/theme/frio/templates/settings/addon/link.tpl b/view/theme/frio/templates/settings/addon/link.tpl new file mode 100644 index 0000000000..bf430db46b --- /dev/null +++ b/view/theme/frio/templates/settings/addon/link.tpl @@ -0,0 +1 @@ +

{{$title}}

diff --git a/view/theme/frio/templates/settings/addon/panel.tpl b/view/theme/frio/templates/settings/addon/panel.tpl new file mode 100644 index 0000000000..561d0fc9f3 --- /dev/null +++ b/view/theme/frio/templates/settings/addon/panel.tpl @@ -0,0 +1,36 @@ + +
+
+ {{$html nofilter}} +
+
+{{if $submit}} + {{if $submit|is_string}} + + {{else}} + {{$count = 1}} + {{foreach $submit as $name => $label}}{{if $label}} + {{if $count == 1}} + + {{/if}} + {{if $count == 2}} +
+ {{/if}} + {{if $count != 1}} + + {{/if}} + {{$count = $count + 1}} + {{/if}}{{/foreach}} + {{if $submit|count > 1}} +
+ {{/if}} + {{/if}} +{{/if}} +
+
diff --git a/view/theme/frio/templates/settings/addons.tpl b/view/theme/frio/templates/settings/addons.tpl index f6e2d61086..f150303eaf 100644 --- a/view/theme/frio/templates/settings/addons.tpl +++ b/view/theme/frio/templates/settings/addons.tpl @@ -2,17 +2,15 @@ {{* include the title template for the settings title *}} {{include file="section_title.tpl" title=$title}} -{{foreach $addon_settings_forms as $addon_settings_form}} - -
- - {{$addon_settings_form nofilter}} -
- +
+{{foreach $addon_settings_forms as $addon => $addon_settings_form}} +
+ + {{$addon_settings_form nofilter}} +
{{foreachelse}} - - - + {{/foreach}} +
\ No newline at end of file From 60bb66e18defa3743340e7b335294bf5e76d39b5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Nov 2021 18:49:07 -0500 Subject: [PATCH 3/6] [frio] Make connector settings panels keyboard activated - Keep the connector panel open after form was submitted --- doc/Addons.md | 56 ++++++++ mod/settings.php | 31 +++-- view/templates/settings/addon/connector.tpl | 34 +++++ view/templates/settings/connectors.tpl | 71 +++++----- view/theme/frio/css/style.css | 6 +- .../templates/settings/addon/connector.tpl | 36 ++++++ .../frio/templates/settings/connectors.tpl | 121 ++++++++++-------- 7 files changed, 256 insertions(+), 99 deletions(-) create mode 100644 view/templates/settings/addon/connector.tpl create mode 100644 view/theme/frio/templates/settings/addon/connector.tpl diff --git a/doc/Addons.md b/doc/Addons.md index cf4fbdab12..578cffe7ca 100644 --- a/doc/Addons.md +++ b/doc/Addons.md @@ -298,6 +298,62 @@ $data = [ Called when the Addon Settings pages are submitted. `$b` is the $_POST array. +### connector_settings +Called when generating the HTML for a connector addon settings page. +`$data` is an array containing: + +- **connector** (output): Required. The addon folder name. +- **title** (output): Required. The addon settings panel title. +- **image** (output): Required. The relative path of the logo image of the platform/protocol this addon is connecting to, max size 48x48px. +- **enabled** (output): Optional. If set to a falsy value, the connector image will be dimmed. +- **html** (output): Optional. Raw HTML of the addon form elements. Both the `
` tags and the submit buttons are taken care of elsewhere. +- **submit** (output): Optional. If unset, a default submit button with `name="-submit"` will be generated. + Can take different value types: + - **string**: The label to replace the default one. + - **associative array**: A list of submit button, the key is the value of the `name` attribute, the value is the displayed label. + The first submit button in this list is considered the main one and themes might emphasize its display. + +#### Examples + +##### With default submit button +```php +$data = [ + 'connector' => 'diaspora', + 'title' => DI::l10n()->t('Diaspora Export'), + 'image' => 'images/diaspora-logo.png', + 'enabled' => $enabled, + 'html' => $html, +]; +``` + +##### With custom submit button label and no logo dim +```php +$data = [ + 'connector' => 'ifttt', + 'title' => DI::l10n()->t('IFTTT Mirror'), + 'image' => 'addon/ifttt/ifttt.png', + 'html' => $html, + 'submit' => DI::l10n()->t('Generate new key'), +]; +``` + +##### With conditional submit buttons +```php +$submit = ['pumpio-submit' => DI::l10n()->t('Save Settings')]; +if ($oauth_token && $oauth_token_secret) { + $submit['pumpio-delete'] = DI::l10n()->t('Delete this preset'); +} + +$data = [ + 'connector' => 'pumpio', + 'title' => DI::l10n()->t('Pump.io Import/Export/Mirror'), + 'image' => 'images/pumpio.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, +]; +``` + ### profile_post Called when posting a profile page. `$b` is the $_POST array. diff --git a/mod/settings.php b/mod/settings.php index 54484d8a90..632517f165 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -72,7 +72,7 @@ function settings_post(App $a) $user = User::getById($a->getLoggedInUserId()); if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] == 'connectors')) { - BaseModule::checkFormSecurityTokenRedirectOnError('/settings/connectors', 'settings_connectors'); + BaseModule::checkFormSecurityTokenRedirectOnError(DI::args()->getQueryString(), 'settings_connectors'); if (!empty($_POST['general-submit'])) { DI::pConfig()->set(local_user(), 'system', 'accept_only_sharer', intval($_POST['accept_only_sharer'])); @@ -81,7 +81,7 @@ function settings_post(App $a) DI::pConfig()->set(local_user(), 'system', 'simple_shortening', intval($_POST['simple_shortening'])); DI::pConfig()->set(local_user(), 'system', 'attach_link_title', intval($_POST['attach_link_title'])); DI::pConfig()->set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']); - } elseif (!empty($_POST['imap-submit'])) { + } elseif (!empty($_POST['mail-submit'])) { $mail_server = $_POST['mail_server'] ?? ''; $mail_port = $_POST['mail_port'] ?? ''; $mail_ssl = strtolower(trim($_POST['mail_ssl'] ?? '')); @@ -133,6 +133,7 @@ function settings_post(App $a) } Hook::callAll('connector_settings_post', $_POST); + DI::baseUrl()->redirect(DI::args()->getQueryString()); return; } @@ -507,8 +508,22 @@ function settings_content(App $a) DI::page()['htmlhead'] = ''; } - $settings_connectors = ''; - Hook::callAll('connector_settings', $settings_connectors); + $connector_settings_forms = []; + foreach (DI::dba()->selectToArray('hook', ['file', 'function'], ['hook' => 'connector_settings']) as $hook) { + $data = []; + Hook::callSingle(DI::app(), 'connector_settings', [$hook['file'], $hook['function']], $data); + + $tpl = Renderer::getMarkupTemplate('settings/addon/connector.tpl'); + $connector_settings_forms[$data['connector']] = Renderer::replaceMacros($tpl, [ + '$connector' => $data['connector'], + '$title' => $data['title'], + '$image' => $data['image'] ?? '', + '$enabled' => $data['enabled'] ?? true, + '$open' => (DI::args()->getArgv()[2] ?? '') === $data['connector'], + '$html' => $data['html'] ?? '', + '$submit' => $data['submit'] ?? DI::l10n()->t('Save Settings'), + ]); + } if ($a->isSiteAdmin()) { $diasp_enabled = DI::l10n()->t('Built-in support for %s connectivity is %s', DI::l10n()->t('Diaspora (Socialhome, Hubzilla)'), ((DI::config()->get('system', 'diaspora_enabled')) ? DI::l10n()->t('enabled') : DI::l10n()->t('disabled'))); @@ -565,11 +580,11 @@ function settings_content(App $a) '$repair_ostatus_url' => DI::baseUrl() . '/repair_ostatus', '$repair_ostatus_text' => DI::l10n()->t('Repair OStatus subscriptions'), - '$settings_connectors' => $settings_connectors, + '$connector_settings_forms' => $connector_settings_forms, - '$h_imap' => DI::l10n()->t('Email/Mailbox Setup'), - '$imap_desc' => DI::l10n()->t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."), - '$imap_lastcheck' => ['imap_lastcheck', DI::l10n()->t('Last successful email check:'), $mail_chk, ''], + '$h_mail' => DI::l10n()->t('Email/Mailbox Setup'), + '$mail_desc' => DI::l10n()->t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."), + '$mail_lastcheck' => ['mail_lastcheck', DI::l10n()->t('Last successful email check:'), $mail_chk, ''], '$mail_disabled' => $mail_disabled_message, '$mail_server' => ['mail_server', DI::l10n()->t('IMAP server name:'), $mail_server, ''], '$mail_port' => ['mail_port', DI::l10n()->t('IMAP port:'), $mail_port, ''], diff --git a/view/templates/settings/addon/connector.tpl b/view/templates/settings/addon/connector.tpl new file mode 100644 index 0000000000..c06c78195b --- /dev/null +++ b/view/templates/settings/addon/connector.tpl @@ -0,0 +1,34 @@ + +

{{$title}}

+ +
+ +

{{$title}}

+ + {{$html nofilter}} +
+{{if $submit}} +
+ {{if $submit|is_string}} + + {{else}} + {{$count = 1}} + {{foreach $submit as $name => $label}}{{if $label}} + {{if $count == 1}} + + {{/if}} + {{if $count == 2}} +
+ {{/if}} + {{if $count != 1}} + + {{/if}} + {{$count = $count + 1}} + {{/if}}{{/foreach}} + {{if $submit|count > 1}} +
+ {{/if}} + {{/if}} +
+{{/if}} +
diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl index a559aaa82c..0479e99d90 100644 --- a/view/templates/settings/connectors.tpl +++ b/view/templates/settings/connectors.tpl @@ -24,36 +24,43 @@
-
- - {{$settings_connectors nofilter}} - - {{if $mail_disabled}} - - {{else}} - -

{{$h_imap}}

- - - {{/if}} +
+ +{{if !$mail_disabled}} +
+ + +

{{$h_mail}}

+ + +
+{{/if}} + +{{foreach $connector_settings_forms as $addon => $connector_settings_form}} +
+ + {{$connector_settings_form nofilter}} +
+
+{{/foreach}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 3891f6d24e..f96239c307 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -2974,14 +2974,12 @@ details.profile-jot-net[open] summary:before { .fakelink > h3:before { padding-right: 10px; } -.widget.fakelink > h3:before, -.settings-block.fakelink > h3:before { +.widget.fakelink > h3:before { font-family: ForkAwesome; content: "\f0da"; /* Right Plain Pointer */ } .widget > .fakelink > h3:before, -#sidebar-group-header > .fakelink > h3:before, -.settings-block > .fakelink > h3:before { +#sidebar-group-header > .fakelink > h3:before { font-family: ForkAwesome; content: "\f0d7"; /* Bottom Plain Pointer */ } diff --git a/view/theme/frio/templates/settings/addon/connector.tpl b/view/theme/frio/templates/settings/addon/connector.tpl new file mode 100644 index 0000000000..aee0e28454 --- /dev/null +++ b/view/theme/frio/templates/settings/addon/connector.tpl @@ -0,0 +1,36 @@ + +
+
+ {{$html nofilter}} +
+
+{{if $submit}} + {{if $submit|is_string}} + + {{else}} + {{$count = 1}} + {{foreach $submit as $name => $label}}{{if $label}} + {{if $count == 1}} + + {{/if}} + {{if $count == 2}} +
+ {{/if}} + {{if $count != 1}} + + {{/if}} + {{$count = $count + 1}} + {{/if}}{{/foreach}} + {{if $submit|count > 1}} +
+ {{/if}} + {{/if}} +{{/if}} +
+
diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl index 1138a9d553..069b9d3d1c 100644 --- a/view/theme/frio/templates/settings/connectors.tpl +++ b/view/theme/frio/templates/settings/connectors.tpl @@ -1,72 +1,83 @@
-

{{$title}}

+ {{include file="section_title.tpl" title=$title}}

{{$diasp_enabled}}

{{$ostat_enabled}}

-
- +
-
-
- From 956f49e85ef3553394795346fd794f3d54d6c291 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Nov 2021 19:12:52 -0500 Subject: [PATCH 4/6] Update translation file after strings were moved --- view/lang/C/messages.po | 383 ++++++++++++++++++++-------------------- 1 file changed, 192 insertions(+), 191 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 6c819232af..cf4ccd1630 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2021.12-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-28 12:50+0100\n" +"POT-Creation-Date: 2021-11-29 06:06-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,21 +18,21 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/api.php:720 src/Module/BaseApi.php:279 +#: include/api.php:720 src/Module/BaseApi.php:281 #, php-format msgid "Daily posting limit of %d post reached. The post was rejected." msgid_plural "Daily posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: include/api.php:734 src/Module/BaseApi.php:295 +#: include/api.php:734 src/Module/BaseApi.php:297 #, php-format msgid "Weekly posting limit of %d post reached. The post was rejected." msgid_plural "Weekly posting limit of %d posts reached. The post was rejected." msgstr[0] "" msgstr[1] "" -#: include/api.php:748 src/Module/BaseApi.php:311 +#: include/api.php:748 src/Module/BaseApi.php:313 #, php-format msgid "Monthly posting limit of %d post reached. The post was rejected." msgstr "" @@ -140,14 +140,14 @@ msgstr "" #: mod/item.php:185 mod/item.php:190 mod/item.php:937 mod/message.php:69 #: mod/message.php:111 mod/notes.php:44 mod/ostatus_subscribe.php:32 #: mod/photos.php:160 mod/photos.php:897 mod/repair_ostatus.php:31 -#: mod/settings.php:46 mod/settings.php:56 mod/settings.php:410 +#: mod/settings.php:46 mod/settings.php:56 mod/settings.php:412 #: mod/suggest.php:34 mod/uimport.php:33 mod/unfollow.php:35 #: mod/unfollow.php:50 mod/unfollow.php:82 mod/wall_attach.php:68 #: mod/wall_attach.php:71 mod/wall_upload.php:90 mod/wall_upload.php:93 #: mod/wallmessage.php:36 mod/wallmessage.php:55 mod/wallmessage.php:89 -#: mod/wallmessage.php:109 src/Module/Attach.php:55 src/Module/BaseApi.php:77 -#: src/Module/BaseApi.php:86 src/Module/BaseApi.php:95 -#: src/Module/BaseApi.php:104 src/Module/BaseNotifications.php:97 +#: mod/wallmessage.php:109 src/Module/Attach.php:55 src/Module/BaseApi.php:79 +#: src/Module/BaseApi.php:88 src/Module/BaseApi.php:97 +#: src/Module/BaseApi.php:106 src/Module/BaseNotifications.php:97 #: src/Module/Contact/Advanced.php:60 src/Module/Delegation.php:118 #: src/Module/FollowConfirm.php:18 src/Module/FriendSuggest.php:56 #: src/Module/Group.php:42 src/Module/Group.php:85 src/Module/Invite.php:41 @@ -1099,7 +1099,7 @@ msgstr "" msgid "Select" msgstr "" -#: mod/photos.php:1431 mod/settings.php:564 src/Content/Conversation.php:616 +#: mod/photos.php:1431 mod/settings.php:596 src/Content/Conversation.php:616 #: src/Module/Admin/Users/Active.php:139 src/Module/Admin/Users/Blocked.php:140 #: src/Module/Admin/Users/Index.php:153 msgid "Delete" @@ -1203,75 +1203,75 @@ msgid_plural "Errors" msgstr[0] "" msgstr[1] "" -#: mod/settings.php:127 +#: mod/settings.php:128 msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/settings.php:156 +#: mod/settings.php:158 msgid "Contact CSV file upload error" msgstr "" -#: mod/settings.php:175 +#: mod/settings.php:177 msgid "Importing Contacts done" msgstr "" -#: mod/settings.php:188 +#: mod/settings.php:190 msgid "Relocate message has been send to your contacts" msgstr "" -#: mod/settings.php:200 +#: mod/settings.php:202 msgid "Passwords do not match." msgstr "" -#: mod/settings.php:208 src/Console/User.php:210 +#: mod/settings.php:210 src/Console/User.php:210 msgid "Password update failed. Please try again." msgstr "" -#: mod/settings.php:211 src/Console/User.php:213 +#: mod/settings.php:213 src/Console/User.php:213 msgid "Password changed." msgstr "" -#: mod/settings.php:214 +#: mod/settings.php:216 msgid "Password unchanged." msgstr "" -#: mod/settings.php:302 +#: mod/settings.php:304 msgid "Please use a shorter name." msgstr "" -#: mod/settings.php:305 +#: mod/settings.php:307 msgid "Name too short." msgstr "" -#: mod/settings.php:314 +#: mod/settings.php:316 msgid "Wrong Password." msgstr "" -#: mod/settings.php:319 +#: mod/settings.php:321 msgid "Invalid email." msgstr "" -#: mod/settings.php:325 +#: mod/settings.php:327 msgid "Cannot change to that email." msgstr "" -#: mod/settings.php:366 +#: mod/settings.php:368 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:369 +#: mod/settings.php:371 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:388 +#: mod/settings.php:390 msgid "Settings were not updated." msgstr "" -#: mod/settings.php:429 +#: mod/settings.php:431 msgid "Connected Apps" msgstr "" -#: mod/settings.php:430 src/Module/Admin/Blocklist/Contact.php:106 +#: mod/settings.php:432 src/Module/Admin/Blocklist/Contact.php:106 #: src/Module/Admin/Users/Active.php:129 src/Module/Admin/Users/Blocked.php:130 #: src/Module/Admin/Users/Create.php:71 src/Module/Admin/Users/Deleted.php:88 #: src/Module/Admin/Users/Index.php:142 src/Module/Admin/Users/Index.php:162 @@ -1279,31 +1279,20 @@ msgstr "" msgid "Name" msgstr "" -#: mod/settings.php:431 src/Content/Nav.php:212 +#: mod/settings.php:433 src/Content/Nav.php:212 msgid "Home Page" msgstr "" -#: mod/settings.php:432 src/Module/Admin/Queue.php:78 +#: mod/settings.php:434 src/Module/Admin/Queue.php:78 msgid "Created" msgstr "" -#: mod/settings.php:433 +#: mod/settings.php:435 msgid "Remove authorization" msgstr "" -#: mod/settings.php:451 -msgid "Addon Settings" -msgstr "" - -#: mod/settings.php:452 -msgid "No Addon settings configured" -msgstr "" - -#: mod/settings.php:473 -msgid "Additional Features" -msgstr "" - -#: mod/settings.php:475 mod/settings.php:566 mod/settings.php:703 +#: mod/settings.php:461 mod/settings.php:493 mod/settings.php:524 +#: mod/settings.php:598 mod/settings.php:735 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87 #: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:501 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:83 @@ -1311,48 +1300,60 @@ msgstr "" msgid "Save Settings" msgstr "" -#: mod/settings.php:497 +#: mod/settings.php:469 +msgid "Addon Settings" +msgstr "" + +#: mod/settings.php:470 +msgid "No Addon settings configured" +msgstr "" + +#: mod/settings.php:491 +msgid "Additional Features" +msgstr "" + +#: mod/settings.php:529 msgid "Diaspora (Socialhome, Hubzilla)" msgstr "" -#: mod/settings.php:497 mod/settings.php:498 +#: mod/settings.php:529 mod/settings.php:530 msgid "enabled" msgstr "" -#: mod/settings.php:497 mod/settings.php:498 +#: mod/settings.php:529 mod/settings.php:530 msgid "disabled" msgstr "" -#: mod/settings.php:497 mod/settings.php:498 +#: mod/settings.php:529 mod/settings.php:530 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:498 +#: mod/settings.php:530 msgid "OStatus (GNU Social)" msgstr "" -#: mod/settings.php:524 +#: mod/settings.php:556 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:529 mod/settings.php:564 +#: mod/settings.php:561 mod/settings.php:596 msgid "None" msgstr "" -#: mod/settings.php:535 src/Module/BaseSettings.php:78 +#: mod/settings.php:567 src/Module/BaseSettings.php:78 msgid "Social Networks" msgstr "" -#: mod/settings.php:540 +#: mod/settings.php:572 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:541 +#: mod/settings.php:573 msgid "Accept only top level posts by contacts you follow" msgstr "" -#: mod/settings.php:541 +#: mod/settings.php:573 msgid "" "The system does an auto completion of threads when a comment arrives. This " "has got the side effect that you can receive posts that had been started by " @@ -1361,11 +1362,11 @@ msgid "" "posts from people you really do follow." msgstr "" -#: mod/settings.php:542 +#: mod/settings.php:574 msgid "Enable Content Warning" msgstr "" -#: mod/settings.php:542 +#: mod/settings.php:574 msgid "" "Users on networks like Mastodon or Pleroma are able to set a content warning " "field which collapse their post by default. This enables the automatic " @@ -1373,222 +1374,222 @@ msgid "" "affect any other content filtering you eventually set up." msgstr "" -#: mod/settings.php:543 +#: mod/settings.php:575 msgid "Enable intelligent shortening" msgstr "" -#: mod/settings.php:543 +#: mod/settings.php:575 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If disabled, every shortened post will always point to the original " "friendica post." msgstr "" -#: mod/settings.php:544 +#: mod/settings.php:576 msgid "Enable simple text shortening" msgstr "" -#: mod/settings.php:544 +#: mod/settings.php:576 msgid "" "Normally the system shortens posts at the next line feed. If this option is " "enabled then the system will shorten the text at the maximum character limit." msgstr "" -#: mod/settings.php:545 +#: mod/settings.php:577 msgid "Attach the link title" msgstr "" -#: mod/settings.php:545 +#: mod/settings.php:577 msgid "" "When activated, the title of the attached link will be added as a title on " "posts to Diaspora. This is mostly helpful with \"remote-self\" contacts that " "share feed content." msgstr "" -#: mod/settings.php:546 +#: mod/settings.php:578 msgid "Your legacy ActivityPub/GNU Social account" msgstr "" -#: mod/settings.php:546 +#: mod/settings.php:578 msgid "" "If you enter your old account name from an ActivityPub based system or your " "GNU Social/Statusnet account name here (in the format user@domain.tld), your " "contacts will be added automatically. The field will be emptied when done." msgstr "" -#: mod/settings.php:549 +#: mod/settings.php:581 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:553 +#: mod/settings.php:585 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:554 +#: mod/settings.php:586 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:555 +#: mod/settings.php:587 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:557 +#: mod/settings.php:589 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:558 +#: mod/settings.php:590 msgid "IMAP port:" msgstr "" -#: mod/settings.php:559 +#: mod/settings.php:591 msgid "Security:" msgstr "" -#: mod/settings.php:560 +#: mod/settings.php:592 msgid "Email login name:" msgstr "" -#: mod/settings.php:561 +#: mod/settings.php:593 msgid "Email password:" msgstr "" -#: mod/settings.php:562 +#: mod/settings.php:594 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:563 +#: mod/settings.php:595 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:564 +#: mod/settings.php:596 msgid "Action after import:" msgstr "" -#: mod/settings.php:564 src/Content/Nav.php:280 +#: mod/settings.php:596 src/Content/Nav.php:280 msgid "Mark as seen" msgstr "" -#: mod/settings.php:564 +#: mod/settings.php:596 msgid "Move to folder" msgstr "" -#: mod/settings.php:565 +#: mod/settings.php:597 msgid "Move to folder:" msgstr "" -#: mod/settings.php:579 +#: mod/settings.php:611 msgid "Unable to find your profile. Please contact your admin." msgstr "" -#: mod/settings.php:617 src/Content/Widget.php:526 +#: mod/settings.php:649 src/Content/Widget.php:526 msgid "Account Types" msgstr "" -#: mod/settings.php:618 +#: mod/settings.php:650 msgid "Personal Page Subtypes" msgstr "" -#: mod/settings.php:619 +#: mod/settings.php:651 msgid "Community Forum Subtypes" msgstr "" -#: mod/settings.php:626 src/Module/Admin/BaseUsers.php:106 +#: mod/settings.php:658 src/Module/Admin/BaseUsers.php:106 msgid "Personal Page" msgstr "" -#: mod/settings.php:627 +#: mod/settings.php:659 msgid "Account for a personal profile." msgstr "" -#: mod/settings.php:630 src/Module/Admin/BaseUsers.php:107 +#: mod/settings.php:662 src/Module/Admin/BaseUsers.php:107 msgid "Organisation Page" msgstr "" -#: mod/settings.php:631 +#: mod/settings.php:663 msgid "" "Account for an organisation that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:634 src/Module/Admin/BaseUsers.php:108 +#: mod/settings.php:666 src/Module/Admin/BaseUsers.php:108 msgid "News Page" msgstr "" -#: mod/settings.php:635 +#: mod/settings.php:667 msgid "" "Account for a news reflector that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:638 src/Module/Admin/BaseUsers.php:109 +#: mod/settings.php:670 src/Module/Admin/BaseUsers.php:109 msgid "Community Forum" msgstr "" -#: mod/settings.php:639 +#: mod/settings.php:671 msgid "Account for community discussions." msgstr "" -#: mod/settings.php:642 src/Module/Admin/BaseUsers.php:99 +#: mod/settings.php:674 src/Module/Admin/BaseUsers.php:99 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:643 +#: mod/settings.php:675 msgid "" "Account for a regular personal profile that requires manual approval of " "\"Friends\" and \"Followers\"." msgstr "" -#: mod/settings.php:646 src/Module/Admin/BaseUsers.php:100 +#: mod/settings.php:678 src/Module/Admin/BaseUsers.php:100 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:647 +#: mod/settings.php:679 msgid "" "Account for a public profile that automatically approves contact requests as " "\"Followers\"." msgstr "" -#: mod/settings.php:650 src/Module/Admin/BaseUsers.php:101 +#: mod/settings.php:682 src/Module/Admin/BaseUsers.php:101 msgid "Public Forum" msgstr "" -#: mod/settings.php:651 +#: mod/settings.php:683 msgid "Automatically approves all contact requests." msgstr "" -#: mod/settings.php:654 src/Module/Admin/BaseUsers.php:102 +#: mod/settings.php:686 src/Module/Admin/BaseUsers.php:102 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:655 +#: mod/settings.php:687 msgid "" "Account for a popular profile that automatically approves contact requests " "as \"Friends\"." msgstr "" -#: mod/settings.php:658 +#: mod/settings.php:690 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:659 +#: mod/settings.php:691 msgid "Requires manual approval of contact requests." msgstr "" -#: mod/settings.php:670 +#: mod/settings.php:702 msgid "OpenID:" msgstr "" -#: mod/settings.php:670 +#: mod/settings.php:702 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:678 +#: mod/settings.php:710 msgid "Publish your profile in your local site directory?" msgstr "" -#: mod/settings.php:678 +#: mod/settings.php:710 #, php-format msgid "" "Your profile will be published in this node's local " @@ -1596,115 +1597,115 @@ msgid "" "system settings." msgstr "" -#: mod/settings.php:684 +#: mod/settings.php:716 #, php-format msgid "" "Your profile will also be published in the global friendica directories (e." "g. %s)." msgstr "" -#: mod/settings.php:690 +#: mod/settings.php:722 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: mod/settings.php:701 +#: mod/settings.php:733 msgid "Account Settings" msgstr "" -#: mod/settings.php:709 +#: mod/settings.php:741 msgid "Password Settings" msgstr "" -#: mod/settings.php:710 src/Module/Register.php:162 +#: mod/settings.php:742 src/Module/Register.php:162 msgid "New Password:" msgstr "" -#: mod/settings.php:710 +#: mod/settings.php:742 msgid "" "Allowed characters are a-z, A-Z, 0-9 and special characters except white " "spaces, accentuated letters and colon (:)." msgstr "" -#: mod/settings.php:711 src/Module/Register.php:163 +#: mod/settings.php:743 src/Module/Register.php:163 msgid "Confirm:" msgstr "" -#: mod/settings.php:711 +#: mod/settings.php:743 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:712 +#: mod/settings.php:744 msgid "Current Password:" msgstr "" -#: mod/settings.php:712 +#: mod/settings.php:744 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:713 +#: mod/settings.php:745 msgid "Password:" msgstr "" -#: mod/settings.php:713 +#: mod/settings.php:745 msgid "Your current password to confirm the changes of the email address" msgstr "" -#: mod/settings.php:716 +#: mod/settings.php:748 msgid "Delete OpenID URL" msgstr "" -#: mod/settings.php:718 +#: mod/settings.php:750 msgid "Basic Settings" msgstr "" -#: mod/settings.php:719 src/Module/Profile/Profile.php:144 +#: mod/settings.php:751 src/Module/Profile/Profile.php:144 msgid "Full Name:" msgstr "" -#: mod/settings.php:720 +#: mod/settings.php:752 msgid "Email Address:" msgstr "" -#: mod/settings.php:721 +#: mod/settings.php:753 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:754 msgid "Your Language:" msgstr "" -#: mod/settings.php:722 +#: mod/settings.php:754 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: mod/settings.php:723 +#: mod/settings.php:755 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:724 +#: mod/settings.php:756 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:726 +#: mod/settings.php:758 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:728 +#: mod/settings.php:760 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:728 mod/settings.php:738 +#: mod/settings.php:760 mod/settings.php:770 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:730 +#: mod/settings.php:762 msgid "Allow your profile to be searchable globally?" msgstr "" -#: mod/settings.php:730 +#: mod/settings.php:762 msgid "" "Activate this setting if you want others to easily find and follow you. Your " "profile will be searchable on remote systems. This setting also determines " @@ -1712,43 +1713,43 @@ msgid "" "indexed or not." msgstr "" -#: mod/settings.php:731 +#: mod/settings.php:763 msgid "Hide your contact/friend list from viewers of your profile?" msgstr "" -#: mod/settings.php:731 +#: mod/settings.php:763 msgid "" "A list of your contacts is displayed on your profile page. Activate this " "option to disable the display of your contact list." msgstr "" -#: mod/settings.php:732 +#: mod/settings.php:764 msgid "Hide your profile details from anonymous viewers?" msgstr "" -#: mod/settings.php:732 +#: mod/settings.php:764 msgid "" "Anonymous visitors will only see your profile picture, your display name and " "the nickname you are using on your profile page. Your public posts and " "replies will still be accessible by other means." msgstr "" -#: mod/settings.php:733 +#: mod/settings.php:765 msgid "Make public posts unlisted" msgstr "" -#: mod/settings.php:733 +#: mod/settings.php:765 msgid "" "Your public posts will not appear on the community pages or in search " "results, nor be sent to relay servers. However they can still appear on " "public feeds on remote servers." msgstr "" -#: mod/settings.php:734 +#: mod/settings.php:766 msgid "Make all posted pictures accessible" msgstr "" -#: mod/settings.php:734 +#: mod/settings.php:766 msgid "" "This option makes every posted picture accessible via the direct link. This " "is a workaround for the problem that most other networks can't handle " @@ -1756,221 +1757,221 @@ msgid "" "public on your photo albums though." msgstr "" -#: mod/settings.php:735 +#: mod/settings.php:767 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:735 +#: mod/settings.php:767 msgid "" "Your contacts may write posts on your profile wall. These posts will be " "distributed to your contacts" msgstr "" -#: mod/settings.php:736 +#: mod/settings.php:768 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:736 +#: mod/settings.php:768 msgid "Your contacts can add additional tags to your posts." msgstr "" -#: mod/settings.php:737 +#: mod/settings.php:769 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:737 +#: mod/settings.php:769 msgid "" "Friendica network users may send you private messages even if they are not " "in your contact list." msgstr "" -#: mod/settings.php:738 +#: mod/settings.php:770 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:740 +#: mod/settings.php:772 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:744 +#: mod/settings.php:776 msgid "Expiration settings" msgstr "" -#: mod/settings.php:745 +#: mod/settings.php:777 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:745 +#: mod/settings.php:777 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:746 +#: mod/settings.php:778 msgid "Expire posts" msgstr "" -#: mod/settings.php:746 +#: mod/settings.php:778 msgid "When activated, posts and comments will be expired." msgstr "" -#: mod/settings.php:747 +#: mod/settings.php:779 msgid "Expire personal notes" msgstr "" -#: mod/settings.php:747 +#: mod/settings.php:779 msgid "" "When activated, the personal notes on your profile page will be expired." msgstr "" -#: mod/settings.php:748 +#: mod/settings.php:780 msgid "Expire starred posts" msgstr "" -#: mod/settings.php:748 +#: mod/settings.php:780 msgid "" "Starring posts keeps them from being expired. That behaviour is overwritten " "by this setting." msgstr "" -#: mod/settings.php:749 +#: mod/settings.php:781 msgid "Expire photos" msgstr "" -#: mod/settings.php:749 +#: mod/settings.php:781 msgid "When activated, photos will be expired." msgstr "" -#: mod/settings.php:750 +#: mod/settings.php:782 msgid "Only expire posts by others" msgstr "" -#: mod/settings.php:750 +#: mod/settings.php:782 msgid "" "When activated, your own posts never expire. Then the settings above are " "only valid for posts you received." msgstr "" -#: mod/settings.php:753 +#: mod/settings.php:785 msgid "Notification Settings" msgstr "" -#: mod/settings.php:754 +#: mod/settings.php:786 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:755 +#: mod/settings.php:787 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:756 +#: mod/settings.php:788 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:757 +#: mod/settings.php:789 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:758 +#: mod/settings.php:790 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:759 +#: mod/settings.php:791 msgid "You receive a private message" msgstr "" -#: mod/settings.php:760 +#: mod/settings.php:792 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:761 +#: mod/settings.php:793 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:762 +#: mod/settings.php:794 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:764 +#: mod/settings.php:796 msgid "Create a desktop notification when:" msgstr "" -#: mod/settings.php:765 +#: mod/settings.php:797 msgid "Someone liked your content" msgstr "" -#: mod/settings.php:766 +#: mod/settings.php:798 msgid "Someone shared your content" msgstr "" -#: mod/settings.php:768 +#: mod/settings.php:800 msgid "Activate desktop notifications" msgstr "" -#: mod/settings.php:768 +#: mod/settings.php:800 msgid "Show desktop popup on new notifications" msgstr "" -#: mod/settings.php:770 +#: mod/settings.php:802 msgid "Text-only notification emails" msgstr "" -#: mod/settings.php:772 +#: mod/settings.php:804 msgid "Send text only notification emails, without the html part" msgstr "" -#: mod/settings.php:774 +#: mod/settings.php:806 msgid "Show detailled notifications" msgstr "" -#: mod/settings.php:776 +#: mod/settings.php:808 msgid "" "Per default, notifications are condensed to a single notification per item. " "When enabled every notification is displayed." msgstr "" -#: mod/settings.php:778 +#: mod/settings.php:810 msgid "Show notifications of ignored contacts" msgstr "" -#: mod/settings.php:780 +#: mod/settings.php:812 msgid "" "You don't see posts from ignored contacts. But you still see their comments. " "This setting controls if you want to still receive regular notifications " "that are caused by ignored contacts or not." msgstr "" -#: mod/settings.php:782 +#: mod/settings.php:814 msgid "Advanced Account/Page Type Settings" msgstr "" -#: mod/settings.php:783 +#: mod/settings.php:815 msgid "Change the behaviour of this account for special situations" msgstr "" -#: mod/settings.php:786 +#: mod/settings.php:818 msgid "Import Contacts" msgstr "" -#: mod/settings.php:787 +#: mod/settings.php:819 msgid "" "Upload a CSV file that contains the handle of your followed accounts in the " "first column you exported from the old account." msgstr "" -#: mod/settings.php:788 +#: mod/settings.php:820 msgid "Upload File" msgstr "" -#: mod/settings.php:790 +#: mod/settings.php:822 msgid "Relocate" msgstr "" -#: mod/settings.php:791 +#: mod/settings.php:823 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: mod/settings.php:792 +#: mod/settings.php:824 msgid "Resend relocate message to contacts" msgstr "" @@ -6951,8 +6952,8 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: src/Module/BaseApi.php:278 src/Module/BaseApi.php:294 -#: src/Module/BaseApi.php:310 +#: src/Module/BaseApi.php:280 src/Module/BaseApi.php:296 +#: src/Module/BaseApi.php:312 msgid "Too Many Requests" msgstr "" From c2df5d66d79078c7fc222bc718b1b0952027969d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 29 Nov 2021 07:06:41 -0500 Subject: [PATCH 5/6] Use user-specific id to fetch the list of group appartenance in Module\Contact\Profile --- src/Module/Contact/Profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index e58c329f28..fb67eb04c1 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -208,7 +208,7 @@ class Profile extends BaseModule $groups_widget = ''; if (!in_array($localRelationship->rel, [Contact::NOTHING, Contact::SELF])) { - $groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $contact['id']); + $groups_widget = Group::sidebarWidget('contact', 'group', 'full', 'everyone', $data['user']); } $this->page['aside'] .= $vcard_widget . $groups_widget; From 370827654caff59676b600647f7d7d6dce6c3ccc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 29 Nov 2021 23:51:04 -0500 Subject: [PATCH 6/6] Add expected field uri-id to Post query in prepare_photo_data() --- include/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/api.php b/include/api.php index 4f7040ab4b..a35da5c524 100644 --- a/include/api.php +++ b/include/api.php @@ -519,7 +519,7 @@ function prepare_photo_data($type, $scale, $photo_id, $uid) // retrieve item element for getting activities (like, dislike etc.) related to photo $condition = ['uid' => $uid, 'resource-id' => $photo_id]; - $item = Post::selectFirst(['id', 'uid', 'uri', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition); + $item = Post::selectFirst(['id', 'uid', 'uri', 'uri-id', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition); if (!DBA::isResult($item)) { throw new NotFoundException('Photo-related item not found.'); }