]> git.mxchange.org Git - friendica.git/commitdiff
Threaded comments are starting to work.
authorDomovoy <domovoy@errlock.org>
Fri, 27 Jul 2012 20:08:57 +0000 (22:08 +0200)
committerDomovoy <domovoy@errlock.org>
Fri, 27 Jul 2012 20:08:57 +0000 (22:08 +0200)
For now, only on normal view, and not during update

include/conversation.php
mod/item.php
mod/network.php
view/theme/duepuntozero/style.css
view/threaded_conversation.tpl [new file with mode: 0644]
view/wall_thread.tpl [new file with mode: 0644]

index 4a9142bb202285c6553a2a2dd2e2317ea9c914fd..2794d8ab3b060653289f7155d9460c031e09e419 100644 (file)
@@ -299,6 +299,292 @@ function localize_item(&$item){
 
 }
 
+/**
+ * Recursively prepare a thread for HTML
+ */
+
+function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner) {
+       $result = array();
+
+       $wall_template = 'wall_thread.tpl';
+       $wallwall_template = 'wallwall_thread.tpl';
+       $items_seen = 0;
+       $nb_items = count($items);
+       $lastcollapsed = false;
+       $firstcollapsed = false;
+       
+       foreach($items as $item) {
+               // prevent private email reply to public conversation from leaking.
+               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                       // Don't count it as a visible item
+                       $nb_items--;
+                       continue;
+               }
+               
+               $items_seen++;
+               
+               $alike = array();
+               $dlike = array();
+               $comment = '';
+               $template = $wall_template;
+               $commentww = '';
+               $sparkle = '';
+               $owner_url = $owner_photo = $owner_name = '';
+               $buttons = '';
+               $dropping = false;
+               $star = false;
+               $isstarred = "unstarred";
+               $photo = $item['photo'];
+               $thumb = $item['thumb'];
+               $indent = '';
+               $osparkle = '';
+
+               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+               $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+               $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+                       || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+                       ? t('Private Message')
+                       : false);
+               $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+               $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
+               if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+                       $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+               else
+                       $edpost = false;
+               if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+                       $dropping = true;
+
+               $drop = array(
+                       'dropping' => $dropping,
+                       'select' => t('Select'), 
+                       'delete' => t('Delete'),
+               );
+               
+               $filer = (($profile_owner == local_user()) ? t("save to folder") : false);
+
+               $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+               $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+               if($item['author-link'] && (! $item['author-name']))
+                       $profile_name = $item['author-link'];
+
+               $sp = false;
+               $profile_link = best_link_url($item,$sp);
+               if($profile_link === 'mailbox')
+                       $profile_link = '';
+               if($sp)
+                       $sparkle = ' sparkle';
+               else
+                       $profile_link = zrl($profile_link);                                     
+
+               $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+               if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+                       $profile_avatar = $a->contacts[$normalised]['thumb'];
+               else
+                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
+
+               $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+               call_hooks('render_location',$locate);
+               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+
+               $tags=array();
+               foreach(explode(',',$item['tag']) as $tag){
+                       $tag = trim($tag);
+                       if ($tag!="") $tags[] = bbcode($tag);
+               }
+               
+               like_puller($a,$item,$alike,'like');
+               like_puller($a,$item,$dlike,'dislike');
+
+               $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+               $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+
+               if($toplevelpost) {
+                       if((! $item['self']) && ($mode !== 'profile')) {
+                               if($item['wall']) {
+
+                                       // On the network page, I am the owner. On the display page it will be the profile owner.
+                                       // This will have been stored in $a->page_contact by our calling page.
+                                       // Put this person as the wall owner of the wall-to-wall notice.
+
+                                       $owner_url = zrl($a->page_contact['url']);
+                                       $owner_photo = $a->page_contact['thumb'];
+                                       $owner_name = $a->page_contact['name'];
+                                       $template = $wallwall_template;
+                                       $commentww = 'ww';      
+                               }
+                       }
+                       else if($item['owner-link']) {
+
+                               $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+                               $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+                               $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+                               if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+
+                                       // The author url doesn't match the owner (typically the contact)
+                                       // and also doesn't match the contact alias. 
+                                       // The name match is a hack to catch several weird cases where URLs are 
+                                       // all over the park. It can be tricked, but this prevents you from
+                                       // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+                                       // well that it's the same Bob Smith. 
+
+                                       // But it could be somebody else with the same name. It just isn't highly likely. 
+                                       
+
+                                       $owner_url = $item['owner-link'];
+                                       $owner_photo = $item['owner-avatar'];
+                                       $owner_name = $item['owner-name'];
+                                       $template = $wallwall_template;
+                                       $commentww = 'ww';
+                                       // If it is our contact, use a friendly redirect link
+                                       if((link_compare($item['owner-link'],$item['url'])) 
+                                               && ($item['network'] === NETWORK_DFRN)) {
+                                               $owner_url = $redirect_url;
+                                               $osparkle = ' sparkle';
+                                       }
+                                       else
+                                               $owner_url = zrl($owner_url);
+                               }
+                       }
+                       if($profile_owner == local_user()) {
+                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+                               $star = array(
+                                       'do' => t("add star"),
+                                       'undo' => t("remove star"),
+                                       'toggle' => t("toggle star status"),
+                                       'classdo' => (($item['starred']) ? "hidden" : ""),
+                                       'classundo' => (($item['starred']) ? "" : "hidden"),
+                                       'starred' =>  t('starred'),
+                                       'tagger' => t("add tag"),
+                                       'classtagger' => "",
+                               );
+                       }
+               } else {
+                       $indent = 'comment';
+                       // Collapse comments
+                       if($nb_items > 2) {
+                               if(!$firstcollapsed && ($items_seen <= ($nb_items - 2))) {
+                                       $firstcollapsed = true;
+                               }
+                               else if($items_seen == ($nb_items - 1)) {
+                                       $lastcollapsed = true;
+                               }
+                       }
+               }
+
+               logger('item, page_writeable:'. ($page_writeable ? 'yes' : 'no') .', show comment box: '. ($show_comment_box ? 'yes' : 'no'), LOGGER_DEBUG);
+               if($page_writeable) {
+                       $buttons = array(
+                               'like' => array( t("I like this \x28toggle\x29"), t("like")),
+                               'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+                       );
+                       if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
+
+
+                       if($show_comment_box) {
+                               $qc = $qcomment =  null;
+
+                               if(in_array('qcomment',$a->plugins)) {
+                                       $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+                                       $qcomment = (($qc) ? explode("\n",$qc) : null);
+                               }
+                               
+                               $comment = replace_macros($cmnt_tpl,array(
+                                       '$return_path' => '', 
+                                       '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+                                       '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+                                       '$id' => $item['item_id'],
+                                       '$parent' => $item['item_id'],
+                                       '$qcomment' => $qcomment,
+                                       '$profile_uid' =>  $profile_owner,
+                                       '$mylink' => $a->contact['url'],
+                                       '$mytitle' => t('This is you'),
+                                       '$myphoto' => $a->contact['thumb'],
+                                       '$comment' => t('Comment'),
+                                       '$submit' => t('Submit'),
+                                       '$edbold' => t('Bold'),
+                                       '$editalic' => t('Italic'),
+                                       '$eduline' => t('Underline'),
+                                       '$edquote' => t('Quote'),
+                                       '$edcode' => t('Code'),
+                                       '$edimg' => t('Image'),
+                                       '$edurl' => t('Link'),
+                                       '$edvideo' => t('Video'),
+                                       '$preview' => t('Preview'),
+                                       '$ww' => (($mode === 'network') ? $commentww : '')
+                               ));
+                       }
+               }
+
+               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+                       $indent .= ' shiny';
+
+               localize_item($item);
+
+               $body = prepare_body($item,true);
+
+               $tmp_item = array(
+                       // collapse comments in template. I don't like this much...
+                       'comment_firstcollapsed' => $comment_firstcollapsed,
+                       'comment_lastcollapsed' => $comment_lastcollapsed,
+                       // template to use to render item (wall, walltowall, search)
+                       'template' => $template,
+                       
+                       'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+                       'tags' => $tags,
+                       'body' => template_escape($body),
+                       'text' => strip_tags(template_escape($body)),
+                       'id' => $item['item_id'],
+                       'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                       'to' => t('to'),
+                       'wall' => t('Wall-to-Wall'),
+                       'vwall' => t('via Wall-To-Wall:'),
+                       'profile_url' => $profile_link,
+                       'item_photo_menu' => item_photo_menu($item),
+                       'name' => template_escape($profile_name),
+                       'thumb' => $profile_avatar,
+                       'osparkle' => $osparkle,
+                       'sparkle' => $sparkle,
+                       'title' => template_escape($item['title']),
+                       'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                       'lock' => $lock,
+                       'location' => template_escape($location),
+                       'indent' => $indent,
+                       'owner_url' => $owner_url,
+                       'owner_photo' => $owner_photo,
+                       'owner_name' => template_escape($owner_name),
+                       'plink' => get_plink($item),
+                       'edpost' => $edpost,
+                       'isstarred' => $isstarred,
+                       'star' => $star,
+                       'filer' => $filer,
+                       'drop' => $drop,
+                       'vote' => $buttons,
+                       'like' => $like,
+                       'dislike' => $dislike,
+                       'comment' => $comment,
+                       'previewing' => $previewing,
+                       'wait' => t('Please wait'),
+               );
+
+               $arr = array('item' => $item, 'output' => $tmp_item);
+               call_hooks('display_item', $arr);
+
+               $item_result = $arr['output'];
+
+               $item_result['children'] = array();
+               if(count($item['children'])) {
+                       $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner);
+               }
+               $item_result['private'] = $item['private'];
+               $result[] = $item_result;
+       }
+
+       return $result;
+}
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
@@ -311,7 +597,7 @@ function localize_item(&$item){
  */
 
 if(!function_exists('conversation')) {
-function conversation(&$a, $items, $mode, $update, $preview = false) {
+function conversation(&$a, $items, $mode, $update, $preview = false, $thr_c = false) {
 
 
        require_once('bbcode.php');
@@ -500,364 +786,386 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                {
                        // Normal View
 
+                       // Threaded comments, $thr_c is used for now since we don't know what other parts of friendica uses this function
+                       // Better not rely on the new code for stuff we haven't examined yet
+                       if($thr_c) {
+                               // get all the topmost parents
+                               // this shouldn't be needed, as we should have only them in ou array
+                               // But for now, this array respects the old style, just in case
+
+                               $threads = array();
+                               foreach($items as $item) {
+                                       if($item['id'] == $item['parent']) {
+                                               $threads[] = $item;
+                                       }
+                               }
 
-                       // Figure out how many comments each parent has
-                       // (Comments all have gravity of 6)
-                       // Store the result in the $comments array
-
-                       $comments = array();
-                       foreach($items as $item) {
-                               if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
-                                       if(! x($comments,$item['parent']))
-                                               $comments[$item['parent']] = 1;
-                                       else
-                                               $comments[$item['parent']] += 1;
-                               } elseif(! x($comments,$item['parent'])) 
-                                       $comments[$item['parent']] = 0; // avoid notices later on
-                       }
-
-                       // map all the like/dislike activities for each parent item 
-                       // Store these in the $alike and $dlike arrays
-
-                       foreach($items as $item) {
-                               like_puller($a,$item,$alike,'like');
-                               like_puller($a,$item,$dlike,'dislike');
-                       }
-
-                       $comments_collapsed = false;
-                       $comments_seen = 0;
-                       $comment_lastcollapsed = false;
-                       $comment_firstcollapsed = false;
-                       $blowhard = 0;
-                       $blowhard_count = 0;
+                               $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $previewing);
+                       } else {
 
 
-                       foreach($items as $item) {
+                               // Figure out how many comments each parent has
+                               // (Comments all have gravity of 6)
+                               // Store the result in the $comments array
 
-                               $comment = '';
-                               $template = $tpl;
-                               $commentww = '';
-                               $sparkle = '';
-                               $owner_url = $owner_photo = $owner_name = '';
+                               $comments = array();
+                               foreach($items as $item) {
+                                       if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
+                                               if(! x($comments,$item['parent']))
+                                                       $comments[$item['parent']] = 1;
+                                               else
+                                                       $comments[$item['parent']] += 1;
+                                       } elseif(! x($comments,$item['parent'])) 
+                                               $comments[$item['parent']] = 0; // avoid notices later on
+                               }
 
-                               // We've already parsed out like/dislike for special treatment. We can ignore them now
+                               // map all the like/dislike activities for each parent item 
+                               // Store these in the $alike and $dlike arrays
 
-                               if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-                                       || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-                                       && ($item['id'] != $item['parent']))
-                                       continue;
+                               foreach($items as $item) {
+                                       like_puller($a,$item,$alike,'like');
+                                       like_puller($a,$item,$dlike,'dislike');
+                               }
 
-                               $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+                               $comments_collapsed = false;
+                               $comments_seen = 0;
+                               $comment_lastcollapsed = false;
+                               $comment_firstcollapsed = false;
+                               $blowhard = 0;
+                               $blowhard_count = 0;
 
 
-                               // Take care of author collapsing and comment collapsing
-                               // (author collapsing is currently disabled)
-                               // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-                               // If there are more than two comments, squash all but the last 2.
-                       
-                               if($toplevelpost) {
+                               foreach($items as $item) {
 
-                                       $item_writeable = (($item['writable'] || $item['self']) ? true : false);
+                                       $comment = '';
+                                       $template = $tpl;
+                                       $commentww = '';
+                                       $sparkle = '';
+                                       $owner_url = $owner_photo = $owner_name = '';
 
-                                       $comments_seen = 0;
-                                       $comments_collapsed = false;
-                                       $comment_lastcollapsed  = false;
-                                       $comment_firstcollapsed = false;
-                                       
-                                       $threadsid++;
-                                       $threads[$threadsid]['id'] = $item['item_id'];
-                                       $threads[$threadsid]['private'] = $item['private'];
-                                       $threads[$threadsid]['items'] = array();
+                                       // We've already parsed out like/dislike for special treatment. We can ignore them now
 
-                               }
-                               else {
+                                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
+                                               || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+                                               && ($item['id'] != $item['parent']))
+                                               continue;
 
-                                       // prevent private email reply to public conversation from leaking.
-                                       if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
-                                                       continue;
+                                       $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
 
-                                       $comments_seen ++;
-                                       $comment_lastcollapsed  = false;
-                                       $comment_firstcollapsed = false;
-                               }       
 
-                               $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-                               $show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+                                       // Take care of author collapsing and comment collapsing
+                                       // (author collapsing is currently disabled)
+                                       // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+                                       // If there are more than two comments, squash all but the last 2.
+                               
+                                       if($toplevelpost) {
 
+                                               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-                               if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+                                               $comments_seen = 0;
+                                               $comments_collapsed = false;
+                                               $comment_lastcollapsed  = false;
+                                               $comment_firstcollapsed = false;
+                                               
+                                               $threadsid++;
+                                               $threads[$threadsid]['id'] = $item['item_id'];
+                                               $threads[$threadsid]['private'] = $item['private'];
+                                               $threads[$threadsid]['items'] = array();
 
-                                       if (!$comments_collapsed){
-                                               $threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
-                                               $threads[$threadsid]['hide_text'] = t('show more');
-                                               $comments_collapsed = true;
-                                               $comment_firstcollapsed = true;
                                        }
-                               }
-                               if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+                                       else {
 
-                                       $comment_lastcollapsed = true;
-                               }
+                                               // prevent private email reply to public conversation from leaking.
+                                               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
+                                                               continue;
 
-                               $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+                                               $comments_seen ++;
+                                               $comment_lastcollapsed  = false;
+                                               $comment_firstcollapsed = false;
+                                       }       
 
-                               $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-                                       || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-                                       ? t('Private Message')
-                                       : false);
+                                       $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+                                       // Show comment box on every writable item
+                                       $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 
 
-                               // Top-level wall post not written by the wall owner (wall-to-wall)
-                               // First figure out who owns it. 
+                                       if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 
-                               $osparkle = '';
+                                               if (!$comments_collapsed){
+                                                       $threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
+                                                       $threads[$threadsid]['hide_text'] = t('show more');
+                                                       $comments_collapsed = true;
+                                                       $comment_firstcollapsed = true;
+                                               }
+                                       }
+                                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
 
