clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13704 from MrPetovan/bug/13693-infinite-indentation-level 

[frio] Limit thread indentation level to 7 (at thread level 9)
This commit is contained in:
Michael Vogel 2023-12-09 07:11:35 +01:00 committed by GitHub
parent b1e6a53692 9743d2f40c
commit dc9658f532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/theme/frio/css/style.css
View File

@ -2219,7 +2219,9 @@ img.acpopup-img {
.wall-item-container.thread_level_4,
.wall-item-container.thread_level_5,
.wall-item-container.thread_level_6,
.wall-item-container.thread_level_7 {
.wall-item-container.thread_level_7,
.wall-item-container.thread_level_8,
.wall-item-container.thread_level_9 {
margin-left: 15px;
}
@ -3901,7 +3903,9 @@ section .profile-match-wrapper {
.wall-item-container.thread_level_4,
.wall-item-container.thread_level_5,
.wall-item-container.thread_level_6,
.wall-item-container.thread_level_7 {
.wall-item-container.thread_level_7,
.wall-item-container.thread_level_8,
.wall-item-container.thread_level_9 {
margin-left: 5px;
}
}

9
view/theme/frio/templates/wall_thread.tpl
View File

@ -46,12 +46,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
{{/if}}
{{* Use a different div container in dependence max thread-level = 7 *}}
{{if $item.thread_level<7}}
<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
{{else}}
<div class="item-{{$item.id}} wall-item-container {{$item.indent}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
{{/if}}
{{if $item.thread_level==1}}
<span class="commented" style="display: none;">{{$item.commented}}</span>
<span class="received" style="display: none;">{{$item.received}}</span>
@ -169,7 +164,7 @@ as the value of $top_child_total (this is done at the end of this file)
&bull;
<small><i class="fa fa-plug" title="{{$item.connector}}" aria-hidden="true"></i></small>
{{else}}
&bull;
&bull;
<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.privacy}}" data-toggle="tooltip">
<small><i class="fa {{if $item.private == 1}}fa-lock{{elseif $item.private == 0}}fa-globe{{else}}fa-low-vision{{/if}}" aria-hidden="true"></i></small>
</span>
@ -341,7 +336,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
</span>
{{/if}}
{{* Buttons for like and dislike *}}
{{if $item.vote}}
<span class="wall-item-response">