From c4bff3d3934f93b059da64b02886e3ffa8a5a0d7 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 10 Aug 2012 04:29:22 -0400
Subject: [PATCH] quattro: add comment tools icons, fix hide/show comment tools

---
 view/theme/quattro/comment_item.tpl |  13 +++++++------
 view/theme/quattro/dark/style.css   |  12 +++++-------
 view/theme/quattro/green/style.css  |  12 +++++-------
 view/theme/quattro/icons/bbedit.png | Bin 0 -> 2145 bytes
 view/theme/quattro/quattro.less     |  14 +++++++-------
 view/theme/quattro/wall_thread.tpl  |   6 +++++-
 6 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 view/theme/quattro/icons/bbedit.png

diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index ea24d95cc..7d1d7550b 100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -10,8 +10,8 @@
 				<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>
-				<ul class="comment-edit-bb-$id">
+				<ul id="comment-edit-bb-$id"
+					class="comment-edit-bb">
 					<li><a class="editicon boldbb shadow"
 						style="cursor: pointer;" title="$edbold"
 						onclick="insertFormatting('$comment','b', $id);"></a></li>
@@ -37,8 +37,11 @@
 						style="cursor: pointer;" title="$edvideo"
 						onclick="insertFormatting('$comment','video', $id);"></a></li>
 				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
+				<textarea id="comment-edit-text-$id" 
+					class="comment-edit-text-empty" 
+					name="body" 
+					onFocus="commentOpen(this,$id) && cmtBbOpen($id);" 
+					onBlur="commentClose(this,$id) && cmtBbClose($id);" >$comment</textarea>
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
@@ -48,14 +51,12 @@
 					</select>
 				{{ endif }}
 
-				<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" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
 					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
 					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
 				</div>
 
-				<div class="comment-edit-end"></div>
 			</form>
 
 		</div>
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 5ff059160..17e51cf17 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -2009,25 +2009,23 @@ footer {
   opacity: 0.3;
   filter: alpha(opacity=30);
 }
-[class^="comment-edit-bb"] {
+.comment-edit-bb {
   list-style: none;
   display: none;
-  margin: 0px 0 0px 60px;
+  margin: 0px;
+  padding: 0px;
   width: 75%;
 }
-[class^="comment-edit-bb"] > li {
+.comment-edit-bb > li {
   display: inline-block;
   margin: 10px 10px 0 0;
   visibility: none;
 }
-[class^="comment-edit-bb-end"] {
-  clear: both;
-}
 .editicon {
   display: inline-block;
   width: 16px;
   height: 16px;
-  background-image: url(bbedit.png);
+  background-image: url(icons/bbedit.png);
   text-decoration: none;
 }
 .editicon :hover {
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 3cc4e8cf6..da9cdd794 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -2009,25 +2009,23 @@ footer {
   opacity: 0.3;
   filter: alpha(opacity=30);
 }
-[class^="comment-edit-bb"] {
+.comment-edit-bb {
   list-style: none;
   display: none;
-  margin: 0px 0 0px 60px;
+  margin: 0px;
+  padding: 0px;
   width: 75%;
 }
-[class^="comment-edit-bb"] > li {
+.comment-edit-bb > li {
   display: inline-block;
   margin: 10px 10px 0 0;
   visibility: none;
 }
-[class^="comment-edit-bb-end"] {
-  clear: both;
-}
 .editicon {
   display: inline-block;
   width: 16px;
   height: 16px;
-  background-image: url(bbedit.png);
+  background-image: url(icons/bbedit.png);
   text-decoration: none;
 }
 .editicon :hover {
diff --git a/view/theme/quattro/icons/bbedit.png b/view/theme/quattro/icons/bbedit.png
new file mode 100644
index 0000000000000000000000000000000000000000..b89f2f7a830b573d37ea591e715d5e9507574642
GIT binary patch
literal 2145
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
X)oe|$-m16t00000NkvXXu0mjfyN3QR

literal 0
HcmV?d00001

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index a424ee020..2a4b1b0d0 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -536,6 +536,7 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
+	
 }
 
 .threaded .wall-item-comment-wrapper { margin-left: 0px; }
@@ -1372,25 +1373,24 @@ footer { height: 100px; display: table-row; }
 /* edit buttons for comments */
 
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
-[class^="comment-edit-bb"] {
+.comment-edit-bb {
 	list-style: none;
 	display: none;
-	margin: 0px 0 0px 60px;
+	margin: 0px;
+	padding: 0px;
 	width: 75%;
 }
-[class^="comment-edit-bb"] > li {
+.comment-edit-bb > li {
 	display: inline-block;
 	margin: 10px 10px 0 0;
 	visibility: none;
 }
-[class^="comment-edit-bb-end"] {
-	clear: both;
-}
+
 .editicon {
     display: inline-block;
     width: 16px;
     height: 16px;
-    background-image: url(bbedit.png);
+    background-image: url(icons/bbedit.png);
     text-decoration: none;
     :hover {background-color: #ccc;}
 }
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index 4d454f00d..fe136b2b2 100644
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -2,7 +2,11 @@
 {{ else }}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+		<span id="hide-comments-total-$item.id" 
+			class="hide-comments-total">$item.num_comments</span>
+			<span id="hide-comments-$item.id" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments($item.id);">$item.hide_text</span>
 	</div>
 	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
 {{endif}}