From b531486dabfa66256b5809a6d7eac93a830be1f6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 17 Nov 2015 10:46:38 +0100
Subject: show jotnets toggle button only if there are jotnets and whitespace
 fixes

---
 view/tpl/acl_selector.tpl | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3


From 6fa0807550f4e7a3da307afe9398e54c3d036228 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 17 Nov 2015 23:01:24 +0100
Subject: more css fixes

---
 view/tpl/hdr.tpl           | 2 +-
 view/tpl/profile_vcard.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3