diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-31 16:52:51 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-03-31 16:52:51 +0200 |
| commit | fe67c346e5ed9f65fe25dd9337b6424c04d09c4a (patch) | |
| tree | 1cf828c135b158fa81233fe0f411e1933efe2d69 /mod | |
| parent | 3f94721d6257b4fe31054682b258223b992c4011 (diff) | |
| download | volse-hubzilla-fe67c346e5ed9f65fe25dd9337b6424c04d09c4a.tar.gz volse-hubzilla-fe67c346e5ed9f65fe25dd9337b6424c04d09c4a.tar.bz2 volse-hubzilla-fe67c346e5ed9f65fe25dd9337b6424c04d09c4a.zip | |
Moved popup logic in boot.php, added 'item_photo_menu' hook
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/network.php | 9 | ||||
| -rw-r--r-- | mod/profile.php | 2 | ||||
| -rw-r--r-- | mod/search.php | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mod/network.php b/mod/network.php index 84efe52ba..13ce81abc 100644 --- a/mod/network.php +++ b/mod/network.php @@ -209,6 +209,7 @@ function network_content(&$a, $update = 0) { intval($a->pager['start']), intval($a->pager['itemspage']) ); + } else { @@ -315,11 +316,12 @@ function network_content(&$a, $update = 0) { $drop = replace_macros($droptpl,array('$id' => $item['id'])); $lock = '<div class="wall-item-lock"></div>'; - + $o .= replace_macros($tpl,array( '$id' => $item['item_id'], '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$sparkle' => $sparkle, '$lock' => $lock, @@ -543,7 +545,6 @@ function network_content(&$a, $update = 0) { $indent .= ' shiny'; - $contact_url = $a->get_baseurl()."/contacts/".$item['cid']; // Build the HTML @@ -555,9 +556,7 @@ function network_content(&$a, $update = 0) { '$wall' => t('Wall-to-Wall'), '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, - '$profile_tab_url' => $profile_link."?tab=profile", //don't work with secure redirects - '$contact_url' => $contact_url, - '$pm_url' => "", + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$thumb' => $profile_avatar, '$osparkle' => $osparkle, diff --git a/mod/profile.php b/mod/profile.php index 17f6a2d45..ab1e8f738 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -454,10 +454,12 @@ function profile_content(&$a, $update = 0) { if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; + $tmp_item = replace_macros($template,array( '$id' => $item['item_id'], '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$thumb' => $profile_avatar, '$sparkle' => $sparkle, diff --git a/mod/search.php b/mod/search.php index db7279fb5..64281dfcf 100644 --- a/mod/search.php +++ b/mod/search.php @@ -115,6 +115,7 @@ function search_content(&$a) { '$id' => $item['item_id'], '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$sparkle' => $sparkle, '$lock' => $lock, |