aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/quattro
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/quattro')
-rw-r--r--view/theme/quattro/dark/style.css13
-rw-r--r--view/theme/quattro/green/style.css13
-rw-r--r--view/theme/quattro/quattro.less15
-rw-r--r--view/theme/quattro/theme.php16
-rw-r--r--view/theme/quattro/tpl/comment_item.tpl13
-rw-r--r--view/theme/quattro/tpl/threaded_conversation.tpl2
-rw-r--r--view/theme/quattro/tpl/wall_item_tag.tpl8
-rw-r--r--view/theme/quattro/tpl/wall_thread.tpl47
-rw-r--r--view/theme/quattro/tpl/wallwall_thread.tpl45
9 files changed, 110 insertions, 62 deletions
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index d397a9305..17ee6576d 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1072,6 +1072,7 @@ section {
width: 710px;
border: 1px solid #2d2d2d;
margin-top: 10px;
+ background-color: #fce94f;
}
.comment-edit-preview .contact-photo {
width: 32px;
@@ -1965,25 +1966,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 fdab77eb7..10cff53fd 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1072,6 +1072,7 @@ section {
width: 710px;
border: 1px solid #2d2d2d;
margin-top: 10px;
+ background-color: #ddffdd;
}
.comment-edit-preview .contact-photo {
width: 32px;
@@ -1965,25 +1966,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/quattro.less b/view/theme/quattro/quattro.less
index a3ab8107b..ad1262d48 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -532,6 +532,7 @@ section {
color: @CommentBoxFullColor;
border: 1px solid @CommentBoxFullBorderColor;
}
+
}
.threaded .wall-item-comment-wrapper { margin-left: 0px; }
@@ -540,6 +541,7 @@ section {
width: 710px;
border: 1px solid @Grey5;
margin-top: 10px;
+ background-color: @JotPreviewBackgroundColor;
.contact-photo { width: 32px; height: 32px; margin-left: 16px;
/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
@@ -1328,25 +1330,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/theme.php b/view/theme/quattro/theme.php
index 5cb373eef..1c986e4c8 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -42,11 +42,21 @@ function insertFormatting(comment,BBcode,id) {
return true;
}
+function showThread(id) {
+ $("#collapsed-comments-" + id).show()
+ $("#collapsed-comments-" + id + " .collapsed-comments").show()
+}
+function hideThread(id) {
+ $("#collapsed-comments-" + id).hide()
+ $("#collapsed-comments-" + id + " .collapsed-comments").hide()
+}
+
+
function cmtBbOpen(id) {
- $(".comment-edit-bb-" + id).show();
+ $("#comment-edit-bb-" + id).show();
}
-function cmtBbClose(comment, id) {
- $(".comment-edit-bb-" + id).hide();
+function cmtBbClose(id) {
+ $("#comment-edit-bb-" + id).hide();
}
$(document).ready(function() {
diff --git a/view/theme/quattro/tpl/comment_item.tpl b/view/theme/quattro/tpl/comment_item.tpl
index ea24d95cc..7d1d7550b 100644
--- a/view/theme/quattro/tpl/comment_item.tpl
+++ b/view/theme/quattro/tpl/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/tpl/threaded_conversation.tpl b/view/theme/quattro/tpl/threaded_conversation.tpl
index 491c47302..13c38acb2 100644
--- a/view/theme/quattro/tpl/threaded_conversation.tpl
+++ b/view/theme/quattro/tpl/threaded_conversation.tpl
@@ -1,6 +1,8 @@
{{ for $threads as $item }}
+
<div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
+
{{ if $item.type == tag }}
{{ inc wall_item_tag.tpl }}{{ endinc }}
{{ else }}
diff --git a/view/theme/quattro/tpl/wall_item_tag.tpl b/view/theme/quattro/tpl/wall_item_tag.tpl
index 205fcfebc..e1ef93213 100644
--- a/view/theme/quattro/tpl/wall_item_tag.tpl
+++ b/view/theme/quattro/tpl/wall_item_tag.tpl
@@ -1,3 +1,5 @@
+{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
+
<div class="wall-item-container item-tag $item.indent">
<div class="wall-item-item">
<div class="wall-item-info">
@@ -18,8 +20,8 @@
</div>
</div>
+{{ if $item.thread_level!=1 }}</div>{{ endif }}
+
{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
- $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}
diff --git a/view/theme/quattro/tpl/wall_thread.tpl b/view/theme/quattro/tpl/wall_thread.tpl
index 4d454f00d..01738b666 100644
--- a/view/theme/quattro/tpl/wall_thread.tpl
+++ b/view/theme/quattro/tpl/wall_thread.tpl
@@ -2,12 +2,24 @@
{{ 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>
+ {{ if $item.thread_level==3 }} -
+ <span id="hide-thread-$item-id"
+ class="fakelink"
+ onclick="showThread($item.id);">expand</span> /
+ <span id="hide-thread-$item-id"
+ class="fakelink"
+ onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{ endif }}
+{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
<div class="wall-item-decor">
<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
@@ -93,35 +105,40 @@
<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
- {{ if $item.threaded }}{{ if $item.comment }}
+ {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.thread_level!=1 }}
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper">
- $item.comment
+ $item.comment
</div>
</div>
- {{ endif }}{{ endif }}
+ {{ endif }}{{ endif }}{{ endif }}
</div>
-{{ for $item.children as $item }}
- <div class="children">
- {{ if $item.type == tag }}
- {{ inc wall_item_tag.tpl }}{{ endinc }}
- {{ else }}
- {{ inc $item.template }}{{ endinc }}
- {{ endif }}
- </div>
+
+{{ for $item.children as $child }}
+ {{ if $item.type == tag }}
+ {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
+ {{ else }}
+ {{ inc $item.template with $item=$child }}{{ endinc }}
+ {{ endif }}
{{ endfor }}
+{{ if $item.thread_level!=1 }}</div>{{ endif }}
+
+
{{if $mode == display}}
{{ else }}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ endif }}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}{{ endif }}{{ endif }}
+
+
{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
- $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}
diff --git a/view/theme/quattro/tpl/wallwall_thread.tpl b/view/theme/quattro/tpl/wallwall_thread.tpl
index cc2f8e362..93a8838eb 100644
--- a/view/theme/quattro/tpl/wallwall_thread.tpl
+++ b/view/theme/quattro/tpl/wallwall_thread.tpl
@@ -2,12 +2,25 @@
{{ 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>
+ {{ if $item.thread_level==3 }} -
+ <span id="hide-thread-$item-id"
+ class="fakelink"
+ onclick="showThread($item.id);">expand</span> /
+ <span id="hide-thread-$item-id"
+ class="fakelink"
+ onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}}
{{ endif }}
+{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
+
<div class="wall-item-decor">
<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}
@@ -101,34 +114,38 @@
<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
</div>
- {{ if $item.threaded }}{{ if $item.comment }}
+ {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
<div class="wall-item-bottom">
<div class="wall-item-links"></div>
<div class="wall-item-comment-wrapper">
$item.comment
</div>
</div>
- {{ endif }}{{ endif }}
+ {{ endif }}{{ endif }}{{ endif }}
</div>
-{{ for $item.children as $item }}
- <div class="children">
- {{ if $item.type == tag }}
- {{ inc wall_item_tag.tpl }}{{ endinc }}
- {{ else }}
- {{ inc $item.template }}{{ endinc }}
- {{ endif }}
- </div>
+{{ for $item.children as $child }}
+ {{ if $item.type == tag }}
+ {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
+ {{ else }}
+ {{ inc $item.template with $item=$child }}{{ endinc }}
+ {{ endif }}
{{ endfor }}
+{{ if $item.thread_level!=1 }}</div>{{ endif }}
+
+
{{if $mode == display}}
{{ else }}
{{if $item.comment_lastcollapsed}}</div>{{endif}}
{{ endif }}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}{{ endif }}{{ endif }}
+
+
{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
- $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
{{ endif }}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:23:58 +0000