aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-06-01 03:43:11 -0700
committerzotlabs <mike@macgirvin.com>2018-06-01 03:43:11 -0700
commita6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58 (patch)
treee775eb73e1e5e5440b55a4e7dc0288a6b1689ce0 /view/tpl
parent4df5d44ef9792b04a2653c92cba49a2fa69656ac (diff)
parent6bf0f4225c0fc7ecc1762ed5cfe2c4861cd1bd4e (diff)
downloadvolse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.tar.gz
volse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.tar.bz2
volse-hubzilla-a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/activity_filter_widget.tpl11
-rwxr-xr-xview/tpl/common_pills.tpl31
-rw-r--r--view/tpl/common_widget.tpl6
3 files changed, 40 insertions, 8 deletions
diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl
new file mode 100644
index 000000000..7ff5a4f7e
--- /dev/null
+++ b/view/tpl/activity_filter_widget.tpl
@@ -0,0 +1,11 @@
+<div class="widget">
+ <h3 class="d-flex justify-content-between align-items-center">
+ {{$title}}
+ {{if $reset}}
+ <a href="{{$reset.url}}" class="text-muted" title="{{$reset.title}}">
+ <i class="fa fa-fw fa-{{$reset.icon}}"></i>
+ </a>
+ {{/if}}
+ </h3>
+ {{$content}}
+</div>
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>
diff --git a/view/tpl/common_widget.tpl b/view/tpl/common_widget.tpl
new file mode 100644
index 000000000..e542031dc
--- /dev/null
+++ b/view/tpl/common_widget.tpl
@@ -0,0 +1,6 @@
+<div class="widget">
+ <h3>
+ {{$title}}
+ </h3>
+ {{$content}}
+</div>