-                               if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
+                                               $comment_lastcollapsed = true;
+                                       }
 
-                                       if($item['wall']) {
+                                       $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
 
-                                               // On the network page, I am the owner. On the display page it will be the profile owner.
-                                               // This will have been stored in $a->page_contact by our calling page.
-                                               // Put this person as the wall owner of the wall-to-wall notice.
+                                       $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+                                               || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+                                               ? t('Private Message')
+                                               : false);
 
-                                               $owner_url = zrl($a->page_contact['url']);
-                                               $owner_photo = $a->page_contact['thumb'];
-                                               $owner_name = $a->page_contact['name'];
-                                               $template = $wallwall;
-                                               $commentww = 'ww';      
-                                       }
 
-                                       if((! $item['wall']) && $item['owner-link']) {
+                                       // Top-level wall post not written by the wall owner (wall-to-wall)
+                                       // First figure out who owns it. 
 
-                                               $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-                                               $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-                                               $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-                                               if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+                                       $osparkle = '';
 
-                                                       // The author url doesn't match the owner (typically the contact)
-                                                       // and also doesn't match the contact alias. 
-                                                       // The name match is a hack to catch several weird cases where URLs are 
-                                                       // all over the park. It can be tricked, but this prevents you from
-                                                       // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-                                                       // well that it's the same Bob Smith. 
+                                       if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
 
-                                                       // But it could be somebody else with the same name. It just isn't highly likely. 
-                                                       
+                                               if($item['wall']) {
 
-                                                       $owner_url = $item['owner-link'];
-                                                       $owner_photo = $item['owner-avatar'];
-                                                       $owner_name = $item['owner-name'];
+                                                       // On the network page, I am the owner. On the display page it will be the profile owner.
+                                                       // This will have been stored in $a->page_contact by our calling page.
+                                                       // Put this person as the wall owner of the wall-to-wall notice.
+
+                                                       $owner_url = zrl($a->page_contact['url']);
+                                                       $owner_photo = $a->page_contact['thumb'];
+                                                       $owner_name = $a->page_contact['name'];
                                                        $template = $wallwall;
-                                                       $commentww = 'ww';
-                                                       // If it is our contact, use a friendly redirect link
-                                                       if((link_compare($item['owner-link'],$item['url'])) 
-                                                               && ($item['network'] === NETWORK_DFRN)) {
-                                                               $owner_url = $redirect_url;
-                                                               $osparkle = ' sparkle';
+                                                       $commentww = 'ww';      
+                                               }
+
+                                               if((! $item['wall']) && $item['owner-link']) {
+
+                                                       $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+                                                       $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+                                                       $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+                                                       if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+
+                                                               // The author url doesn't match the owner (typically the contact)
+                                                               // and also doesn't match the contact alias. 
+                                                               // The name match is a hack to catch several weird cases where URLs are 
+                                                               // all over the park. It can be tricked, but this prevents you from
+                                                               // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+                                                               // well that it's the same Bob Smith. 
+
+                                                               // But it could be somebody else with the same name. It just isn't highly likely. 
+                                                               
+
+                                                               $owner_url = $item['owner-link'];
+                                                               $owner_photo = $item['owner-avatar'];
+                                                               $owner_name = $item['owner-name'];
+                                                               $template = $wallwall;
+                                                               $commentww = 'ww';
+                                                               // If it is our contact, use a friendly redirect link
+                                                               if((link_compare($item['owner-link'],$item['url'])) 
+                                                                       && ($item['network'] === NETWORK_DFRN)) {
+                                                                       $owner_url = $redirect_url;
+                                                                       $osparkle = ' sparkle';
+                                                               }
+                                                               else
+                                                                       $owner_url = zrl($owner_url);
                                                        }
-                                                       else
-                                                               $owner_url = zrl($owner_url);
                                                }
                                        }
