even more fixes

diff --git a/include/items.php b/include/items.php
index 876f92330cd825baf1a53a1f62b4d2ce167fc0b5..6877116c9878196849422e1da6683ac35ca6c2d6 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -93,6 +93,7 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
                        '$name' => xmlify($owner['name']),
                        '$profile_page' => xmlify($owner['url']),
                        '$photo' => xmlify($owner['photo']),
+                       '$thumb' => xmlify($owner['thumb']),
                        '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
                        '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
                        '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 409ffce56cc2357e746841826e9481824638be94..5e6b10bea724d0ff2d2838b8e0f045fb9cf277b8 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -15,7 +15,7 @@ function dfrn_poll_init(&$a) {
        if(x($_GET,'last_update'))
                $last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
 
-       if(($dfrn_id == '') && ($a->argc > 1)) {
+       if(($dfrn_id == '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
                $o = get_feed_for($a,'*', $a->argv[1],$last_update);
                echo $o;
                killme();

diff --git a/mod/item.php b/mod/item.php
index acb97a062607ba32277341af8fafb60ec1f0a0ea..b718c68a66b8accb36936c2ba6ab973db961b29a 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -89,7 +89,7 @@ function item_post(&$a) {
        if(count($r))
                $contact_record = $r[0];
 
-       $post_type == notags(trim($_POST['type']));
+       $post_type = notags(trim($_POST['type']));
 
        if($post_type == 'net-comment') {
                if($parent_item !== null) {
@@ -170,7 +170,7 @@ function item_post(&$a) {
                );
                // photo comments turn the corresponding item visible to the profile wall
                if(! $parent_item['visible']) {
-                       $r = q("UPDATE `item` SET `visible = 1 WHERE `id` = %d LIMIT 1",
+                       $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1",
                                intval($parent_item['id'])
                        );
                }

diff --git a/mod/network.php b/mod/network.php
index c5961dfadf5331913db40d23fb86cac1bc6fd6cd..17a670b93c14707071fcfeb07aeef11761a718c8 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -172,6 +172,9 @@ function network_content(&$a, $update = false) {
                                        '$id' => $item['item_id'],
                                        '$parent' => $item['parent'],
                                        '$profile_uid' =>  $_SESSION['uid'],
+                                       '$mylink' => $a->contact['url'],
+                                       '$mytitle' => t('Me'),
+                                       '$myphoto' => $a->contact['thumb'],
                                        '$ww' => $commentww
                                ));
                        }

diff --git a/mod/profile.php b/mod/profile.php
index 0cc236f9536861b1ebde3fafad3da6cb656fb386..5e1f5dfdce51452e30940113bf8a53350c8f5330 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -238,6 +238,9 @@ function profile_content(&$a, $update = false) {
                                                '$id' => $item['item_id'],
                                                '$parent' => $item['parent'],
                                                '$profile_uid' =>  $a->profile['uid'],
+                                               '$mylink' => $a->contact['url'],
+                                               '$mytitle' => t('Me'),
+                                               '$myphoto' => $a->contact['thumb'],
                                                '$ww' => ''
                                        ));
                                }

diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index 63737982eb1b3d3488643e4012bff96b16e9eb74..336ad3b33fe254c5fa93928eaf4e272a4a49c510 100644 (file)
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -7,9 +7,13 @@
                <input type="hidden" name="parent" value="$parent" />
                <input type="hidden" name="return" value="$return_path" />
 
+               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                       <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+               </div>
+               <div class="comment-edit-photo-end"></div>
                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
 
-
+               <div class="comment-edit-text-end"></div>
                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
                        <input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
                </div>

diff --git a/view/head.tpl b/view/head.tpl
index ec67455d071737b88223d657c8a28b5966467a84..d0fea606ce91fc80999c4e586cb392a668011375 100644 (file)
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -67,8 +67,14 @@
                                        $('#' + prev).after($(this));
                                }
                                else { 
+
                                        $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
                                        $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
+                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
+                                                $(this).attr('src',$(this).attr('dst'));
+                                        });
+
+
                                }
                                prev = ident; 
                        });

diff --git a/view/style.css b/view/style.css
index c3dee16c30a8353a6e640043f67cb76094a87061..8b52693fa484f76c172c4f9add54948996f5f749 100644 (file)
--- a/view/style.css
+++ b/view/style.css
@@ -547,11 +547,11 @@ input#dfrn-url {
        clear: both;
 }
 
-.wall-item-outside-wrapper {
+.wall-item-content-wrapper {
        margin-top: 10px;
 }
 
-.wall-item-outside-wrapper.comment {
+.wall-item-content-wrapper.comment {
        margin-left: 50px;
        background: #F7F7F7;
 }
@@ -624,14 +624,35 @@ input#dfrn-url {
 
 .comment-edit-wrapper {
        margin-top: 15px;
-       margin-left: 100px;
+       background: #F7F7F7;
+       margin-left: 50px;
 }
 
 .comment-wwedit-wrapper {
        margin-top: 15px;
+       background: #F7F7F7;
        margin-left: 250px;
 }
 
+.comment-edit-photo {
+       margin-top: 10px;
+       margin-left: 10px;
+       margin-bottom: 10px;
+       width: 100px;
+       float: left;
+}
+.comment-edit-text-empty, .comment-edit-text-full {
+       float: left;
+       margin-top: 40px;
+}
+.comment-edit-text-end {
+       clear: both;
+}
+
+.comment-edit-submit {
+       margin-left: 110px;
+       margin-top: 10px;
+}
 
 #profile-jot-submit-wrapper {
        margin-top: 15px;

diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index e676c5a41f5990c230984c1691a8fb5f6cf63da5..84d0f287911927d26110498095f5535dc3f82c3c 100644 (file)
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,20 +1,22 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-       <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-               <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-               <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
-       </div>
+       <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
+               <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+                       <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+                       <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+               </div>
 
-       <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-               <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
-               <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-       </div>
-       <div class="wall-item-content" id="wall-item-content-$id" >
-               <div class="wall-item-title" id="wall-item-title-$id">$title</div>
-               <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+               <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+                       <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
+                       <div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+               </div>
+               <div class="wall-item-content" id="wall-item-content-$id" >
+                       <div class="wall-item-title" id="wall-item-title-$id">$title</div>
+                       <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+               </div>
+               $drop
        </div>
-       $drop
        <div class="wall-item-wrapper-end"></div>
-       <div class="wall-item-comment-separator"></div>
+
        <div class="wall-item-comment-wrapper" >
        $comment
        </div>