Browse Source

first cut at group chooser UI

pull/1/head
Friendika 10 years ago
parent
commit
61915a524d
5 changed files with 66 additions and 4 deletions
  1. +7
    -3
      boot.php
  2. +1
    -1
      include/group.php
  3. +19
    -0
      mod/group.php
  4. +19
    -0
      view/theme/duepuntozero/style.css
  5. +20
    -0
      view/theme/loozah/style.css

+ 7
- 3
boot.php View File

@ -2076,10 +2076,14 @@ function micropro($contact, $redirect = false, $class = '') {
$sparkle = ' sparkle';
}
}
$click = ((x($contact,'click')) ? ' onclick="' . $contact['click'] . '" ' : '');
if($click)
$url = '';
return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle
. '" href="' . $url . '" ><img class="contact-block-img' . $class . $sparkle . '" src="' . $contact['micro']
. '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" /></a></div>' . "\r\n";
. (($click) ? ' fakelink' : '') . '" '
. (($url) ? '" href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
. $contact['micro'] . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
. '" /></a></div>' . "\r\n";
}}


+ 1
- 1
include/group.php View File

@ -108,7 +108,7 @@ function group_get_members($gid) {
if(intval($gid)) {
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
WHERE `gid` = %d AND `group_member`.`uid` = %d",
WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
intval($gid),
intval(local_user())
);


+ 19
- 0
mod/group.php View File

@ -158,10 +158,29 @@ function group_content(&$a) {
}
$o .= '<div id="group-members">';
$o .= '<h3>' . t('In Group') . '</h3>';
foreach($members as $member) {
$member['click'] = 'groupMember(' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpgroup');
}
$o .= '</div><div id="group-members-end"></div>';
$o .= '<hr id="group-separator" />';
$o .= '<div id="group-all-contacts">';
$o .= '<h3>' . t('All Contacts') . '</h3>';
$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)) {
foreach($r as $member) {
$member['click'] = 'groupMember(' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpall');
}
}
$o .= '</div><div id="group-all-contacts-end"></div>';
return $o;

+ 19
- 0
view/theme/duepuntozero/style.css View File

@ -2229,9 +2229,28 @@ a.mail-list-link {
#group-members {
margin-top: 20px;
padding: 10px;
height: 450px;
overflow: auto;
border: 1px solid #ddd;
}
#group-members-end {
clear: both;
}
#group-separator {
margin-top: 10px;
margin-bottom: 10px;
}
#group-all-contacts {
padding: 10px;
height: 450px;
overflow: auto;
border: 1px solid #ddd;
}
#group-all-contacts-end {
clear: both;
}

+ 20
- 0
view/theme/loozah/style.css View File

@ -2253,9 +2253,29 @@ a.mail-list-link {
#group-members {
margin-top: 20px;
padding: 10px;
height: 450px;
overflow: auto;
border: 1px solid #ddd;
}
#group-members-end {
clear: both;
}
#group-separator {
margin-top: 10px;
margin-bottom: 10px;
}
#group-all-contacts {
padding: 10px;
height: 450px;
overflow: auto;
border: 1px solid #ddd;
}
#group-all-contacts-end {
clear: both;
}

Loading…
Cancel
Save