quattro: add comment tools icons, fix hide/show comment tools

diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index ea24d95cc33e80e9060525582ca6e00989145747..7d1d7550b2f2b10e7835e297f2f901542d5ac80c 100644 (file)
--- 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 5ff05916021deb2ebcf9753c343767dc310af7d5..17e51cf1704847cc64848894a450c3e94255ac4b 100644 (file)
--- 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 3cc4e8cf610a9baec94fbe21b6e4b0a288985fc4..da9cdd79428e1157dff15b5e97b7d4b57344c2bc 100644 (file)
--- 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 (file)
index 0000000..b89f2f7
Binary files /dev/null and b/view/theme/quattro/icons/bbedit.png differ

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index a424ee0207be92641b1ad33fb7a096dcb8ba52de..2a4b1b0d06e723e0323d2d84bdc50c9c8707575d 100644 (file)
--- 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 4d454f00db78465f34d2200d54938ac920ebc29b..fe136b2b2fb61a56c20f2af6d928dad6d32a13dd 100644 (file)
--- 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}}