keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Flatten children when threads are disabled

Browse source
This commit is contained in:
Domovoy 2012-08-03 22:28:21 +02:00
parent ea7db7b7a8
commit 8742beb772
3 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/conversation.php
View file

@ -581,13 +581,27 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
} }
$item_result['children'] = array(); $item_result['children'] = array();
// Show children of children only if enabled if(count($item['children'])) {
if(count($item['children'])
&& (($thread_level < 2) || get_config('system','thread_allow'))) {
$item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1)); $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, ($thread_level + 1));
} }
$item_result['private'] = $item['private']; $item_result['private'] = $item['private'];
$item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : ''); $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
/*
* I don't like this very much...
*/
if(get_config('system','thread_allow')) {
$item_result['flatten'] = false;
$item_result['threaded'] = true;
}
else {
$item_result['flatten'] = true;
$item_result['threaded'] = false;
if(!$toplevelpost) {
$item_result['comment'] = false;
}
}
$result[] = $item_result; $result[] = $item_result;
} }
@ -1134,11 +1148,18 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) { function get_item_children($arr, $parent) {
$children = array(); $children = array();
foreach($arr as $item) { foreach($arr as $item) {
if(($item['id'] != $item['parent']) && ($item['thr-parent'] == $parent['uri'])) { if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) {
if($item['thr-parent'] == $parent['uri']) {
$item['children'] = get_item_children($arr, $item); $item['children'] = get_item_children($arr, $item);
$children[] = $item; $children[] = $item;
} }
} }
else if($item['parent'] == $parent['id']) {
$children[] = $item;
}
}
}
return $children; return $children;
} }

1
view/theme/darkzero/style.css
View file

@ -29,6 +29,7 @@ background: #444;
} }
.wall-item-tools { background-color: #444444; background-image: none;} .wall-item-tools { background-color: #444444; background-image: none;}
.comment-wwedit-wrapper{ background-color: #444444; } .comment-wwedit-wrapper{ background-color: #444444; }
.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
.comment-edit-preview{ color: #000000; } .comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; } .photo-top-album-name{ background-color: #333333; }

9
view/wall_thread.tpl
View file

@ -73,9 +73,13 @@
</div> </div>
{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }} {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
<div class="wall-item-delete-end"></div> <div class="wall-item-delete-end"></div>
{{ if $item.threaded }}
{{ if $item.comment }}
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >
$item.comment $item.comment
</div> </div>
{{ endif }}
{{ endif }}
</div> </div>
</div> </div>
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>
@ -87,5 +91,10 @@
{{ inc $item.template }}{{ endinc }} {{ inc $item.template }}{{ endinc }}
{{ endfor }} {{ endfor }}
{{ if $item.flatten }}
<div class="wall-item-comment-wrapper" >
$item.comment
</div>
{{ endif }}
</div> </div>
{{if $item.comment_lastcollapsed}}</div>{{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}}