-                               }
 
-                               $likebuttons = '';
-                               $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
+                                       $likebuttons = '';
+                                       $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
 
-                               if($page_writeable) {
-/*                                     if($toplevelpost) {  */
-                                               $likebuttons = array(
-                                                       'like' => array( t("I like this \x28toggle\x29"), t("like")),
-                                                       'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-                                               );
-                                               if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-/*                                     } */
+                                       if($page_writeable) {
+       /*                                      if($toplevelpost) {  */
+                                                       $likebuttons = array(
+                                                               'like' => array( t("I like this \x28toggle\x29"), t("like")),
+                                                               'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+                                                       );
+                                                       if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
+       /*                                      } */
 
-                                       $qc = $qcomment =  null;
+                                               $qc = $qcomment =  null;
 
-                                       if(in_array('qcomment',$a->plugins)) {
-                                               $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-                                               $qcomment = (($qc) ? explode("\n",$qc) : null);
-                                       }
+                                               if(in_array('qcomment',$a->plugins)) {
+                                                       $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+                                                       $qcomment = (($qc) ? explode("\n",$qc) : null);
+                                               }
 
-                                       if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
-                                               $comment = replace_macros($cmnt_tpl,array(
-                                                       '$return_path' => '', 
-                                                       '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-                                                       '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
-                                                       '$id' => $item['item_id'],
-                                                       '$parent' => $item['parent'],
-                                                       '$qcomment' => $qcomment,
-                                                       '$profile_uid' =>  $profile_owner,
-                                                       '$mylink' => $a->contact['url'],
-                                                       '$mytitle' => t('This is you'),
-                                                       '$myphoto' => $a->contact['thumb'],
-                                                       '$comment' => t('Comment'),
-                                                       '$submit' => t('Submit'),
-                                                       '$edbold' => t('Bold'),
-                                                       '$editalic' => t('Italic'),
-                                                       '$eduline' => t('Underline'),
-                                                       '$edquote' => t('Quote'),
-                                                       '$edcode' => t('Code'),
-                                                       '$edimg' => t('Image'),
-                                                       '$edurl' => t('Link'),
-                                                       '$edvideo' => t('Video'),
-                                                       '$preview' => t('Preview'),
-                                                       '$ww' => (($mode === 'network') ? $commentww : '')
-                                               ));
+                                               if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
+                                                       $comment = replace_macros($cmnt_tpl,array(
+                                                               '$return_path' => '', 
+                                                               '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+                                                               '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+                                                               '$id' => $item['item_id'],
+                                                               '$parent' => $item['item_id'],
+                                                               '$qcomment' => $qcomment,
+                                                               '$profile_uid' =>  $profile_owner,
+                                                               '$mylink' => $a->contact['url'],
+                                                               '$mytitle' => t('This is you'),
+                                                               '$myphoto' => $a->contact['thumb'],
+                                                               '$comment' => t('Comment'),
+                                                               '$submit' => t('Submit'),
+                                                               '$edbold' => t('Bold'),
+                                                               '$editalic' => t('Italic'),
+                                                               '$eduline' => t('Underline'),
+                                                               '$edquote' => t('Quote'),
+                                                               '$edcode' => t('Code'),
+                                                               '$edimg' => t('Image'),
+                                                               '$edurl' => t('Link'),
+                                                               '$edvideo' => t('Video'),
+                                                               '$preview' => t('Preview'),
+                                                               '$ww' => (($mode === 'network') ? $commentww : '')
+                                                       ));
+                                               }
                                        }
-                               }
 
-                               if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-                                       $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-                               else
-                                       $edpost = false;
-
-                               $drop = '';
-                               $dropping = false;
-
-                               if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                                       $dropping = true;
-
-                               $drop = array(
-                                       'dropping' => $dropping,
-                                       'select' => t('Select'), 
-                                       'delete' => t('Delete'),
-                               );
+                                       if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+                                               $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+                                       else
+                                               $edpost = false;
 
-                               $star = false;
-                               $filer = false;
+                                       $drop = '';
+                                       $dropping = false;
 
-                               $isstarred = "unstarred";
-                               if ($profile_owner == local_user()) {
-                                       if($toplevelpost) {
-                                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-                                               $star = array(
-                                                       'do' => t("add star"),
-                                                       'undo' => t("remove star"),
-                                                       'toggle' => t("toggle star status"),
-                                                       'classdo' => (($item['starred']) ? "hidden" : ""),
-                                                       'classundo' => (($item['starred']) ? "" : "hidden"),
-                                                       'starred' =>  t('starred'),
-                                                       'tagger' => t("add tag"),
-                                                       'classtagger' => "",
-                                               );
+                                       if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+                                               $dropping = true;
+
+                                       $drop = array(
+                                               'dropping' => $dropping,
+                                               'select' => t('Select'), 
+                                               'delete' => t('Delete'),
+                                       );
+
+                                       $star = false;
+                                       $filer = false;
+
+                                       $isstarred = "unstarred";
+                                       if ($profile_owner == local_user()) {
+                                               if($toplevelpost) {
+                                                       $isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+                                                       $star = array(
+                                                               'do' => t("add star"),
+                                                               'undo' => t("remove star"),
+                                                               'toggle' => t("toggle star status"),
+                                                               'classdo' => (($item['starred']) ? "hidden" : ""),
+                                                               'classundo' => (($item['starred']) ? "" : "hidden"),
+                                                               'starred' =>  t('starred'),
+                                                               'tagger' => t("add tag"),
+                                                               'classtagger' => "",
+                                                       );
+                                               }
+                                               $filer = t("save to folder");
                                        }
-                                       $filer = t("save to folder");
-                               }
 
 
-                               $photo = $item['photo'];
-                               $thumb = $item['thumb'];
+                                       $photo = $item['photo'];
+                                       $thumb = $item['thumb'];
 
-                               // Post was remotely authored.
+                                       // Post was remotely authored.
 
-                               $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+                                       $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
-                               $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+                                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 
-                               if($item['author-link'] && (! $item['author-name']))
-                                       $profile_name = $item['author-link'];
-
-                               $sp = false;
-                               $profile_link = best_link_url($item,$sp);
-                               if($profile_link === 'mailbox')
-                                       $profile_link = '';
-                               if($sp)
-                                       $sparkle = ' sparkle';
-                               else
-                                       $profile_link = zrl($profile_link);                                     
+                                       if($item['author-link'] && (! $item['author-name']))
+                                               $profile_name = $item['author-link'];
 
-                               $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-                               if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
-                                       $profile_avatar = $a->contacts[$normalised]['thumb'];
-                               else
-                                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-                               $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-                               $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+                                       $sp = false;
+                                       $profile_link = best_link_url($item,$sp);
+                                       if($profile_link === 'mailbox')
+                                               $profile_link = '';
+                                       if($sp)
+                                               $sparkle = ' sparkle';
+                                       else
+                                               $profile_link = zrl($profile_link);                                     
 
-                               $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-                               call_hooks('render_location',$locate);
+                                       $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+                                       if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+                                               $profile_avatar = $a->contacts[$normalised]['thumb'];
+                                       else
+                                               $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
 
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+                                       $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+                                       $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
 
-                               $indent = (($toplevelpost) ? '' : ' comment');
+                                       $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+                                       call_hooks('render_location',$locate);
 
-                               if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                                       $indent .= ' shiny'; 
+                                       $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
 
-                               // 
-                               localize_item($item);
+                                       $indent = (($toplevelpost) ? '' : ' comment');
 
+                                       if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+                                               $indent .= ' shiny'; 
 
-                               $tags=array();
-                               foreach(explode(',',$item['tag']) as $tag){
-                                       $tag = trim($tag);
-                                       if ($tag!="") $tags[] = bbcode($tag);
-                               }
+                                       // 
+                                       localize_item($item);
 
-                               // Build the HTML
 
-                               $body = prepare_body($item,true);
-                               //$tmp_item = replace_macros($template,
-                               $tmp_item = array(
-                                       // collapse comments in template. I don't like this much...
-                                       'comment_firstcollapsed' => $comment_firstcollapsed,
-                                       'comment_lastcollapsed' => $comment_lastcollapsed,
-                                       // template to use to render item (wall, walltowall, search)
-                                       'template' => $template,
-                                       
-                                       'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-                                       'tags' => $tags,
-                                       'body' => template_escape($body),
-                                       'text' => strip_tags(template_escape($body)),
-                                       'id' => $item['item_id'],
-                                       'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-                                       'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-                                       'to' => t('to'),
-                                       'wall' => t('Wall-to-Wall'),
-                                       'vwall' => t('via Wall-To-Wall:'),
-                                       'profile_url' => $profile_link,
-                                       'item_photo_menu' => item_photo_menu($item),
-                                       'name' => template_escape($profile_name),
-                                       'thumb' => $profile_avatar,
-                                       'osparkle' => $osparkle,
-                                       'sparkle' => $sparkle,
-                                       'title' => template_escape($item['title']),
-                                       'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-                                       'lock' => $lock,
-                                       'location' => template_escape($location),
-                                       'indent' => $indent,
-                                       'owner_url' => $owner_url,
-                                       'owner_photo' => $owner_photo,
-                                       'owner_name' => template_escape($owner_name),
-                                       'plink' => get_plink($item),
-                                       'edpost' => $edpost,
-                                       'isstarred' => $isstarred,
-                                       'star' => $star,
-                                       'filer' => $filer,
-                                       'drop' => $drop,
-                                       'vote' => $likebuttons,
-                                       'like' => $like,
-                                       'dislike' => $dislike,
-                                       'comment' => $comment,
-                                       'previewing' => $previewing,
-                                       'wait' => t('Please wait'),
-
-                               );
-
-
-                               $arr = array('item' => $item, 'output' => $tmp_item);
-                               call_hooks('display_item', $arr);
+                                       $tags=array();
+                                       foreach(explode(',',$item['tag']) as $tag){
+                                               $tag = trim($tag);
+                                               if ($tag!="") $tags[] = bbcode($tag);
+                                       }
 
-                               $threads[$threadsid]['items'][] = $arr['output'];
+                                       // Build the HTML
+
+                                       $body = prepare_body($item,true);
+                                       //$tmp_item = replace_macros($template,
+                                       $tmp_item = array(
+                                               // collapse comments in template. I don't like this much...
+                                               'comment_firstcollapsed' => $firstcollapsed,
+                                               'comment_lastcollapsed' => $lastcollapsed,
+                                               // template to use to render item (wall, walltowall, search)
+                                               'template' => $template,
+                                               
+                                               'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+                                               'tags' => $tags,
+                                               'body' => template_escape($body),
+                                               'text' => strip_tags(template_escape($body)),
+                                               'id' => $item['item_id'],
+                                               'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+                                               'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+                                               'to' => t('to'),
+                                               'wall' => t('Wall-to-Wall'),
+                                               'vwall' => t('via Wall-To-Wall:'),
+                                               'profile_url' => $profile_link,
+                                               'item_photo_menu' => item_photo_menu($item),
+                                               'name' => template_escape($profile_name),
+                                               'thumb' => $profile_avatar,
+                                               'osparkle' => $osparkle,
+                                               'sparkle' => $sparkle,
+                                               'title' => template_escape($item['title']),
+                                               'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+                                               'lock' => $lock,
+                                               'location' => template_escape($location),
+                                               'indent' => $indent,
+                                               'owner_url' => $owner_url,
+                                               'owner_photo' => $owner_photo,
+                                               'owner_name' => template_escape($owner_name),
+                                               'plink' => get_plink($item),
+                                               'edpost' => $edpost,
+                                               'isstarred' => $isstarred,
+                                               'star' => $star,
+                                               'filer' => $filer,
+                                               'drop' => $drop,
+                                               'vote' => $likebuttons,
+                                               'like' => $like,
+                                               'dislike' => $dislike,
+                                               'comment' => $comment,
+                                               'previewing' => $previewing,
+                                               'wait' => t('Please wait'),
+
+                                       );
+
+
+                                       $arr = array('item' => $item, 'output' => $tmp_item);
+                                       call_hooks('display_item', $arr);
+
+                                       $threads[$threadsid]['items'][] = $arr['output'];
+                               }
                        }
                }
        }
 
