less html in mod/group.php, template for group members editor, quattro theme for...

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index c896362ca2f83241fa22d88b6e1b78b3463e48d5..f6f8e417330f20eadcc615543451f0bcbc3d5ba6 100755 (executable)
--- a/mod/group.php
+++ b/mod/group.php
@@ -76,14 +76,17 @@ function group_content(&$a) {
        if($switchtotext === false)
                $switchtotext = 400;
 
+       $tpl = get_markup_template('group_edit.tpl');
+       $context = array('$submit' => t('Submit'));
+
        if(($a->argc == 2) && ($a->argv[1] === 'new')) {
-               $tpl = get_markup_template('group_new.tpl');
-               $o .= replace_macros($tpl,array(
-                       '$desc' => t('Create a group of contacts/friends.'),
-                       '$name' => t('Group Name: '),
-                       '$submit' => t('Submit')
-                ));
-               return $o;
+               
+               return replace_macros($tpl, $context + array(
+                       '$title' => t('Create a group of contacts/friends.'),
+                       '$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
+               ));
+
+
        }
 
        if(($a->argc == 3) && ($a->argv[1] === 'drop')) {
@@ -156,66 +159,61 @@ function group_content(&$a) {
 
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-               $tpl = get_markup_template('group_edit.tpl');
-               $o .= replace_macros($tpl, array(
+               
+               $context = $context + array(
+                       '$title' => t('Group Editor'),
+                       '$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
                        '$gid' => $group['id'],
-                       '$name' => $group['name'],
                        '$drop' => $drop_txt,
-                       '$desc' => t('Click on a contact to add or remove.'),
-                       '$title' => t('Group Editor'),
-                       '$gname' => t('Group Name: '),
-                       '$submit' => t('Submit')
-               ));
+               );
 
        }
 
        if(! isset($group))
                return;
 
-       $o .= '<div id="group-update-wrapper">';
-       if($change) 
-               $o = '';
+       $groupeditor = array(
+               'label_members' => t('Members'),
+               'members' => array(),
+               'label_contacts' => t('All Contacts'),
+               'contacts' => arraY(),
+       );
+               
 
-       $o .= '<h3>' . t('Members') . '</h3>';
-       $o .= '<div id="group-members">';
        $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
        foreach($members as $member) {
                if($member['url']) {
                        $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-                       $o .= micropro($member,true,'mpgroup', $textmode);
+                       $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode);
                }
                else
                        group_rmv_member(local_user(),$group['name'],$member['id']);
        }
 
-       $o .= '</div><div id="group-members-end"></div>';
-       $o .= '<hr id="group-separator" />';
-       
-       $o .= '<h3>' . t('All Contacts') . '</h3>';
-       $o .= '<div id="group-all-contacts">';
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
+               intval(local_user())
+       );
 
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
-                       intval(local_user())
-               );
-
-               if(count($r)) {
-                       $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
-                       foreach($r as $member) {
-                               if(! in_array($member['id'],$preselected)) {
-                                       $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
-                                       $o .= micropro($member,true,'mpall', $textmode);
-                               }
+       if(count($r)) {
+               $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
+               foreach($r as $member) {
+                       if(! in_array($member['id'],$preselected)) {
+                               $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . '); return true;';
+                               $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode);
                        }
                }
+       }
 
-               $o .= '</div><div id="group-all-contacts-end"></div>';
+       $context['$groupeditor'] = $groupeditor;
+       $context['$desc'] = t('Click on a contact to add or remove.');
 
        if($change) {
-               echo $o;
+               $tpl = get_markup_template('groupeditor.tpl');
+               echo replace_macros($tpl, $context);
                killme();
        }
-       $o .= '</div>';
-       return $o;
+       
+       return replace_macros($tpl, $context);
 
 }