tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #430 from fabrixxm/master

Browse source 
Fix Quattro with threaded comments, small tweaks to template processor and conversation.php
This commit is contained in:
fabrixxm 2012-08-10 03:50:54 -07:00
commit e31ee9ed82
13 changed files with 254 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -588,6 +588,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
'comment' => $comment,
'previewing' => $previewing,
'wait' => t('Please wait'),
'thread_level' => $thread_level,
);
$arr = array('item' => $item, 'output' => $tmp_item);
@ -818,6 +819,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
'previewing' => $previewing,
'wait' => t('Please wait'),
'thread_level' => 1,
);
$arr = array('item' => $item, 'output' => $tmp_item);

22
include/template_processor.php
View file

@ -63,7 +63,7 @@
if ($b[0]=="$") $b = $this->_get_var($b);
$val = ($a == $b);
} else if (strpos($args[2],"!=")>0){
list($a,$b) = explode("!=",$args[2]);
list($a,$b) = array_map("trim", explode("!=",$args[2]));
$a = $this->_get_var($a);
if ($b[0]=="$") $b = $this->_get_var($b);
$val = ($a != $b);
@ -133,6 +133,26 @@
return $ret;
}
/**
* DEBUG node
*
* {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
*
* replace node with <pre>var_dump($var, $var, ...);</pre>
*/
private function _replcb_debug($args){
$vars = array_map('trim', explode(" ",$args[2]));
$vars[] = $args[1];
$ret = "<pre>";
foreach ($vars as $var){
$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
$ret .= "\n";
}
$ret .= "</pre>";
return $ret;
}
private function _replcb_node($m) {
$node = $this->nodes[$m[1]];

4
view/head.tpl
View file

@ -39,7 +39,9 @@
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id);
return true;
}
return false;
}
function commentClose(obj,id) {
if(obj.value == '') {
@ -48,7 +50,9 @@
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
closeMenu("comment-edit-submit-wrapper-" + id);
return true;
}
return false;
}

13
view/theme/quattro/comment_item.tpl
View file

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

66
view/theme/quattro/dark/style.css
View file

