friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1677 from annando/1506-vier-threads 

Vier: Improved threading
This commit is contained in:
Tobias Diekershoff 2015-06-22 07:55:39 +02:00
parent 50af1fc2c3 bc42b6440a
commit bc82b94564
2 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
view/theme/vier/style.css
View File

@ -1346,6 +1346,30 @@ section.minimal {
width: calc(100% - 90px); width: calc(100% - 90px);
border-bottom: 1px solid hsl(198, 21%, 79%); border-bottom: 1px solid hsl(198, 21%, 79%);
} }
.wall-item-container.thread_level_2 {
margin-left: 80px;
width: calc(100% - 90px);
}
.wall-item-container.thread_level_3 {
margin-left: 95px;
width: calc(100% - 105px);
}
.wall-item-container.thread_level_4 {
margin-left: 110px;
width: calc(100% - 120px);
}
.wall-item-container.thread_level_5 {
margin-left: 125px;
width: calc(100% - 135px);
}
.wall-item-container.thread_level_6 {
margin-left: 140px;
width: calc(100% - 150px);
}
.wall-item-container.thread_level_7 {
margin-left: 155px;
width: calc(100% - 165px);
}
.wall-item-container.comment .wall-item-content { .wall-item-container.comment .wall-item-content {
max-width: 585px; max-width: 585px;

23
view/theme/vier/templates/wall_thread.tpl
View File

@ -2,21 +2,26 @@
{{if $mode == display}} {{if $mode == display}}
{{else}} {{else}}
{{if $item.comment_firstcollapsed}} {{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer"> {{if $item.thread_level<3}}
<span id="hide-comments-total-{{$item.id}}" <div class="hide-comments-outer">
class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-total-{{$item.id}}"
class="hide-comments-total">{{$item.num_comments}}</span>
<span id="hide-comments-{{$item.id}}" <span id="hide-comments-{{$item.id}}"
class="hide-comments fakelink" class="hide-comments fakelink"
onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
{{if $item.thread_level==3}} - <!-- {{if $item.thread_level==3}} -
<span id="hide-thread-{{$item}}-id" <span id="hide-thread-{{$item}}-id"
class="fakelink" class="fakelink"
onclick="showThread({{$item.id}});">expand</span> / onclick="showThread({{$item.id}});">expand</span> /
<span id="hide-thread-{{$item}}-id" <span id="hide-thread-{{$item}}-id"
class="fakelink" class="fakelink"
onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}} onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
</div> -->
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> </div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{else}}
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: block;">
{{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}
@ -26,7 +31,11 @@
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" /> <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
</div> </div>
<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}}" id="item-{{$item.guid}}"> {{if $item.thread_level<7}}
<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}}" id="item-{{$item.guid}}">
{{else}}
<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7" id="item-{{$item.guid}}">
{{/if}}
<div class="wall-item-item"> <div class="wall-item-item">
<div class="wall-item-info"> <div class="wall-item-info">
<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}" <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"