Merge remote-tracking branch 'upstream/master'

4 files changed, 49 insertions, 33 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index abffe2f78..fa76fa2f2 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -29,7 +29,7 @@ nav ul li {
 	max-height: 50px;
 }
 
-nav img {
+nav .navbar-header img {
 	height: 49px;
 	width: 49px;
 	margin-top: 1px;
@@ -63,16 +63,14 @@ aside .nav-pills > li > a {
 
 .dropdown-menu img {
 	float: left;
-	width: 32px;
-	height: 32px;
+	width: 36px;
+	height: 36px;
 	margin-right: 5px;
 }
 
 .dropdown-menu li a {
 	overflow: hidden;
 	text-overflow: ellipsis;
-	line-height: 1em;
-	padding: 5px 10px;
 }
 
 .nav-tabs.nav-justified > li {
diff --git a/view/js/acl.js b/view/js/acl.js
index 626d1a750..847997de0 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -25,7 +25,6 @@ function ACL(backend_url, preset) {
 	/*events*/
 
 	$(document).ready(function() {
-//		setTimeout( function() {
 			that.showall.click(that.on_showall);
 			$(document).on('click','.acl-button-show',that.on_button_show);
 			$(document).on('click','.acl-button-hide',that.on_button_hide);
@@ -34,11 +33,10 @@ function ACL(backend_url, preset) {
 			/* startup! */
 			that.get(0,100);
 			that.on_submit();
-//		}, 5000 );
 	});
 }
 
-// no longer called on submit - call to update whenever a change occurs to the acl list. 
+// no longer called only on submit - call to update whenever a change occurs to the acl list. 
 
 ACL.prototype.on_submit = function() {
 	aclfileds = $("#acl-fields").html("");
@@ -66,7 +64,9 @@ ACL.prototype.search = function() {
 };
 
 ACL.prototype.on_search = function(event) {
-	if (that.kp_timer) clearTimeout(that.kp_timer);
+	if (that.kp_timer) {
+		clearTimeout(that.kp_timer);
+	}
 	that.kp_timer = setTimeout( that.search, 1000);
 };
 
@@ -90,15 +90,37 @@ ACL.prototype.on_showall = function(event) {
 	return false;
 };
 
+ACL.prototype.on_selectall = function(event) {
+	event.preventDefault();
+	event.stopPropagation();
+
+	/* This function has not yet been completed. */
+	/* The goal is to select all ACL "show" entries with one action. */
+ 
+	$('.acl-button-show').each(function(){});
+
+	if (that.showall.hasClass("btn-warning")) {
+		return false;
+	}
+	that.showall.removeClass("btn-default").addClass("btn-warning");
+
+	that.allow_cid = [];
+	that.allow_gid = [];
+	that.deny_cid  = [];
+	that.deny_gid  = [];
+
+	that.update_view();
+	that.on_submit();
+
+	return false;
+};
+
+
 ACL.prototype.on_button_show = function(event) {
 	event.preventDefault();
 	event.stopImmediatePropagation();
 	event.stopPropagation();
 
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-hide").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
 	that.set_allow($(this).parent().attr('id'));
 	that.on_submit();
 
@@ -110,10 +132,6 @@ ACL.prototype.on_button_hide = function(event) {
 	event.stopImmediatePropagation();
 	event.stopPropagation();
 
-	/*that.showall.removeClass("selected");
-	$(this).siblings(".acl-button-show").removeClass("selected");
-	$(this).toggleClass("selected");*/
-
 	that.set_deny($(this).parent().attr('id'));
 	that.on_submit();
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d981a38b9..d747e9c3e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1328,6 +1328,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .contactname {
 	padding-top: 2px;
 	font-weight: bold;
+	line-height: 1em;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1335,7 +1336,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 }
 
 .dropdown-sub-text {
-	font-size: 0.833em;
+	line-height: 1em;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	display: block;
@@ -1720,7 +1721,8 @@ img.mail-conv-sender-photo {
     box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
-.wall-item-ago {
+.wall-item-ago,
+.dropdown-sub-text {
 	color: #777;
 	font-size: 0.833em;
 }
@@ -1854,6 +1856,8 @@ nav .dropdown-menu {
 	border-bottom-left-radius: $radiuspx;
 }
 
+
+
 #usermenu-caret {
 	color: $nav_icon_colour;
 }
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>