diff --git a/include/items.php b/include/items.php index 876f92330..6877116c9 100644 --- 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 409ffce56..5e6b10bea 100644 --- 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 acb97a062..b718c68a6 100644 --- 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 c5961dfad..17a670b93 100644 --- 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 0cc236f95..5e1f5dfdc 100644 --- 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 63737982e..336ad3b33 100644 --- a/view/comment_item.tpl +++ b/view/comment_item.tpl @@ -7,9 +7,13 @@ +
+ $mytitle +
+
- +
diff --git a/view/head.tpl b/view/head.tpl index ec67455d0..d0fea606c 100644 --- 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 c3dee16c3..8b52693fa 100644 --- 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 e676c5a41..84d0f2879 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,20 +1,22 @@
-
- - $name -
+
+
+ + $name +
-
- $name -
$ago
+
+ $name +
$ago
+
+
+
$title
+
$body
+
+ $drop
-
-
$title
-
$body
-
- $drop
-
+
$comment