Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 23 insertions, 8 deletions

diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl
index d10aa365b..37d500bd1 100755
--- a/view/tpl/common_pills.tpl
+++ b/view/tpl/common_pills.tpl
@@ -1,8 +1,23 @@
-<div class="widget">
-	<h3>{{$title}}</h3>
-	<ul class="nav nav-pills flex-column">
-		{{foreach $tabs as $tab}}
-		<li class="nav-item"{{if $tab.id}} id="{{$tab.id}}"{{/if}}><a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{if $tab.icon}}<i class="fa fa-fw fa-{{$tab.icon}}"></i> {{/if}}{{$tab.label}}</a></li>
-		{{/foreach}}
-	</ul>
-</div>
+<ul class="nav nav-pills flex-column">
+	{{foreach $pills as $p}}
+	<li class="nav-item"{{if $p.id}} id="{{$p.id}}"{{/if}}>
+		<a class="nav-link{{if $p.sel}} {{$p.sel}}{{/if}}" href="{{$p.url}}"{{if $p.title}} title="{{$p.title}}"{{/if}}{{if $p.sub}} onclick="{{if $p.sel}}closeOpen('{{$p.id}}_sub');{{else}}openClose('{{$p.id}}_sub');{{/if}} return false;"{{/if}}>
+			{{if $p.icon}}<i class="fa fa-fw fa-{{$p.icon}}"></i>{{/if}}
+			{{$p.label}}
+			{{if $p.sub}}<i class="fa fa-fw fa-caret-down"></i>{{/if}}
+		</a>
+		{{if $p.sub}}
+		<ul class="nav nav-pills flex-column ml-4" id="{{$p.id}}_sub"{{if !$p.sel}} style="display: none;"{{/if}}>
+			{{foreach $p.sub as $ps}}
+			<li class="nav-item"{{if $ps.id}} id="{{$ps.id}}"{{/if}}>
+				<a class="nav-link{{if $ps.sel}} {{$ps.sel}}{{/if}}" href="{{$ps.url}}"{{if $ps.title}} title="{{$ps.title}}"{{/if}}>
+				{{if $ps.icon}}<i class="fa fa-fw fa-{{$ps.icon}}"></i>{{/if}}
+				{{$ps.label}}
+				</a>
+			</li>
+			{{/foreach}}
+		</ul>
+		{{/if}}
+	</li>
+	{{/foreach}}
+</ul>