diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-02 00:01:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-02 00:01:19 -0700 |
| commit | 5f612521da11cd4b9245909bf0a99a7431272e93 (patch) | |
| tree | 690b4d2eda5a99256549c9ae210065e0d3033fbb /view/tpl | |
| parent | a6ab3dd36a78adbdd67ae9e7e25a3281cbcf9a58 (diff) | |
| parent | 53efd4e470f10e123209ed63b90213b20a87e011 (diff) | |
| download | volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.tar.gz volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.tar.bz2 volse-hubzilla-5f612521da11cd4b9245909bf0a99a7431272e93.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/common_pills.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/profile_tabs.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl index 37d500bd1..8f4381f3d 100755 --- a/view/tpl/common_pills.tpl +++ b/view/tpl/common_pills.tpl @@ -1,10 +1,10 @@ <ul class="nav nav-pills flex-column"> {{foreach $pills as $p}} - <li class="nav-item"{{if $p.id}} id="{{$p.id}}"{{/if}}> + <li class="nav-item hover-fx-show"{{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}} + {{if $p.sub}}<i class="fa fa-fw fa-caret-down hover-fx-hide"></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}}> diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index ebcadf365..0eb0a964c 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -27,6 +27,9 @@ {{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> {{/foreach}} + {{if $nav.group}} + <a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a> + {{/if}} {{if $nav.manage}} <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> {{/if}} diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl index e77da23f3..dd9fbc52b 100644 --- a/view/tpl/profile_tabs.tpl +++ b/view/tpl/profile_tabs.tpl @@ -1,5 +1,5 @@ -<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div> -<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div> +<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> +<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> {{foreach $tabs as $tab}} <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a> {{/foreach}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 07e6dcc0a..262bf257f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -11,7 +11,7 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a> <div class="dropdown-menu dropdown-menu-right" role="menu"> {{foreach $editmenu.menu.entries as $e}} - <a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'>{{$e.profile_name}}</a> + <a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a> {{/foreach}} <a href="profile_photo" class="dropdown-item">{{$editmenu.menu.chg_photo}}</a> {{if $editmenu.menu.cr_new}}<a href="profiles/new" id="profile-listing-new-link" class="dropdown-item">{{$editmenu.menu.cr_new}}</a>{{/if}} |