keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13196 from anubis2814/develop

Browse source 
[frio] New Group button on group widget
This commit is contained in:
Hypolite Petovan 2023-06-05 09:02:27 -04:00 committed by GitHub
commit 8ec3f17138
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Content/GroupManager.php
View file

@ -151,10 +151,12 @@ class GroupManager
'$title' => DI::l10n()->t('Groups'), '$title' => DI::l10n()->t('Groups'),
'$groups' => $entries, '$groups' => $entries,
'$link_desc' => DI::l10n()->t('External link to group'), '$link_desc' => DI::l10n()->t('External link to group'),
'$new_group_page' => 'register/',
'$total' => $total, '$total' => $total,
'$visible_groups' => $visibleGroups, '$visible_groups' => $visibleGroups,
'$showless' => DI::l10n()->t('show less'), '$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')]
); );
} }

28
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.09-dev\n" "Project-Id-Version: 2023.09-dev\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1605,15 +1605,19 @@ msgstr ""
msgid "External link to group" msgid "External link to group"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:156 src/Content/Widget.php:512 #: src/Content/GroupManager.php:157 src/Content/Widget.php:512
msgid "show less" msgid "show less"
msgstr "" 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 #: src/Content/Widget.php:513
msgid "show more" msgid "show more"
msgstr "" msgstr ""
#: src/Content/GroupManager.php:159
msgid "Create new group"
msgstr ""
#: src/Content/Item.php:327 src/Model/Item.php:2931 #: src/Content/Item.php:327 src/Model/Item.php:2931
msgid "event" msgid "event"
msgstr "" msgstr ""
@ -2017,39 +2021,39 @@ msgstr ""
msgid "last" msgid "last"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:694 src/Content/Text/BBCode.php:1600 #: src/Content/Text/BBCode.php:695 src/Content/Text/BBCode.php:1601
#: src/Content/Text/BBCode.php:1601 #: src/Content/Text/BBCode.php:1602
msgid "Image/photo" msgid "Image/photo"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:912 #: src/Content/Text/BBCode.php:913
#, php-format #, php-format
msgid "" msgid ""
"<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s" "<a href=\"%1$s\" target=\"_blank\" rel=\"noopener noreferrer\">%2$s</a> %3$s"
msgstr "" 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 #: src/Model/Item.php:3655 src/Model/Item.php:3656
msgid "Link to source" msgid "Link to source"
msgstr "" 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" msgid "Click to open/close"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1540 #: src/Content/Text/BBCode.php:1541
msgid "$1 wrote:" msgid "$1 wrote:"
msgstr "" 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" msgid "Encrypted content"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1870 #: src/Content/Text/BBCode.php:1871
msgid "Invalid source protocol" msgid "Invalid source protocol"
msgstr "" msgstr ""
#: src/Content/Text/BBCode.php:1889 #: src/Content/Text/BBCode.php:1890
msgid "Invalid link protocol" msgid "Invalid link protocol"
msgstr "" msgstr ""

10
view/templates/widget/group_list.tpl
View file

@ -16,9 +16,16 @@ function showHideGroupList() {
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
</span> </span>
<div id="group-list-sidebar" class="widget"> <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');"> <span class="fakelink" onclick="openCloseWidget('group-list-sidebar', 'group-list-sidebar-inflated');">
<h3 id="group-list">{{$title}}</h3> <h3>{{$title}}</h3>
</span> </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"> <ul id="group-list-sidebar-ul" role="menu">
{{foreach $groups as $group}} {{foreach $groups as $group}}
{{if $group.id <= $visible_groups}} {{if $group.id <= $visible_groups}}
@ -47,6 +54,7 @@ function showHideGroupList() {
{{/if}} {{/if}}
</ul> </ul>
</div> </div>
</div>
</span> </span>
<script> <script>
initWidget('group-list-sidebar', 'group-list-sidebar-inflated'); initWidget('group-list-sidebar', 'group-list-sidebar-inflated');

17
view/theme/frio/css/style.css
View file

@ -1303,11 +1303,13 @@ aside #follow-sidebar .form-group-search .form-button-search {
padding: 2px 8px; padding: 2px 8px;
} }
div#sidebar-circle-header h3 { div#sidebar-circle-header h3,
div#sidebar-group-header h3 {
float: left; float: left;
} }
div#sidebar-circle-list { div#sidebar-circle-list,
div#sidebar-group-list {
clear: both; clear: both;
} }
@ -1315,11 +1317,13 @@ div#sidebar-circle-list {
clear: both; clear: both;
} }
.circle-edit-tool { .circle-edit-tool,
.group-new-tool {
padding-top: 0; padding-top: 0;
color: $font_color_darker; color: $font_color_darker;
} }
.sidebar-widget-header .circle-edit-tool { .sidebar-widget-header .circle-edit-tool,
.group-new-tool {
margin-top: -5px; margin-top: -5px;
} }
@ -1340,12 +1344,14 @@ aside .widget-action {
padding: 5px 10px; padding: 5px 10px;
} }
aside #circle-sidebar .sidebar-circle-li .circle-edit-tool.faded-icon:hover, 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 #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover,
aside .widget.widget-action.faded-icon:hover { aside .widget.widget-action.faded-icon:hover {
opacity: 0.8; opacity: 0.8;
transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out;
} }
aside #circle-sidebar .sidebar-circle-li .circle-edit-tool.faded-icon:hover, 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 #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover,
aside .widget .widget-action.faded-icon:hover { aside .widget .widget-action.faded-icon:hover {
opacity: 1; opacity: 1;
@ -3063,7 +3069,8 @@ details.profile-jot-net[open] summary:before {
content: "\f0da"; /* Right Plain Pointer */ content: "\f0da"; /* Right Plain Pointer */
} }
.widget > .fakelink > h3:before, .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; font-family: ForkAwesome;
content: "\f0d7"; /* Bottom Plain Pointer */ content: "\f0d7"; /* Bottom Plain Pointer */
} }

3
view/theme/smoothly/style.css
View file

@ -931,7 +931,8 @@ li.widget-list {
} }
#sidebar-new-circle, #sidebar-new-circle,
#sidebar-edit-circles { #sidebar-edit-circles,
#sidebar-new-group {
padding: 7px; padding: 7px;
width: 165px; width: 165px;
margin: auto; margin: auto;

6
view/theme/vier/style.css
View file

@ -435,7 +435,7 @@ pre code {
opacity: 1; opacity: 1;
} }
.sidebar-circle-li:hover, #sidebar-new-circle:hover, #sidebar-edit-circles:hover,#group-widget-collapse: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, #group-list-sidebar li:hover, #group-list-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, .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 { #sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
@ -456,7 +456,7 @@ pre code {
font-weight: bold; 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, #group-list-rsidebar-right, #sidebar-uncircled,
.side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new { .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
padding-left: 10px; padding-left: 10px;
padding-top: 3px; padding-top: 3px;
@ -490,7 +490,7 @@ pre code {
display: inline-block; 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; display: block;
color: #737373; color: #737373;
} }