Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge

6 files changed, 29 insertions, 12 deletions

diff --git a/view/js/main.js b/view/js/main.js
index 3981d4266..6d68a5108 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -666,6 +666,8 @@ function updateConvItems(mode,data) {
 		$('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight');
 	}
 
+	$(document.body).trigger("sticky_kit:recalc");
+
 }
 
 function collapseHeight() {
diff --git a/view/php/default.php b/view/php/default.php
index f5be4fa35..839a36b5b 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,7 +10,7 @@
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
 	<main>
-		<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+		<aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 					<div id="page-footer"></div>
 			<div id="pause"></div>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 46aadaa7d..1fb07ae4f 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -26,6 +26,7 @@ head_add_js('library/jquery-textcomplete/jquery.textcomplete.js');
 //head_add_js('library/colorbox/jquery.colorbox.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/readmore.js/readmore.js');
+head_add_js('library/sticky-kit/sticky-kit.min.js');
 //head_add_js('library/jquery_ac/friendica.complete.js');
 //head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b5f25073d..5c9c7397f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -473,7 +473,6 @@ footer {
 
 #contact-block {
 	width: 100%;
-	float: left;
 }
 
 #contact-block-numcontacts {
@@ -482,12 +481,10 @@ footer {
 }
 
 .contact-block-div {
-	float: left;
-	width: 50px;
-	height: 50px;
+	display: inline;
 }
+
 .contact-block-textdiv {
-	float: left;
 	width: 150px;
 	height: 34px;
 }
@@ -495,12 +492,11 @@ footer {
 #contact-block-end {
 	clear: both;
 }
-.contact-block-link {
-	float: left;
-}
+
 .contact-block-img {
-	width:48px;
-	height:48px;
+	width:47px;
+	height:47px;
+	margin-bottom: 3px;
 }
 
 #tag-remove {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index c5f74db3f..8fb1117ce 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,6 +16,23 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
+	if($(window).outerWidth() > 767) {
+		$('#left_aside_wrapper').stick_in_parent({
+			offset_top: $('nav').outerHeight(true)
+		});
+	}
+
+	$(window).resize(function() {
+		if($(window).outerWidth() > 767) {
+			$('#left_aside_wrapper').stick_in_parent({
+				offset_top: $('nav').outerHeight(true)
+			});
+		}
+		else {
+			$('#left_aside_wrapper').trigger("sticky_kit:detach");
+		}
+	});
+
 	$('#expand-aside').click(function() {
 		$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
 		$('main').toggleClass('region_1-on');
@@ -72,5 +89,6 @@ function makeFullScreen(full) {
 		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});
+		$(document.body).trigger("sticky_kit:recalc");
 	}
 }
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index 23b7bd281..a7c5973f3 100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1 +1 @@
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="" /></a></div>