diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
| commit | b782c46e518afd0713f92fabb76aea9a7c3e5d77 (patch) | |
| tree | c28dc5d4f45988a01c56876d1ae41d92a73d6191 /view/tpl | |
| parent | eaa47760bc7bb024b4c41bd41be62fd16f1237ec (diff) | |
| parent | 7ec687988746e1037d86d25186c2dd5f2addb15b (diff) | |
| download | volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.gz volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.bz2 volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index e8b779622..a873457fe 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -6,22 +6,32 @@ <h4 class="modal-title">{{$aclModalTitle}}</h4> </div> <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> + <div id="jotnets-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="acl-select"> + {{$jotnets}} + <div class="clear"></div> + </div> + {{/if}} + <div id="acl-wrapper"> <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button> <input type="text" id="acl-search" placeholder=""> + <div id="acl-list"> <div id="acl-list-content"></div> + </div> <span id="acl-fields"></span> </div> + <div class="acl-list-item" rel="acl-template" style="display:none"> <img data-src="{0}"><p>{1}</p> <button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button> <button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button> </div> - {{if $jotnets}} - {{$jotnets}} - {{/if}} </div> <div class="modal-footer clear"> <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 4782f827b..0d375400c 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -177,7 +177,7 @@ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h4 class="modal-title">{{$response.title}}</h4> </div> - <div class="modal-body"> + <div class="modal-body response-list"> <ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul> </div> <div class="modal-footer clear"> |