permissions responder + upstream merge

4 files changed, 36 insertions, 11 deletions

diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 34360aacf..f2edad499 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -952,7 +952,6 @@ input#dfrn-url {
 	position: relative;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
-
 }
 
 .tread-wrapper .tread-wrapper {
@@ -1210,6 +1209,10 @@ input#dfrn-url {
 	width: 100px;
 	float: left;
 }
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
+	width: 40px;
+}
+
 .comment-edit-photo img {
 	width: 25px;
 }
@@ -1229,6 +1232,10 @@ input#dfrn-url {
 	margin: 10px 0px 10px 110px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
+	margin-left: 50px;
+}
+
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
@@ -1772,12 +1779,16 @@ input#dfrn-url {
 
 .comment-edit-text-empty {
 	color: gray;
-	height: 30px;
+	height: 5em;
 	width: 175px;
 	overflow: auto;
 	margin-bottom: 10px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
+	height: 1.5em;
+}
+
 .comment-edit-text-full {
 	color: black;
 	height: 150px;
@@ -3088,7 +3099,8 @@ aside input[type='text'] {
 [class^="comment-edit-bb"] {
 	list-style: none;
 	display: none;
-	margin: 0px 0 -5px 60px;
+	margin: 0px 0 -5px 0px;
+	padding: 0px;
 	width: 75%;
 }
 [class^="comment-edit-bb"] > li {
diff --git a/view/theme/duepuntozero/php/theme.php b/view/theme/duepuntozero/php/theme.php
index e42c2b7b4..a1d436a4b 100644
--- a/view/theme/duepuntozero/php/theme.php
+++ b/view/theme/duepuntozero/php/theme.php
@@ -34,11 +34,19 @@ function insertFormatting(comment,BBcode,id) {
 	return true;
 }
 
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+	if($(comment).hasClass('comment-edit-text-full')) {
+		$(".comment-edit-bb-" + id).show();
+		return true;
+	}
+	return false;
 }
 function cmtBbClose(comment, id) {
-	$(".comment-edit-bb-" + id).hide();
+	if($(comment).hasClass('comment-edit-text-empty')) {
+		$(".comment-edit-bb-" + id).hide();
+		return true;
+	}
+	return false;
 }
 $(document).ready(function() {
 
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 98173aa30..3de24ca8d 100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,10 +1,9 @@
+		{{ if $threaded }}
+		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
+		{{ else }}
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			{{ if $threaded }}
-			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ else }}
+		{{ endif }}
 			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
index 35f613b39..ade8264fa 100644
--- a/view/tpl/wall_thread.tpl
+++ b/view/tpl/wall_thread.tpl
@@ -6,7 +6,11 @@
 {{endif}}
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
+{{ if $item.threaded }}
+<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" >
+{{ else }}
 <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+{{ endif }}
 	<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" 
@@ -93,11 +97,13 @@
 	{{ inc $item.template }}{{ endinc }}
 {{ endfor }}
 
+{{ if $item.comment }}
 {{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
 {{ endif }}
+{{ endif }}
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}