add settings sections and add contacts; other tweaks and fixes

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index bdf49898936658ca6752b92080737f6dd1e103c9..8a36fa4cb6ced11b63946b00bd81a4f5e0193eaf 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -28,28 +28,35 @@ function contacts_init(&$a) {
 
        if($contact_id) {
                        $a->data['contact'] = $r[0];
-                       $o .= '<div class="vcard">';
-                       $o .= '<div class="fn">' . $a->data['contact']['name'] . '</div>';
-                       $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->data['contact']['photo'] . '" alt="' . $a->data['contact']['name'] . '" /></div>';
-                       $o .= '</div>';
-                       $a->page['aside'] .= $o;
-
+                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
+                               '$name' => $a->data['contact']['name'],
+                               '$photo' => $a->data['contact']['photo']
+                       ));
+                       $follow_widget = '';
        }       
-       else
-               $a->page['aside'] .= follow_widget();
-
-       $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+       else {
+               $vcard_widget = '';
+               $follow_widget = follow_widget();
+       }
 
-       $a->page['aside'] .= findpeople_widget();
+       $groups_widget .= group_side('contacts','group',false,0,$contact_id);
+       $findpeople_widget .= findpeople_widget();
+       $networks_widget .= networks_widget('contacts',$_GET['nets']);
+       $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
+               '$vcard_widget' => $vcard_widget,
+               '$follow_widget' => $follow_widget,
+               '$groups_widget' => $groups_widget,
+               '$findpeople_widget' => $findpeople_widget,
+               '$networks_widget' => $networks_widget
+       ));
 
-       $a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
        $base = $a->get_baseurl();
-
        $tpl = get_markup_template("contacts-head.tpl");
        $a->page['htmlhead'] .= replace_macros($tpl,array(
                '$baseurl' => $a->get_baseurl(true),
                '$base' => $base
        ));
+
        $tpl = get_markup_template("contacts-end.tpl");
        $a->page['end'] .= replace_macros($tpl,array(
                '$baseurl' => $a->get_baseurl(true),