From a7cce4013c5040a6c22e7f960e9549b64115089a Mon Sep 17 00:00:00 2001
From: anubis2814 <57196483+anubis2814@users.noreply.github.com>
Date: Sun, 4 Jun 2023 22:04:32 -0400
Subject: [PATCH 1/5] New group button

---
 src/Content/GroupManager.php         |  4 +++-
 view/templates/widget/group_list.tpl | 10 +++++++++-
 view/theme/frio/css/style.css        | 17 ++++++++++++-----
 view/theme/smoothly/style.css        |  3 ++-
 view/theme/vier/style.css            |  8 ++++----
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/Content/GroupManager.php b/src/Content/GroupManager.php
index 9377ea32e..36765359b 100644
--- a/src/Content/GroupManager.php
+++ b/src/Content/GroupManager.php
@@ -151,10 +151,12 @@ class GroupManager
 					'$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')]
+					'$showmore'	=> DI::l10n()->t('show more'),
+					'$create_new_group' => DI::l10n()->t('Create new group')]
 			);
 		}
 
diff --git a/view/templates/widget/group_list.tpl b/view/templates/widget/group_list.tpl
index fd71a8e9d..562900803 100644
--- a/view/templates/widget/group_list.tpl
+++ b/view/templates/widget/group_list.tpl
@@ -16,9 +16,16 @@ function showHideGroupList() {
 	<h3>{{$title}}</h3>
 </span>
 <div id="group-list-sidebar" class="widget">
+<div id="sidebar-group-header" class="sidebar-widget-header">
 	<span class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');">
-		<h3 id="group-list">{{$title}}</h3>
+		<h3>{{$title}}</h3>
 	</span>
+	<a class="group-new-tool pull-right widget-action faded-icon" id="sidebar-new-group" href="{{$New_group_page}}" data-toggle="tooltip" title="{{$create_new_group}}">
+			<i class="fa fa-plus" aria-hidden="true"></i>
+		</a>
+	</div>
+	<div id="sidebar-group-list" class="sidebar-widget-list">
+		{{* The list of available groups *}}	
 	<ul id="group-list-sidebar-ul" role="menu">
 		{{foreach $groups as $group}}
 		{{if $group.id <= $visible_groups}}
@@ -47,6 +54,7 @@ function showHideGroupList() {
 		{{/if}}
 	</ul>
 </div>
+</div>
 </span>
 <script>
 initWidget('group-list-sidebar', 'group-list-sidebar-inflated');
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f9e0e5ee7..aacebdbe4 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1303,11 +1303,13 @@ aside #follow-sidebar .form-group-search .form-button-search {
 	padding: 2px 8px;
 }
 
-div#sidebar-circle-header h3 {
+div#sidebar-circle-header h3, 
+div#sidebar-group-header h3 {
 	float: left;
 }
 
-div#sidebar-circle-list {
+div#sidebar-circle-list,
+div#sidebar-group-list {
 	clear: both;
 }
 
@@ -1315,11 +1317,13 @@ div#sidebar-circle-list {
 	clear: both;
 }
 
