diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-25 16:02:41 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-25 16:02:41 -0700 |
| commit | 08f15a6fc60023f739676d3751e2cd14cecf52a4 (patch) | |
| tree | dcbebfa488aa750cb35e2b311957ea419e032eb2 /view/tpl/nav.tpl | |
| parent | c24cfbc62af111f18576cfde8e4e920e66c57ff5 (diff) | |
| parent | caf077cbf893cd02932194e1641c861ffcc2e339 (diff) | |
| download | volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.tar.gz volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.tar.bz2 volse-hubzilla-08f15a6fc60023f739676d3751e2cd14cecf52a4.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/nav.tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 93bbe187f..c0b34bbe8 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,5 +1,5 @@ {{if $nav.login && !$userinfo}} -<div class="d-md-none p-1"> +<div class="d-md-none pt-1 pb-1"> <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> @@ -16,7 +16,7 @@ <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> <i class="fa fa-caret-down"></i> </div> - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-menu"> {{foreach $nav.usermenu as $usermenu}} <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> @@ -26,7 +26,7 @@ {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} - <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a> + <a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a> {{/foreach}} {{/if}} {{if $nav.profiles}} @@ -45,14 +45,13 @@ <a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a> {{/if}} </div> - {{else}} - {{if $nav.rusermenu}} + {{/if}} + {{if ! $is_owner}} <div class="dropdown-menu" role="menu" aria-labelledby="avatar"> <a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a> <a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a> </div> {{/if}} - {{/if}} </div> {{/if}} <div class="navbar-toggler-right"> @@ -204,7 +203,7 @@ {{if $channel_apps.0}} </div> {{/if}} - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-divider"></div> <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> <a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> @@ -230,7 +229,7 @@ {{if $channel_apps.0}} </div> {{/if}} - {{if $localuser}} + {{if $is_owner}} <div class="dropdown-divider"></div> <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> <a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> |