From: Michael Vogel <icarus@dabo.de>
Date: Sun, 21 Jun 2015 18:40:39 +0000 (+0200)
Subject: Vier: Improved threading
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc42b6440a1a5cb21f10766e2ae00c89048019ed;p=friendica.git

Vier: Improved threading
---

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index e36bad4e31..3178b9613a 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1346,6 +1346,30 @@ section.minimal {
   width: calc(100% - 90px);
   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 {
   max-width: 585px;
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 764ff05170..33f8c5b10a 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -2,21 +2,26 @@
 {{if $mode == display}}
 {{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>
+	{{if $item.thread_level<3}} 
+		<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>
-			{{if $item.thread_level==3}} - 
+<!--			{{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{{/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}}
 
@@ -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;" />
 </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-info">
 			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"