The contact page now contains more data

This commit is contained in:
Michael Vogel 2015-11-29 17:04:48 +01:00
parent 56e7b2002d
commit 5649e9e193
2 changed files with 31 additions and 6 deletions

View file

@ -549,6 +549,14 @@ function contacts_content(&$a) {
// tabs // tabs
$tabs = array( $tabs = array(
array(
'label'=>t('Network Posts'),
'url' => "network/0?nets=all&cid=".$contact["id"],
'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
'title' => t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
),
array( array(
'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
@ -602,8 +610,17 @@ function contacts_content(&$a) {
($contact['rel'] == CONTACT_IS_FOLLOWER)) ($contact['rel'] == CONTACT_IS_FOLLOWER))
$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]); $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
$header = $contact["name"];
if ($contact["addr"] != "")
$header .= " <".$contact["addr"].">";
$header .= " (".network_to_name($contact['network'], $contact['url']).")";
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$header' => t('Contact Editor'), //'$header' => t('Contact Editor'),
'$header' => htmlentities($header),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'), '$lbl_vis1' => t('Profile Visibility'),
@ -653,6 +670,12 @@ function contacts_content(&$a) {
'$url' => $url, '$url' => $url,
'$profileurllabel' => t('Profile URL'), '$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'], '$profileurl' => $contact['url'],
'$location' => bbcode($contact["location"]),
'$location_label' => t("Location:"),
'$about' => bbcode($contact["about"], false, false),
'$about_label' => t("About:"),
'$keywords' => $contact["keywords"],
'$keywords_label' => t("Tags:")
)); ));

View file

@ -1,5 +1,3 @@
<h2>{{$header}}</h2> <h2>{{$header}}</h2>
<div id="contact-edit-wrapper" > <div id="contact-edit-wrapper" >
@ -19,8 +17,6 @@
{{if $relation_text}} {{if $relation_text}}
<li><div id="contact-edit-rel">{{$relation_text}}</div></li> <li><div id="contact-edit-rel">{{$relation_text}}</div></li>
{{/if}} {{/if}}
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
<li><div id="contact-edit-profileurl">{{$profileurllabel}}: <a href="{{$url}}">{{$profileurl}}</a></div></li>
{{if $lost_contact}} {{if $lost_contact}}
<li><div id="lost-contact-message">{{$lost_contact}}</div></li> <li><div id="lost-contact-message">{{$lost_contact}}</div></li>
{{/if}} {{/if}}
@ -37,6 +33,7 @@
<li><div id="archive-message">{{$archived}}</div></li> <li><div id="archive-message">{{$archived}}</div></li>
{{/if}} {{/if}}
</ul> </ul>
<ul> <ul>
{{if $common_text}} {{if $common_text}}
@ -47,7 +44,7 @@
{{/if}} {{/if}}
<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> <!-- <li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $lblsuggest}} {{if $lblsuggest}}
<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li> <li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
{{/if}} {{/if}}
@ -56,6 +53,11 @@
{{/if}} {{/if}}
</ul> </ul>
<dl><dt>{{$profileurllabel}}</dt><dd><a target="blank" href="{{$url}}">{{$profileurl}}</a></dd></dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}}
</div> </div>
</div> </div>
<div id="contact-edit-nav-end"></div> <div id="contact-edit-nav-end"></div>