bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Replace "forum" by "group" in the rest of the code

Browse source
This commit is contained in:
Hypolite Petovan 2023-05-30 09:15:17 -04:00
commit 3385147f25
59 changed files with 378 additions and 424 deletions
Download patch file Download diff file Expand all files Collapse all files

2
view/theme/vier/config.php
View file

@ -88,7 +88,7 @@ function theme_admin(App $a) {
$t = Renderer::getMarkupTemplate("theme_admin_settings.tpl");
$o = Renderer::replaceMacros($t, [
'$helperlist' => ['vier_helperlist', DI::l10n()->t('Comma separated list of helper forums'), $helperlist, '', ''],
'$helperlist' => ['vier_helperlist', DI::l10n()->t('Comma separated list of helper groups'), $helperlist, '', ''],
]);
$show_pages = get_vier_config('show_pages', true, true);

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

@ -421,7 +421,7 @@ pre code {
.tool a {
/* color: #000; */
}
.tool a:hover, .widget a:hover, #nets-sidebar a:hover, #forum-widget-collapse:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
.tool a:hover, .widget a:hover, #nets-sidebar a:hover, #group-widget-collapse:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
/* text-decoration: underline; */
text-decoration: none;
color: black;
@ -435,8 +435,8 @@ pre code {
opacity: 1;
}
.sidebar-circle-li:hover, #sidebar-new-circle:hover, #sidebar-edit-circles:hover,#forum-widget-collapse:hover,
#sidebar-uncircled:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li:hover,
.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,
.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; */
@ -452,11 +452,11 @@ pre code {
/* color: #000; */
}
.widget .selected, .forum-selected {
.widget .selected, .group-selected {
font-weight: bold;
}
#forum-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-uncircled,
#group-widget-showmore, #sidebar-new-circle, #sidebar-edit-circles, #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;
@ -471,22 +471,22 @@ pre code {
display: block;
}
#forumlist-sidebar {
#group-list-sidebar {
padding-top: 3px;
padding-bottom: 3px;
display: block;
}
.forum-widget-entry {
.group-widget-entry {
padding-left: 10px;
padding-right: 5px;
}
#forumlist-sidebar .notify, #forumlist-sidebar-right .notify {
#group-list-sidebar .notify, #group-list-sidebar-right .notify {
display: none;
}
#forumlist-sidebar .notify.show, #forumlist-sidebar-right .notify.show {
#group-list-sidebar .notify.show, #group-list-sidebar-right .notify.show {
display: inline-block;
}
@ -517,11 +517,11 @@ a.sidebar-circle-element {
color: black;
}
#forumlist-sidebar a, #forumlist-sidebar-right a, .tool a, .admin.link a, #sidebar-photos-albums a {
#group-list-sidebar a, #group-list-sidebar-right a, .tool a, .admin.link a, #sidebar-photos-albums a {
color: #737373;
}
#forumlist-sidebar, #forumlist-sidebar-right {
#group-list-sidebar, #group-list-sidebar-right {
margin-top: 2px;
}
@ -941,11 +941,11 @@ nav .acpopup {
color: #000;
padding: 3px 20px;
}
.textcomplete-item a .forum, .forum .acpopup-sub-text {
.textcomplete-item a .group, .group .acpopup-sub-text {
color: #36C;
opacity: 0.8;
}
.textcomplete-item a .forum:hover {
.textcomplete-item a .group:hover {
opacity: 1.0;
}
img.acpopup-img {

2
view/theme/vier/templates/nav.tpl
View file

@ -121,7 +121,7 @@
<option value="fulltext">{{$nav.searchoption.0}}</option>
<option value="tags">{{$nav.searchoption.1}}</option>
<option value="contacts">{{$nav.searchoption.2}}</option>
{{if $nav.searchoption.3}}<option value="forums">{{$nav.searchoption.3}}</option>{{/if}}
{{if $nav.searchoption.3}}<option value="groups">{{$nav.searchoption.3}}</option>{{/if}}
</select>
</form>
</li>

47
view/theme/vier/templates/widget_forumlist_right.tpl
View file

@ -1,47 +0,0 @@
<script>
function showHideForumlist() {
if( $("li[id^='forum-widget-entry-extended-']").is(':visible')) {
$("li[id^='forum-widget-entry-extended-']").hide();
$("li#forum-widget-collapse").html('{{$showmore}}');
}
else {
$("li[id^='forum-widget-entry-extended-']").show();
$("li#forum-widget-collapse").html('{{$showless}}');
}
}
</script>
<div id="forumlist-sidebar-right" class="widget">
<h3 id="forumlist">{{$title}}</h3>
<ul id="forumlist-sidebar-ul" role="menu">
{{foreach $forums as $forum}}
{{if $forum.id <= $visible_forums}}
<li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
<span class="notify badge pull-right"></span>
<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
</a>
<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
</li>
{{/if}}
{{if $forum.id > $visible_forums}}
<li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
<span class="notify badge pull-right"></span>
<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
</a>
<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
</li>
{{/if}}
{{/foreach}}
{{if $total > $visible_forums }}
<li onclick="showHideForumlist(); return false;" id="forum-widget-collapse" class="forum-widget-link fakelink tool">{{$showmore}}</li>
{{/if}}
</ul>
</div>

4
view/theme/vier/theme.php
View file

@ -27,7 +27,7 @@
*/
use Friendica\App;
use Friendica\Content\ForumManager;
use Friendica\Content\GroupManager;
use Friendica\Core\Addon;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
@ -208,7 +208,7 @@ function vier_community_info()
//Community_Pages at right_aside
if ($show_pages && DI::userSession()->getLocalUserId()) {
$aside['$page'] = ForumManager::widget('network/forum', DI::userSession()->getLocalUserId());;
$aside['$page'] = GroupManager::widget('network/group', DI::userSession()->getLocalUserId());;
}
// END Community Page

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

@ -2,9 +2,9 @@ right_aside {
display: block;
}
aside #forumlist-sidebar-frame,
aside #forumlist-sidebar,
#forumlist-sidebar-inflated {
aside #group-list-sidebar-frame,
aside #group-list-sidebar,
#group-list-sidebar-inflated {
display: none;
}