From: Michael <heluecht@pirati.ca>
Date: Thu, 4 Jan 2018 14:02:04 +0000 (+0000)
Subject: We now have a single menu item again
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f66f631079539bc986dab29d4a01c6c59a19545a;p=friendica.git
We now have a single menu item again
---
diff --git a/include/nav.php b/include/nav.php
index 13999e0e80..9e136276af 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -149,12 +149,8 @@ function nav_info(App $a)
}
}
- if (in_array(Config::get('system', 'community_page_style'), [CP_USERS_ON_SERVER, CP_USERS_AND_GLOBAL])) {
- $nav['community'] = array('community/local', t('Community'), '', t('Conversations on this site'));
- }
-
- if (in_array(Config::get('system', 'community_page_style'), [CP_GLOBAL_COMMUNITY, CP_USERS_AND_GLOBAL])) {
- $nav['global'] = array('community/global', t('Global Timeline'), '', t('Conversations on the network'));
+ if (Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) {
+ $nav['community'] = array('community', t('Community'), '', t('Conversations on this and other servers'));
}
if (local_user()) {
diff --git a/mod/community.php b/mod/community.php
index 138873be57..1451593449 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -57,6 +57,25 @@ function community_content(App $a, $update = 0) {
require_once 'include/conversation.php';
if (!$update) {
+ $tabs = [];
+
+ $tabs[] = array('label'=>t('Community'),
+ 'url' => 'community/local',
+ 'sel' => $content == 'local' ? 'active' : '',
+ 'title' => t('Posts from local users on this server'),
+ 'id' => 'community-local-tab',
+ 'accesskey' => 'l');
+
+ $tabs[] = array('label' => t('Global Timeline'),
+ 'url' => 'community/global',
+ 'sel' => $content == 'global' ? 'active' : '',
+ 'title' => t('Posts from users of the federated network'),
+ 'id' => 'community-global-tab',
+ 'accesskey' => 'g');
+
+ $tab_tpl = get_markup_template('common_tabs.tpl');
+ $o .= replace_macros($tab_tpl, array('$tabs' => $tabs));
+
nav_set_selected('community');
}
@@ -121,7 +140,7 @@ function community_content(App $a, $update = 0) {
$t = get_markup_template("community.tpl");
return replace_macros($t, array(
'$content' => $o,
- '$header' => $content == 'global' ? t("Global Timeline") : t("Community"),
+ '$header' => '',
'$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'),
'$global_community_hint' => t("This community stream shows all public posts received by this node. They may not reflect the opinions of this nodeâs users.")
));
diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
index 35611ca10a..b6513e0fe8 100644
--- a/view/templates/nav.tpl
+++ b/view/templates/nav.tpl
@@ -31,9 +31,6 @@
{{if $nav.community}}
<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
{{/if}}
- {{if $nav.global}}
- <a accesskey="g" id="nav-global-link" class="nav-commlink {{$nav.global.2}} {{$sel.global}}" href="{{$nav.global.0}}" title="{{$nav.global.3}}" >{{$nav.global.1}}</a>
- {{/if}}
{{if $nav.introductions}}
<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
<span id="intro-update" class="nav-ajax-left"></span>
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index b9c8d36c5d..2fab623530 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -50,10 +50,6 @@
{{if $nav.community}}
<a role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" title="{{$nav.community.3}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
{{/if}}
-
- {{if $nav.global}}
- <a role="menuitem" class="nav-menu {{$sel.global}}" href="{{$nav.global.0}}" data-toggle="tooltip" title="{{$nav.global.3}}"><i class="fa fa-lg fa-globe" aria-hidden="true"></i></a>
- {{/if}}
</li>
<li id="nav-personal" class="nav-segment hidden-xs" role="presentation">
diff --git a/view/theme/frost-mobile/templates/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl
index ee8a639970..48cbfa0ee8 100644
--- a/view/theme/frost-mobile/templates/nav.tpl
+++ b/view/theme/frost-mobile/templates/nav.tpl
@@ -134,12 +134,6 @@
<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
</li>
{{/if}}
-
- {{if $nav.global}}
- <li>
- <a id="nav-global-link" class="{{$nav.global.2}} {{$sel.global}} nav-load-page-link" href="{{$nav.global.0}}" title="{{$nav.global.3}}" >{{$nav.global.1}}</a>
- </li>
- {{/if}}
</ul>
</div>
diff --git a/view/theme/frost/templates/nav.tpl b/view/theme/frost/templates/nav.tpl
index e3edf59e8f..cc9110a27f 100644
--- a/view/theme/frost/templates/nav.tpl
+++ b/view/theme/frost/templates/nav.tpl
@@ -130,12 +130,6 @@
<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
</li>
{{/if}}
-
- {{if $nav.global}}
- <li>
- <a id="nav-global-link" class="{{$nav.global.2}} {{$sel.global}} nav-load-page-link" href="{{$nav.global.0}}" title="{{$nav.global.3}}" >{{$nav.global.1}}</a>
- </li>
- {{/if}}
</ul>
</div>
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index cfc46f1d5a..f0aacd4261 100644
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -20,12 +20,6 @@
</li>
{{/if}}
- {{if $nav.global}}
- <li id="nav-global-link" class="nav-menu {{$sel.global}}">
- <a class="{{$nav.global.2}}" href="{{$nav.global.0}}" title="{{$nav.global.3}}" >{{$nav.global.1}}</a>
- </li>
- {{/if}}
-
{{if $nav.community}}
<li id="nav-community-link" class="nav-menu {{$sel.community}}">
<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 5adcff7e29..281714e3ed 100644
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -39,13 +39,6 @@
</li>
{{/if}}
- {{if $nav.global}}
- <li role="menuitem" id="nav-global-link" class="nav-menu {{$sel.global}}">
- <a accesskey="g" class="{{$nav.global.2}} desktop-view" href="{{$nav.global.0}}" title="{{$nav.global.3}}" >{{$nav.global.1}}</a>
- <a class="{{$nav.global.2}} mobile-view" href="{{$nav.global.0}}" title="{{$nav.global.3}}" ><i class="icon s22 icon-bullseye"></i></a>
- </li>
- {{/if}}
-
<li role="menu" aria-haspopup="true" id="nav-site-linkmenu" class="nav-menu-icon"><a><span class="icon s22 icon-question"><span class="sr-only">{{$nav.help.3}}</span></span></a>
<ul id="nav-site-menu" class="menu-popup">
{{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}