+
        $page_template = get_markup_template("conversation.tpl");
+       if($thr_c)
+               $page_template = get_markup_template("threaded_conversation.tpl");
        $o = replace_macros($page_template, array(
                '$baseurl' => $a->get_baseurl($ssl_state),
                '$mode' => $mode,
@@ -1159,12 +1467,43 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 }
 
 
+function get_item_children($arr, $parent) {
+       $children = array();
+       foreach($arr as $item) {
+               if(($item['id'] != $item['parent']) && ($item['thr-parent'] == $parent['uri'])) {
+                       $item['children'] = get_item_children($arr, $item);
+                       $children[] = $item;
+               }
+       }
+       return $children;
+}
+
+function sort_item_children($items) {
+       $result = $items;
+       usort($result,'sort_thr_created_rev');
+       foreach($result as $k => $i) {
+               if(count($result[$k]['children'])) {
+                       $result[$k]['children'] = sort_item_children($result[$k]['children']);
+               }
+       }
+       return $result;
+}
+
+function add_children_to_list($children, &$arr) {
+       foreach($children as $y) {
+               $arr[] = $y;
+               if(count($y['children']))
+                       add_children_to_list($y['children'], $arr);
+       }
+}
+
 function conv_sort($arr,$order) {
 
        if((!(is_array($arr) && count($arr))))
                return array();
 
        $parents = array();
+       $children = array();
 
        foreach($arr as $x)
                if($x['id'] == $x['parent'])
@@ -1177,21 +1516,22 @@ function conv_sort($arr,$order) {
 
        if(count($parents))
                foreach($parents as $i=>$_x) 
-                       $parents[$i]['children'] = array();
+                       $parents[$i]['children'] = get_item_children($arr, $_x);
 
-       foreach($arr as $x) {
+       /*foreach($arr as $x) {
                if($x['id'] != $x['parent']) {
                        $p = find_thread_parent_index($parents,$x);
                        if($p !== false)
                                $parents[$p]['children'][] = $x;
                }
-       }
+       }*/
        if(count($parents)) {
                foreach($parents as $k => $v) {
                        if(count($parents[$k]['children'])) {
-                               $y = $parents[$k]['children'];
+                               $parents[$k]['children'] = sort_item_children($parents[$k]['children']);
+                               /*$y = $parents[$k]['children'];
                                usort($y,'sort_thr_created_rev');
-                               $parents[$k]['children'] = $y;
+                               $parents[$k]['children'] = $y;*/
                        }
                }       
        }
@@ -1201,8 +1541,9 @@ function conv_sort($arr,$order) {
                foreach($parents as $x) {
                        $ret[] = $x;
                        if(count($x['children']))
-                               foreach($x['children'] as $y)
-                                       $ret[] = $y;
+                               add_children_to_list($x['children'], $ret);
+                               /*foreach($x['children'] as $y)
+                                       $ret[] = $y;*/
                }
        }
 
index fddc3fd124aa3dd49acd989ad82889b9ba9b771c..012f2989b0789dd51bf56238c9723d2c7cd1f199 100644 (file)
@@ -79,6 +79,7 @@ function item_post(&$a) {
                // if this isn't the real parent of the conversation, find it
                if($r !== false && count($r)) {
                        $parid = $r[0]['parent'];
+                       $parent_uri = $r[0]['uri'];
                        if($r[0]['id'] != $r[0]['parent']) {
                                $r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
                                        intval($parid)
@@ -96,7 +97,7 @@ function item_post(&$a) {
                $parent = $r[0]['id'];
 
                // multi-level threading - preserve the info but re-parent to our single level threading
-               if(($parid) && ($parid != $parent))
+               //if(($parid) && ($parid != $parent))
                        $thr_parent = $parent_uri;
 
                if($parent_item['contact-id'] && $uid) {
index 17368ab92d1f6ce4d7dd1251073b9cac89e97088..2ca3c5b06fa8c411b04563a1963c3c0db9b1bf10 100644 (file)
@@ -687,7 +687,7 @@ function network_content(&$a, $update = 0) {
 
        $mode = (($nouveau) ? 'network-new' : 'network');
 
-       $o .= conversation($a,$items,$mode,$update);
+       $o .= conversation($a,$items,$mode,$update, false, true);
 
        if(! $update) {
                if(! get_pconfig(local_user(),'system','alt_pager')) {
index 1be81d738e17200736a5cb8a144dd82bdb3d9ea1..e17f8319bc7923d9d019e1c2cb99f333460f1491 100644 (file)
@@ -935,8 +935,12 @@ input#dfrn-url {
 
 }
 
-.wall-item-content-wrapper.comment {
+.tread-wrapper .tread-wrapper {
        margin-left: 50px;
+}
+
+.wall-item-content-wrapper.comment {
+#      margin-left: 50px;
        background: #EEEEEE;
 }
 
diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl
new file mode 100644 (file)
index 0000000..f60839e
--- /dev/null
@@ -0,0 +1,13 @@
+{{ for $threads as $item }}
+{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+<div id="conversation-end"></div>
+
+{{ if $dropping }}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{ endif }}
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
new file mode 100644 (file)
index 0000000..56e21bb
--- /dev/null
@@ -0,0 +1,91 @@
+<div id="tread-wrapper-$item.id" class="tread-wrapper">
+               {{if $item.comment_firstcollapsed}}
+                       <div class="hide-comments-outer">
+                       <span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+                       </div>
+                       <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+               {{endif}}
+               {{if $item.comment_lastcollapsed}}</div>{{endif}}
+
+<a name="$item.id" ></a>
+<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
+                                onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+                                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
+                               </a>
+                               <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                               <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                                       <ul>
+                                               $item.item_photo_menu
+                                       </ul>
+                               </div>
+                       </div>
+                       <div class="wall-item-photo-end"></div>
+                       <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+                               <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>                           
+                       </div>
+               </div>
+               <div class="wall-item-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+                               <div class="wall-item-ago" id="wall-item-ago-$item.id" >$item.ago</div>
+                               
+               </div>  
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <div class="wall-item-title-end"></div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+                                       <div class="body-tag">
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ if $item.vote }}
+                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </div>
+                       {{ endif }}
+                       {{ if $item.plink }}
+                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></div>
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.filer }}
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+                       {{ endif }}                     
+                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       </div>
+                               {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       <div class="wall-item-delete-end"></div>
+               </div>
+       </div>
+       <div class="wall-item-wrapper-end"></div>
+       <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+       <div class="wall-item-comment-wrapper" >
+       $item.comment
+       </div>
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+</div>
+{{ for $item.children as $item }}
+       {{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+</div>