diff options
| author | friendica <info@friendica.com> | 2014-02-21 23:52:20 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-21 23:52:20 -0800 |
| commit | f63e220939e0b46986750f292d7140df4d0eb429 (patch) | |
| tree | fbfaa875d8714271930167764698a6af58d51798 /view/tpl | |
| parent | 9e2ea6b5d43d581e3857fa3fffd249b7fa53c092 (diff) | |
| parent | 07fb85fcc98dcbcf4098cb7f7e23852f04e01cb3 (diff) | |
| download | volse-hubzilla-f63e220939e0b46986750f292d7140df4d0eb429.tar.gz volse-hubzilla-f63e220939e0b46986750f292d7140df4d0eb429.tar.bz2 volse-hubzilla-f63e220939e0b46986750f292d7140df4d0eb429.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ba8d68b13..20600ccd7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -159,7 +159,7 @@ {{if $nav.apps}} <li class="{{$sel.apps}} hidden-xs"> <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> - <ul id="nav-apps-menu" class="dropdown-menu"> + <ul class="dropdown-menu"> {{foreach $apps as $ap}} <li>{{$ap}}</li> {{/foreach}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 187c3039d..10a928e1c 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,8 +2,8 @@ {{if $profile.edit}} <div class="action"> - <a class="profile-edit-side-link" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> - <ul id="profiles-menu" class="menu-popup"> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> + <ul id="profiles-menu" class="menu-popup dropdown-menu"> {{foreach $profile.menu.entries as $e}} <li> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> |