even more fixes

4 files changed, 50 insertions, 17 deletions

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 @@
 		<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 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 @@
 <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>