@ -1075,6 +1075,7 @@ section {
width: 710px;
border: 1px solid #2d2d2d;
margin-top: 10px;
background-color: #fce94f;
}
.comment-edit-preview .contact-photo {
width: 32px;
@ -1091,12 +1092,17 @@ section {
padding-left: 12px;
}
.comment-edit-preview .wall-item-container {
width: 700px;
width: 90%;
}
.comment-edit-preview .tread-wrapper {
width: 700px;
width: 90%;
padding: 0;
margin: 10px 0;
background-color: #fce94f;
border-bottom: 0px;
}
.comment-edit-preview .wall-item-conv {
display: none;
}
.shiny {
border-right: 10px solid #fce94f;
@ -1143,36 +1149,64 @@ section {
height: 25px;
}
/* threaded comments */
.children {
margin-top: 1em;
}
.children .hide-comments-outer {
margin-left: 60px;
}
.children .comment-edit-preview {
width: 660px;
}
.children .comment-edit-preview .wall-item-container {
width: 610px;
}
.children .children {
margin-left: 40px;
}
.children .children .wall-item-container {
width: 710px;
}
.children .children .children {
margin-left: 40px;
.children .children .comment-edit-preview {
width: 620px;
}
.children .children .comment-edit-preview .wall-item-container {
width: 620px;
}
.children .children .children .wall-item-container {
width: 670px;
}
.children .children .children .children {
margin-left: 40px;
.children .children .children .comment-edit-preview {
width: 580px;
}
.children .children .children .comment-edit-preview .wall-item-container {
width: 580px;
}
.children .children .children .children .wall-item-container {
width: 630px;
}
.children .children .children .children .children {
margin-left: 40px;
.children .children .children .children .comment-edit-preview {
width: 540px;
}
.children .children .children .children .comment-edit-preview .wall-item-container {
width: 540px;
}
.children .children .children .children .children .wall-item-container {
width: 590px;
}
.children .children .children .children .children .comment-edit-preview {
width: 500px;
}
.children .children .children .children .children .comment-edit-preview .wall-item-container {
width: 500px;
}
.children .children .children .children .children .children {
margin-left: 0px;
}
.threaded .hide-comments-outer {
margin-left: 20px;
.children .children .children .children .children .children .hide-comments-outer {
margin-left: 0px;
}
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"] {
background: url("showmore-bg.jpg") no-repeat center bottom;
}
@ -2009,25 +2043,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 {

66
view/theme/quattro/green/style.css
View file

@ -1075,6 +1075,7 @@ section {
width: 710px;
border: 1px solid #2d2d2d;
margin-top: 10px;
background-color: #ddffdd;
}
.comment-edit-preview .contact-photo {
width: 32px;
@ -1091,12 +1092,17 @@ section {
padding-left: 12px;
}
.comment-edit-preview .wall-item-container {
width: 700px;
width: 90%;
}
.comment-edit-preview .tread-wrapper {
width: 700px;
width: 90%;
padding: 0;
margin: 10px 0;
background-color: #ddffdd;
border-bottom: 0px;
}
.comment-edit-preview .wall-item-conv {
display: none;
}
.shiny {
border-right: 10px solid #ddffdd;
@ -1143,36 +1149,64 @@ section {
height: 25px;
}
/* threaded comments */
.children {
margin-top: 1em;
}
.children .hide-comments-outer {
margin-left: 60px;
}
.children .comment-edit-preview {
width: 660px;
}
.children .comment-edit-preview .wall-item-container {
width: 610px;
}
.children .children {
margin-left: 40px;
}
.children .children .wall-item-container {
width: 710px;
}
.children .children .children {
margin-left: 40px;
.children .children .comment-edit-preview {
width: 620px;
}
.children .children .comment-edit-preview .wall-item-container {
width: 620px;
}
.children .children .children .wall-item-container {
width: 670px;
}
.children .children .children .children {
margin-left: 40px;
.children .children .children .comment-edit-preview {
width: 580px;
}
.children .children .children .comment-edit-preview .wall-item-container {
width: 580px;
}
.children .children .children .children .wall-item-container {
width: 630px;
}
.children .children .children .children .children {
margin-left: 40px;
.children .children .children .children .comment-edit-preview {
width: 540px;
}
.children .children .children .children .comment-edit-preview .wall-item-container {
width: 540px;
}
.children .children .children .children .children .wall-item-container {
width: 590px;
}
.children .children .children .children .children .comment-edit-preview {
width: 500px;
}
.children .children .children .children .children .comment-edit-preview .wall-item-container {
width: 500px;
}
.children .children .children .children .children .children {
margin-left: 0px;
}
.threaded .hide-comments-outer {
margin-left: 20px;
.children .children .children .children .children .children .hide-comments-outer {
margin-left: 0px;
}
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"] {
background: url("showmore-bg.jpg") no-repeat center bottom;
}
@ -2009,25 +2043,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 {

BIN
view/theme/quattro/icons/bbedit.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

53
view/theme/quattro/quattro.less
View file

@ -536,6 +536,7 @@ section {
color: @CommentBoxFullColor;
border: 1px solid @CommentBoxFullBorderColor;
}
}
.threaded .wall-item-comment-wrapper { margin-left: 0px; }
@ -544,6 +545,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;*/
@ -554,8 +556,13 @@ section {
}
.wall-item-links { padding-left: 12px; }
.wall-item-container { width: 700px; }
.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
.wall-item-container { width: 90%; }
.tread-wrapper {
width: 90%; padding: 0; margin: 10px 0;
background-color: @JotPreviewBackgroundColor;
border-bottom: 0px;
}
.wall-item-conv { display: none; }
}
.shiny { border-right:10px solid @ShinyBorderColor; }
@ -598,32 +605,49 @@ section {
/* threaded comments */
.children {
margin-top: 1em;
.hide-comments-outer { margin-left:60px; }
.comment-edit-preview { width: 660px;
.wall-item-container { width: 610px; }
}
& .children {
margin-left: 40px;
.wall-item-container { width: 710px; }
.comment-edit-preview { width: 620px;
.wall-item-container { width: 620px; }
}
& .children {
margin-left: 40px;
.wall-item-container { width: 670px; }
.comment-edit-preview { width: 580px;
.wall-item-container { width: 580px; }
}
& .children {
margin-left: 40px;
.wall-item-container { width: 630px; }
.comment-edit-preview { width: 540px;
.wall-item-container { width: 540px; }
}
& .children {
margin-left: 40px;
.wall-item-container { width: 590px; }
.comment-edit-preview { width: 500px;
.wall-item-container { width: 500px; }
}
.children {
margin-left: 0px;
}
.hide-comments-outer { margin-left: 0px; }
}
}
}
}
}
}
.threaded .hide-comments-outer { margin-left: 20px; }
/*.threaded .hide-comments-outer { margin-left: 20px; }*/
span[id^="showmore-teaser"]{
background: url("showmore-bg.jpg") no-repeat center bottom;
@ -1372,25 +1396,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;}
}

18
view/theme/quattro/theme.php
View file

@ -42,11 +42,21 @@ function insertFormatting(comment,BBcode,id) {
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
function showThread(id) {
$("#collapsed-comments-" + id).show()
$("#collapsed-comments-" + id + " .collapsed-comments").show()
}
function cmtBbClose(comment, id) {
$(".comment-edit-bb-" + id).hide();
function hideThread(id) {
$("#collapsed-comments-" + id).hide()
$("#collapsed-comments-" + id + " .collapsed-comments").hide()
}
function cmtBbOpen(id) {
$("#comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$("#comment-edit-bb-" + id).hide();
}
$(document).ready(function() {

2
view/theme/quattro/threaded_conversation.tpl
View file

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

8
view/theme/quattro/wall_item_tag.tpl
View file

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

47
view/theme/quattro/wall_thread.tpl
View file

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

45
view/theme/quattro/wallwall_thread.tpl
View file

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