tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

Browse source 
Conflicts:
	mod/dfrn_poll.php
This commit is contained in:
Friendika 2011-04-04 01:22:05 -07:00
commit 379af25215
12 changed files with 163 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mod/dfrn_poll.php
View file

@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) {
'sec' => $sec
));
}
$profile = $r[0]['nickname'];
switch($destination_url) {
@ -489,6 +489,10 @@ function dfrn_poll_content(&$a) {
dbesc($session_id)
);
}
<<<<<<< HEAD
=======
>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
goaway($dest);
}

4
mod/message.php
View file

@ -172,7 +172,9 @@ function message_content(&$a) {
'$linkurl' => t('Please enter a link URL:')
));
$select = contact_select('messageto','message-to-select', false, 4, true);
$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
$select = contact_select('messageto','message-to-select', $preselect, 4, true);
$tpl = load_view_file('view/prv_message.tpl');
$o .= replace_macros($tpl,array(
'$header' => t('Send Private Message'),

8
mod/network.php
View file

@ -217,6 +217,7 @@ function network_content(&$a, $update = 0) {
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
}
else {
@ -323,11 +324,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,
@ -551,6 +553,7 @@ function network_content(&$a, $update = 0) {
$indent .= ' shiny';
// Build the HTML
$tmp_item = replace_macros($template,array(
@ -561,6 +564,7 @@ function network_content(&$a, $update = 0) {
'$wall' => t('Wall-to-Wall'),
'$vwall' => t('via Wall-To-Wall:'),
'$profile_url' => $profile_link,
'$item_photo_menu' => item_photo_menu($item),
'$name' => $profile_name,
'$thumb' => $profile_avatar,
'$osparkle' => $osparkle,
@ -604,4 +608,4 @@ function network_content(&$a, $update = 0) {
}
return $o;
}
}

2
mod/profile.php
View file

@ -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,

1
mod/search.php
View file

@ -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,