Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 27 insertions, 3 deletions

diff --git a/mod/photos.php b/mod/photos.php
index c6ad92abc..7cbb798a8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -542,7 +542,7 @@ function photos_content(&$a) {
 			'$nickname' => $a->data['channel']['channel_address'],
 			'$newalbum_label' => t('Enter a new album name'),
 			'$newalbum_placeholder' => t('or select an existing one (doubleclick)'),
-			'$nosharetext' => t('Do not show a status post for this upload'),
+			'$visible' => array('visible', t('Create a status post for this upload'), 0, '', array(t('No'), t('Yes'))),
 			'$albums' => $albums['albums'],
 			'$selname' => $selname,
 			'$permissions' => t('Permissions'),
@@ -832,6 +832,8 @@ function photos_content(&$a) {
 			dbesc($datum)
 		);
 
+		$map = null;
+
 		if($linked_items) {
 
 			xchan_query($linked_items);
@@ -871,6 +873,10 @@ function photos_content(&$a) {
 					intval(local_channel())
 				);
 			}
+
+			if($link_item['coord']) {
+				$map = generate_map($link_item['coord']);
+			}
 		}
 
 //		logger('mod_photo: link_item' . print_r($link_item,true));
@@ -963,14 +969,22 @@ function photos_content(&$a) {
 			$like = '';
 			$dislike = '';
 
+			$conv_responses = array(
+				'like' => array('title' => t('Likes','title')),'dislike' => array('title' => t('Dislikes','title')),
+				'agree' => array('title' => t('Agree','title')),'disagree' => array('title' => t('Disagree','title')), 'abstain' => array('title' => t('Abstain','title')), 
+				'attendyes' => array('title' => t('Attending','title')), 'attendno' => array('title' => t('Not attending','title')), 'attendmaybe' => array('title' => t('Might attend','title'))
+			);
+
+
+
 
 			if($r) {
 
 				foreach($r as $item) {
-					like_puller($a,$item,$alike,'like');
-					like_puller($a,$item,$dlike,'dislike');
+					builtin_activity_puller($item, $conv_responses);
 				}
 
+
 				$like_count = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid']] : '');
 				$like_list = ((x($alike,$link_item['mid'])) ? $alike[$link_item['mid'] . '-l'] : '');
 				if (count($like_list) > MAX_LIKERS) {
@@ -1073,6 +1087,13 @@ function photos_content(&$a) {
 		$dislike_e = $dislike;
 
 
+		$response_verbs = array('like');
+		if(feature_enabled($owner_uid,'dislike'))
+			$response_verbs[] = 'dislike';
+
+
+		$responses = get_responses($conv_responses,$response_verbs,'',$link_item);
+
 		$photo_tpl = get_markup_template('photo_view.tpl');
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $link_item['id'], //$ph[0]['id'],
@@ -1087,7 +1108,10 @@ function photos_content(&$a) {
 			'$unknown' => t('Unknown'),
 			'$tag_hdr' => t('In This Photo:'),
 			'$tags' => $tags,
+			'responses' => $responses,
 			'$edit' => $edit,	
+			'$map' => $map,
+			'$map_text' => t('Map'),
 			'$likebuttons' => $likebuttons,
 			'$like' => $like_e,
 			'$dislike' => $dislike_e,