From ccf9c5d07e52d0cf8e56f4c93130bf6b4760f896 Mon Sep 17 00:00:00 2001 From: Marcus Funch Date: Sat, 3 Jan 2026 20:40:09 +0100 Subject: [PATCH 1/3] If groupdirectory is enabled, add a link to it from the network widget --- src/Content/GroupManager.php | 23 ++++++++++++++--------- view/lang/C/messages.po | 16 ++++++++++------ view/templates/widget/group_list.tpl | 10 ++++++++-- view/theme/frio/css/style.css | 8 ++++---- 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/Content/GroupManager.php b/src/Content/GroupManager.php index 4e364b9053..a4ed19d1dd 100644 --- a/src/Content/GroupManager.php +++ b/src/Content/GroupManager.php @@ -122,18 +122,23 @@ class GroupManager $tpl = Renderer::getMarkupTemplate('widget/group_list.tpl'); + + $addonHelper = DI::addonHelper(); + return Renderer::replaceMacros( $tpl, [ - '$title' => DI::l10n()->t('Groups'), - '$groups' => $entries, - '$link_desc' => DI::l10n()->t('External link to group'), - '$new_group_page' => 'register/', - '$total' => $total, - '$visible_groups' => $visibleGroups, - '$showless' => DI::l10n()->t('show less'), - '$showmore' => DI::l10n()->t('show more'), - '$create_new_group' => DI::l10n()->t('Create new group') + '$title' => DI::l10n()->t('Groups'), + '$groups' => $entries, + '$link_desc' => DI::l10n()->t('External link to group'), + '$new_group_page' => 'register/', + '$total' => $total, + '$visible_groups' => $visibleGroups, + '$showless' => DI::l10n()->t('show less'), + '$showmore' => DI::l10n()->t('show more'), + '$create_new_group' => DI::l10n()->t('Create new group'), + '$addon_group_directory_enabled' => $addonHelper->isAddonEnabled("groupdirectory"), + '$visit_groupdirectory' => DI::l10n()->t('Find groups to join'), ], ); } diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 1a01f18b14..4c9e411c3f 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2025.07-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-01-04 19:01+0100\n" +"POT-Creation-Date: 2026-01-04 20:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1708,7 +1708,7 @@ msgstr "" msgid "Display posts that have been created by accounts of the selected circle." msgstr "" -#: src/Content/Feature.php:128 src/Content/GroupManager.php:128 +#: src/Content/Feature.php:128 src/Content/GroupManager.php:131 #: src/Content/Nav.php:276 src/Content/Text/HTML.php:877 #: src/Content/Widget.php:558 src/Model/User.php:1400 msgid "Groups" @@ -1817,23 +1817,27 @@ msgstr "" msgid "Allows anonymous visitors to consult your calendar and your public events. Contact birthday events are private to you." msgstr "" -#: src/Content/GroupManager.php:130 +#: src/Content/GroupManager.php:133 msgid "External link to group" msgstr "" -#: src/Content/GroupManager.php:134 src/Content/Widget.php:533 +#: src/Content/GroupManager.php:137 src/Content/Widget.php:533 msgid "show less" msgstr "" -#: src/Content/GroupManager.php:135 src/Content/Widget.php:428 +#: src/Content/GroupManager.php:138 src/Content/Widget.php:428 #: src/Content/Widget.php:534 msgid "show more" msgstr "" -#: src/Content/GroupManager.php:136 +#: src/Content/GroupManager.php:139 msgid "Create new group" msgstr "" +#: src/Content/GroupManager.php:141 +msgid "Find groups to join" +msgstr "" + #: src/Content/Item.php:336 src/Model/Item.php:2787 msgid "event" msgstr "" diff --git a/view/templates/widget/group_list.tpl b/view/templates/widget/group_list.tpl index e2b966de2b..5daf3a8b30 100644 --- a/view/templates/widget/group_list.tpl +++ b/view/templates/widget/group_list.tpl @@ -28,10 +28,16 @@ - + {{if $addon_group_directory_enabled}} + + + + {{/if}} > + \ No newline at end of file + From ead5f4f3f0cda094fa62a028324a70ee7a046f0c Mon Sep 17 00:00:00 2001 From: Marcus Funch Date: Sun, 4 Jan 2026 15:10:41 +0100 Subject: [PATCH 3/3] Make sidebar (widget) actions less faded --- view/theme/frio/css/style.css | 25 +++++------------------ view/theme/frio/templates/circle_side.tpl | 8 ++++---- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 2570c77f8c..14f9f6c317 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1397,19 +1397,14 @@ div#sidebar-group-list { clear: both; } -.circle-edit-tool, -.widget-action-top { - padding-top: 0; - color: $font_color_darker; -} -.sidebar-widget-header .circle-edit-tool, .widget-action-top { margin-top: -5px; + padding-top: 0; } .faded-icon { - color: $font_color_darker; - opacity: 0.3; + color: $font_color; + opacity: 0.58; transition: all 0.1s ease-in-out; } .faded-icon:hover { @@ -1423,15 +1418,13 @@ div#sidebar-group-list { aside .widget-action { padding: 5px 10px; } -aside #circle-sidebar .sidebar-circle-li .circle-edit-tool.faded-icon:hover, -aside #group-sidebar .widget-action-top.faded-icon:hover, +aside .widget-action-top.faded-icon:hover, aside #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover, aside .widget.widget-action.faded-icon:hover { opacity: 0.8; transition: all 0.25s ease-in-out; } -aside #circle-sidebar .sidebar-circle-li .circle-edit-tool.faded-icon:hover, -aside #group-sidebar .widget-action-top.faded-icon:hover, +aside .widget-action-top.faded-icon:hover, aside #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover, aside .widget .widget-action.faded-icon:hover { opacity: 1; @@ -1439,12 +1432,6 @@ aside .widget .widget-action.faded-icon:hover { aside #circle-sidebar li .circle-checkbox { margin: 6px 0 0; } -aside #circle-sidebar li .circle-edit-tool { - padding-right: 10px; -} -aside #circle-sidebar li .circle-edit-tool:first-child { - padding-right: 0px; -} /* contact block widget */ .contact-block-content { @@ -1456,8 +1443,6 @@ aside #circle-sidebar li .circle-edit-tool:first-child { float: left; margin: 0px 5px 5px 0px; } -.contact-block-link { -} .contact-block-img { height: 75px; width: 75px; diff --git a/view/theme/frio/templates/circle_side.tpl b/view/theme/frio/templates/circle_side.tpl index 50d335ede5..8e39748cee 100644 --- a/view/theme/frio/templates/circle_side.tpl +++ b/view/theme/frio/templates/circle_side.tpl @@ -16,11 +16,11 @@

{{$title}}

{{if ! $new_circle}} - + {{else}} - @@ -47,7 +47,7 @@ {{/if}} {{if $circle.edit}} {{* if the circle is editable show a little pencil for editing *}} - + {{/if}} @@ -62,4 +62,4 @@ \ No newline at end of file +