diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
| commit | 992f8272d38b9ee73cc9facbe473665713f6ff2d (patch) | |
| tree | 7f9b8e747c4694651bad51632345e6fa440258a4 /view | |
| parent | 89d21c08735ad9bb151acee5ee1f372a803e2213 (diff) | |
| parent | 27678a523c4c02bf4e3b31bf4ac01413feaf3759 (diff) | |
| download | volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.gz volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.bz2 volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/app.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 804db426f..ac5c18deb 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -26,7 +26,7 @@ </div> {{/if}} {{if $navapps}} -<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> +<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a> {{/if}} {{if $order}} <a href="{{$hosturl}}appman/{{$app.guid}}/moveup" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0f2628761..93bbe187f 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -19,10 +19,10 @@ {{if $localuser}} <div class="dropdown-menu"> {{foreach $nav.usermenu as $usermenu}} - <a class="dropdown-item" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> + <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> {{/foreach}} {{if $nav.manage}} - <a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> + <a class="dropdown-item{{if $sel.active == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> {{/if}} {{if $nav.channels}} {{foreach $nav.channels as $chan}} @@ -34,11 +34,11 @@ {{/if}} {{if $nav.settings}} <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> + <a class="dropdown-item{{if $sel.active == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a> {{/if}} {{if $nav.admin}} <div class="dropdown-divider"></div> - <a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> + <a class="dropdown-item{{if $sel.active == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a> {{/if}} {{if $nav.logout}} <div class="dropdown-divider"></div> |