Merge branch 'erikl-master'

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index edbadbc75a86f2a563613f60cee88fb7e5b50c91..f74137e0e046b33daea75a3c77a19cba1e4cc35c 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -104,7 +104,7 @@ function display_content(&$a) {
 
 
        $cmnt_tpl = load_view_file('view/comment_item.tpl');
-       $like_tpl = load_view_file('view/like.tpl');
+       $like_tpl = load_view_file('view/like_noshare.tpl');
        $tpl = load_view_file('view/wall_item.tpl');
        $wallwall = load_view_file('view/wallwall_item.tpl');
 
@@ -151,7 +151,13 @@ function display_content(&$a) {
 
                        if(can_write_wall($a,$a->profile['uid'])) {
                                if($item['id'] == $item['parent']) {
-                                       $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+                                       $likebuttons = replace_macros($like_tpl,array(
+                                               '$id' => $item['id'],
+                                               '$likethis' => t("I like this \x28toggle\x29"),
+                                               '$nolike' => t("I don't like this \x28toggle\x29"),
+                                               '$share' => t('Share'),
+                                               '$wait' => t('Please wait') 
+                                       ));
                                }
                                if($item['last-child']) {
                                        $comment = replace_macros($cmnt_tpl,array(
@@ -211,6 +217,9 @@ function display_content(&$a) {
                        $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
                        $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
 
+                       $edpost = '';
+                       if((local_user()) && ($item['uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+                               $edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
                        // Can we use our special contact URL for this author? 
 
                        if(strlen($item['author-link'])) {
@@ -255,6 +264,7 @@ function display_content(&$a) {
                                '$to' => t('to'),
                                '$wall' => t('Wall-to-Wall'),
                                '$vwall' => t('via Wall-To-Wall:'),
+                               '$item_photo_menu' => item_photo_menu($item),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$sparkle' => $sparkle,
@@ -270,6 +280,7 @@ function display_content(&$a) {
                                '$owner_photo' => $owner_photo,
                                '$owner_name' => $owner_name,
                                '$plink' => get_plink($item),
+                               '$edpost' => $edpost,
                                '$drop' => $drop,
                                '$vote' => $likebuttons,
                                '$like' => $like,