Merge pull request #8 from redmatrix/master

get fresh code from HZ base

1 files changed, 13 insertions, 3 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="&#xf002;">
+
 					<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>