From 125186c795a8a979cb4016f54688ceaf89ad8c90 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 25 Jan 2020 15:58:16 -0500
Subject: [PATCH 1/3] Remove profile field tabs/panels

- Address https://github.com/friendica/friendica/issues/8164
---
 view/templates/profile/index.tpl | 149 +++++++++++++------------------
 1 file changed, 64 insertions(+), 85 deletions(-)

diff --git a/view/templates/profile/index.tpl b/view/templates/profile/index.tpl
index 8ad4d5eba..60bf46b99 100644
--- a/view/templates/profile/index.tpl
+++ b/view/templates/profile/index.tpl
@@ -28,97 +28,76 @@
 		<div class="clear"></div>
 	</div>
 {{/if}}
+	<dl id="{{$basic_fields.fullname.id}}" class="row {{$basic_fields.fullname.class|default:'aprofile'}}">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.fullname.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.fullname.value}}</dd>
+	</dl>
 
-    {{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for switching between this modes *}}
-    {{if count($custom_fields)}}
-		<ul id="profile-menu" class="nav nav-tabs" role="tablist">
-			<li role="presentation" class="active">
-				<a href="{{$query_string}}#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
-			</li>
-			<li role="presentation">
-				<a href="{{$query_string}}#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
-			</li>
-		</ul>
-    {{/if}}
+{{if $basic_fields.membersince}}
+	<dl id="aprofile-membersince" class="row {{$basic_fields.membersince.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.membersince.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.membersince.value}}</dd>
+	</dl>
+{{/if}}
 
-	<div class="tab-content">
-		<div role="tabpanel" class="tab-pane active" id="profile-content-standard">
-			<dl id="{{$basic_fields.fullname.id}}" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.fullname.class|default:'aprofile'}}">
-				<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.fullname.label}}</dt>
-				<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.fullname.value}}</dd>
-			</dl>
+{{if $basic_fields.birthday}}
+	<dl id="aprofile-birthday" class="row {{$basic_fields.birthday.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.birthday.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.birthday.value}}</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.membersince}}
-				<dl id="aprofile-membersince" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.membersince.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.membersince.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.membersince.value}}</dd>
-				</dl>
-            {{/if}}
+{{if $basic_fields.age}}
+	<dl id="aprofile-age" class="row {{$basic_fields.age.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.age.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.age.value}}</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.birthday}}
-				<dl id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.birthday.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.birthday.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.birthday.value}}</dd>
-				</dl>
-            {{/if}}
+{{if $basic_fields.location}}
+	<dl id="aprofile-location" class="row {{$basic_fields.location.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.location.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.location.value}}</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.age}}
-				<dl id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.age.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.age.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.age.value}}</dd>
-				</dl>
-            {{/if}}
+{{if $basic_fields.homepage}}
+	<dl id="aprofile-homepage" class="row {{$basic_fields.homepage.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.homepage.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.homepage.value nofilter}}</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.location}}
-				<dl id="aprofile-location" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.location.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.location.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.location.value}}</dd>
-				</dl>
-            {{/if}}
+{{if $basic_fields.xmpp}}
+	<dl id="aprofile-xmpp" class="row {{$basic_fields.xmpp.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.xmpp.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.xmpp.value nofilter}}</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.homepage}}
-				<dl id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.homepage.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.homepage.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.homepage.value nofilter}}</dd>
-				</dl>
-            {{/if}}
+{{if $basic_fields.pub_keywords}}
+	<dl id="aprofile-tags" class="row {{$basic_fields.pub_keywords.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.pub_keywords.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">
+            {{foreach $basic_fields.pub_keywords.value as $tag}}
+				<a href="{{$tag.url}}" class="tag label btn-info sm">{{$tag.label}} <i class="fa fa-bolt" aria-hidden="true"></i></a>
+            {{/foreach}}
+		</dd>
+	</dl>
+{{/if}}
 
-            {{if $basic_fields.xmpp}}
-				<dl id="aprofile-xmpp" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.xmpp.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.xmpp.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$basic_fields.xmpp.value nofilter}}</dd>
-				</dl>
-            {{/if}}
-
-            {{if $basic_fields.pub_keywords}}
-				<dl id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$basic_fields.pub_keywords.class|default:'aprofile'}}">
-					<hr class="profile-separator">
-					<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$basic_fields.pub_keywords.label}}</dt>
-					<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">
-                        {{foreach $basic_fields.pub_keywords.value as $tag}}
-							<a href="{{$tag.url}}" class="tag label btn-info sm">{{$tag.label}} <i class="fa fa-bolt" aria-hidden="true"></i></a>
-                        {{/foreach}}
-					</dd>
-				</dl>
-            {{/if}}
-		</div>
-
-        {{if count($custom_fields)}}
-			<div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
-                {{foreach $custom_fields as $custom_field}}
-					<dl id="{{$custom_field.id}}" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 {{$custom_field.class|default:'aprofile'}}">
-						<hr class="profile-separator">
-						<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$custom_field.label}}</dt>
-						<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$custom_field.value nofilter}}</dd>
-					</dl>
-                {{/foreach}}
-			</div>
-        {{/if}}
-	</div>
+{{foreach $custom_fields as $custom_field}}
+	<dl id="{{$custom_field.id}}" class="row {{$custom_field.class|default:'aprofile'}}">
+		<hr class="profile-separator">
+		<dt class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$custom_field.label}}</dt>
+		<dd class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$custom_field.value nofilter}}</dd>
+	</dl>
+{{/foreach}}
 </div>

From 5c05d28a8eeab55366322e61f26cb5b5eda96b46 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 25 Jan 2020 16:23:09 -0500
Subject: [PATCH 2/3] Increase argument counter after route change in
 Module\Profile\Status

- Address https://github.com/friendica/friendica/pull/8156#issuecomment-578302294
---
 src/Module/Profile/Status.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 1300fdc97..0047f27ed 100644
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -42,8 +42,8 @@ class Status extends BaseModule
 
 		$dtFormat = DI::dtFormat();
 
-		if ($args->getArgc() > 2) {
-			for ($x = 2; $x < $args->getArgc(); $x++) {
+		if ($args->getArgc() > 3) {
+			for ($x = 3; $x < $args->getArgc(); $x++) {
 				if ($dtFormat->isYearMonth($args->get($x))) {
 					if ($datequery) {
 						$datequery2 = Strings::escapeHtml($args->get($x));

From 602a57577dcba3fe3d54594332e4dbd306375f37 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 25 Jan 2020 16:26:55 -0500
Subject: [PATCH 3/3] Remove duplicate call to Profile::getTabs in
 Module\Profile\Index

- Address https://github.com/friendica/friendica/issues/8167
---
 src/Module/Profile/Index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php
index 95a929d4b..521a682dc 100644
--- a/src/Module/Profile/Index.php
+++ b/src/Module/Profile/Index.php
@@ -148,7 +148,6 @@ class Index extends BaseModule
 			$basic_fields += self::buildField('homepage', DI::l10n()->t('Homepage:'), HTML::toLink($a->profile['homepage']));
 		}
 
-		$o .= Profile::getTabs($a, 'profile', $is_owner, $a->profile['nickname']);
 		if (
 			$a->profile['address']
 			|| $a->profile['locality']