fix the contact photo menu
fix "should open a new tab" attribute fix javascript deletion dialog (fix #1986)
This commit is contained in:
parent
26b1c55368
commit
35302d4274
|
@ -326,15 +326,19 @@ function contact_photo_menu($contact) {
|
||||||
$contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
|
$contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* menu array:
|
||||||
|
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
|
||||||
|
*/
|
||||||
$menu = Array(
|
$menu = Array(
|
||||||
'status' => array(t("View Status"), $status_link),
|
'status' => array(t("View Status"), $status_link, true),
|
||||||
'profile' => array(t("View Profile"), $profile_link),
|
'profile' => array(t("View Profile"), $profile_link, true),
|
||||||
'photos' => array(t("View Photos"), $photos_link),
|
'photos' => array(t("View Photos"), $photos_link,true),
|
||||||
'network' => array(t("Network Posts"), $posts_link),
|
'network' => array(t("Network Posts"), $posts_link,false),
|
||||||
'edit' => array(t("Edit Contact"), $contact_url),
|
'edit' => array(t("Edit Contact"), $contact_url, false),
|
||||||
'drop' => array(t("Drop Contact"), $contact_drop_link),
|
'drop' => array(t("Drop Contact"), $contact_drop_link, false),
|
||||||
'pm' => array(t("Send PM"), $pm_url),
|
'pm' => array(t("Send PM"), $pm_url, false),
|
||||||
'poke' => array(t("Poke"), $poke_link),
|
'poke' => array(t("Poke"), $poke_link, false),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
@ -342,31 +346,11 @@ function contact_photo_menu($contact) {
|
||||||
|
|
||||||
call_hooks('contact_photo_menu', $args);
|
call_hooks('contact_photo_menu', $args);
|
||||||
|
|
||||||
/* $o = "";
|
|
||||||
foreach($menu as $k=>$v){
|
|
||||||
if ($v!="") {
|
|
||||||
if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
|
|
||||||
$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
|
|
||||||
else
|
|
||||||
$o .= "<li><a href=\"$v\">$k</a></li>\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $o;*/
|
|
||||||
|
|
||||||
foreach($menu as $k=>$v){
|
|
||||||
if ($v[1]!="") {
|
|
||||||
if(($v[0] !== t("Network Posts")) && ($v[0] !== t("Send PM")) && ($v[0] !== t('Edit Contact')))
|
|
||||||
$menu[$k][2] = 1;
|
|
||||||
else
|
|
||||||
$menu[$k][2] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$menucondensed = array();
|
$menucondensed = array();
|
||||||
|
|
||||||
foreach ($menu AS $menuitem)
|
foreach ($menu AS $menuname=>$menuitem)
|
||||||
if ($menuitem[1] != "")
|
if ($menuitem[1] != "")
|
||||||
$menucondensed[] = $menuitem;
|
$menucondensed[$menuname] = $menuitem;
|
||||||
|
|
||||||
return $menucondensed;
|
return $menucondensed;
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Reference in a new issue