-.circle-edit-tool {
+.circle-edit-tool,
+.group-new-tool {
 	padding-top: 0;
 	color: $font_color_darker;
 }
-.sidebar-widget-header .circle-edit-tool {
+.sidebar-widget-header .circle-edit-tool,
+.group-new-tool {
 	margin-top: -5px;
 }
 
@@ -1340,12 +1344,14 @@ aside .widget-action {
 	padding: 5px 10px;
 }
 aside #circle-sidebar .sidebar-circle-li .circle-edit-tool.faded-icon:hover,
+aside #group-sidebar .group-new-tool.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 .group-new-tool.faded-icon:hover,
 aside #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover,
 aside .widget .widget-action.faded-icon:hover {
 	opacity: 1;
@@ -3063,7 +3069,8 @@ details.profile-jot-net[open] summary:before {
 	content: "\f0da"; /* Right Plain Pointer */
 }
 .widget > .fakelink > h3:before,
-#sidebar-circle-header > .fakelink > h3:before {
+#sidebar-circle-header > .fakelink > h3:before, 
+#sidebar-group-header > .fakelink > h3:before {
 	font-family: ForkAwesome;
 	content: "\f0d7"; /* Bottom Plain Pointer */
 }
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 3ede3a8da..3e38030b9 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -931,7 +931,8 @@ li.widget-list {
 }
 
 #sidebar-new-circle,
-#sidebar-edit-circles {
+#sidebar-edit-circles, 
+#sidebar-new-group {
 	padding: 7px;
 	width: 165px;
 	margin: auto;
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index dd310af32..60baa11ab 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -435,8 +435,8 @@ pre code {
 	opacity: 1;
 }
 
-.sidebar-circle-li:hover, #sidebar-new-circle:hover, #sidebar-edit-circles:hover,#group-widget-collapse:hover,
-#sidebar-uncircled:hover, .side-link:hover, .nets-ul li:hover, #group-list-sidebar li:hover, #group-list-sidebar-right li:hover,
+.sidebar-circle-li:hover, #sidebar-new-circle:hover, #sidebar-edit-circles:hover, #sidebar-new-group:hover, #group-widget-collapse:hover,
+#sidebar-uncircled:hover, .side-link:hover, .nets-ul li:hover, #grouplist-sidebar li:hover, #grouplist-sidebar-right li:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover,
 #sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
 	/* background-color: #ddd; */
@@ -456,7 +456,7 @@ pre code {
 	font-weight: bold;
 }
 
-#group-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #group-widget-collapse, #group-list-rsidebar-right, #sidebar-uncircled,
+#group-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #sidebar-new-group, #group-widget-collapse, #grouplist-rsidebar-right, #sidebar-uncircled,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
 	padding-left: 10px;
 	padding-top: 3px;
@@ -490,7 +490,7 @@ pre code {
 	display: inline-block;
 }
 
-a.nets-link, .side-link a, #sidebar-new-circle a, #sidebar-edit-circles a, a.savedsearchterm,a.fileas-link, aside h4 a, right_aside h4 a {
+a.nets-link, .side-link a, #sidebar-new-circle a, #sidebar-edit-circles a, #sidebar-new-group a, a.savedsearchterm,a.fileas-link, aside h4 a, right_aside h4 a {
 	display: block;
 	color: #737373;
 }

From f3ad2c4ad9d5c9bf3e45b24bc0f0c6dbc8a1f004 Mon Sep 17 00:00:00 2001
From: anubis2814 <57196483+anubis2814@users.noreply.github.com>
Date: Sun, 4 Jun 2023 23:32:16 -0400
Subject: [PATCH 2/5] fix group sidebar ID missmatch

---
 view/theme/vier/style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 60baa11ab..ddc5fc663 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -436,7 +436,7 @@ pre code {
 }
 
 .sidebar-circle-li:hover, #sidebar-new-circle:hover, #sidebar-edit-circles:hover, #sidebar-new-group:hover, #group-widget-collapse:hover,
-#sidebar-uncircled:hover, .side-link:hover, .nets-ul li:hover, #grouplist-sidebar li:hover, #grouplist-sidebar-right li:hover,
+#sidebar-uncircled:hover, .side-link:hover, .nets-ul li:hover, #group-list-sidebar li:hover, #group-list-sidebar-right li:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover,
 #sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
 	/* background-color: #ddd; */
@@ -456,7 +456,7 @@ pre code {
 	font-weight: bold;
 }
 
-#group-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #sidebar-new-group, #group-widget-collapse, #grouplist-rsidebar-right, #sidebar-uncircled,
+#group-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #sidebar-new-group, #group-widget-collapse, #group-list-rsidebar-right, #sidebar-uncircled,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
 	padding-left: 10px;
 	padding-top: 3px;

From 60211fdd8d470867326fca178c43b7d6ffb31761 Mon Sep 17 00:00:00 2001
From: anubis2814 <57196483+anubis2814@users.noreply.github.com>
Date: Mon, 5 Jun 2023 02:33:26 -0400
Subject: [PATCH 3/5] Update src/Content/GroupManager.php

Co-authored-by: Philipp <admin+Github@philipp.info>
---
 src/Content/GroupManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Content/GroupManager.php b/src/Content/GroupManager.php
index 36765359b..d7848b41b 100644
--- a/src/Content/GroupManager.php
+++ b/src/Content/GroupManager.php
@@ -151,7 +151,7 @@ class GroupManager
 					'$title'	=> DI::l10n()->t('Groups'),
 					'$groups'	=> $entries,
 					'$link_desc'	=> DI::l10n()->t('External link to group'),
-					'$New_group_page' => 'register/',
+					'$new_group_page' => 'register/',
 					'$total'	=> $total,
 					'$visible_groups' => $visibleGroups,
 					'$showless'	=> DI::l10n()->t('show less'),

From e9b9058e16fb0a698941991171eb5fba280f7de2 Mon Sep 17 00:00:00 2001
From: anubis2814 <57196483+anubis2814@users.noreply.github.com>
Date: Mon, 5 Jun 2023 02:33:31 -0400
Subject: [PATCH 4/5] Update view/templates/widget/group_list.tpl

Co-authored-by: Philipp <admin+Github@philipp.info>
---
 view/templates/widget/group_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/templates/widget/group_list.tpl b/view/templates/widget/group_list.tpl
index 562900803..c939d074a 100644
--- a/view/templates/widget/group_list.tpl
+++ b/view/templates/widget/group_list.tpl
@@ -20,7 +20,7 @@ function showHideGroupList() {
 	<span class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');">
 		<h3>{{$title}}</h3>
 	</span>
-	<a class="group-new-tool pull-right widget-action faded-icon" id="sidebar-new-group" href="{{$New_group_page}}" data-toggle="tooltip" title="{{$create_new_group}}">
+	<a class="group-new-tool pull-right widget-action faded-icon" id="sidebar-new-group" href="{{$new_group_page}}" data-toggle="tooltip" title="{{$create_new_group}}">
 			<i class="fa fa-plus" aria-hidden="true"></i>
 		</a>
 	</div>

From e8a2dd285b01b0ad1baca8691bc69e25e899261a Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 5 Jun 2023 08:59:54 -0400
Subject: [PATCH 5/5] Updated main translation file after adding a string

---
 view/lang/C/messages.po | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index df736290f..3388f43bb 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.09-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-01 19:00-0400\n"
+"POT-Creation-Date: 2023-06-05 08:44-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1605,15 +1605,19 @@ msgstr ""
 msgid "External link to group"
 msgstr ""
 
-#: src/Content/GroupManager.php:156 src/Content/Widget.php:512
+#: src/Content/GroupManager.php:157 src/Content/Widget.php:512
 msgid "show less"
 msgstr ""
 
-#: src/Content/GroupManager.php:157 src/Content/Widget.php:414
+#: src/Content/GroupManager.php:158 src/Content/Widget.php:414
 #: src/Content/Widget.php:513
 msgid "show more"
 msgstr ""
 
+#: src/Content/GroupManager.php:159
+msgid "Create new group"
+msgstr ""
+
 #: src/Content/Item.php:327 src/Model/Item.php:2931
 msgid "event"
 msgstr ""
@@ -2017,39 +2021,39 @@ msgstr ""
 msgid "last"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:694 src/Content/Text/BBCode.php:1600
-#: src/Content/Text/BBCode.php:1601
+#: src/Content/Text/BBCode.php:695 src/Content/Text/BBCode.php:1601
+#: src/Content/Text/BBCode.php:1602
 msgid "Image/photo"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:912
+#: src/Content/Text/BBCode.php:913
 #, php-format
 msgid ""
 "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:937 src/Model/Item.php:3649
+#: src/Content/Text/BBCode.php:938 src/Model/Item.php:3649
 #: src/Model/Item.php:3655 src/Model/Item.php:3656
 msgid "Link to source"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1507 src/Content/Text/HTML.php:901
+#: src/Content/Text/BBCode.php:1508 src/Content/Text/HTML.php:901
 msgid "Click to open/close"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1540
+#: src/Content/Text/BBCode.php:1541
 msgid "$1 wrote:"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1605 src/Content/Text/BBCode.php:1606
+#: src/Content/Text/BBCode.php:1606 src/Content/Text/BBCode.php:1607
 msgid "Encrypted content"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1870
+#: src/Content/Text/BBCode.php:1871
 msgid "Invalid source protocol"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1889
+#: src/Content/Text/BBCode.php:1890
 msgid "Invalid link protocol"
 msgstr ""