diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-17 15:04:04 -0800 |
| commit | a089064588352b60bebf27c94a51d480f8062368 (patch) | |
| tree | 796fc893c37ecc3a19c469b2a067fcb2765a698d /view/tpl | |
| parent | a06f7fbe2e78de428489d824c1329ef29c4d1f42 (diff) | |
| parent | 7c4d9519c89aed59e9253a19203fb13394571929 (diff) | |
| download | volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.gz volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.tar.bz2 volse-hubzilla-a089064588352b60bebf27c94a51d480f8062368.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 24 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
3 files changed, 12 insertions, 16 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index a873457fe..013f3f296 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -8,11 +8,11 @@ <div class="modal-body"> {{if $jotnets}} <div class="jotnets-wrapper" role="tab" id="jotnets-wrapper"> - <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> - </div> + <a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a> + </div> <div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select"> - {{$jotnets}} - <div class="clear"></div> + {{$jotnets}} + <div class="clear"></div> </div> {{/if}} @@ -41,14 +41,10 @@ </div><!-- /.modal --> <script> -//$(document).ready(function() { -// setTimeout( function () { - if(typeof acl=="undefined"){ - acl = new ACL( - baseurl+"/acl", - [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] - ); - } -// }, 5000 ); -//}); + if(typeof acl=="undefined"){ + acl = new ACL( + baseurl+"/acl", + [ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ] + ); + } </script> diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl index c3f0700f0..3770cb9a6 100644 --- a/view/tpl/hdr.tpl +++ b/view/tpl/hdr.tpl @@ -1,5 +1,5 @@ <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span></a></li> </ul> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index bea0d894f..c52c2cd81 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -6,7 +6,7 @@ <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> - <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> + <a href="profiles/{{$e.id}}"><img class="dropdown-menu-img-xs" src='{{$e.photo}}'>{{$e.profile_name}}<div class='clear'></div></a> </li> {{/foreach}} <li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li> |