Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 3 insertions, 1 deletions

diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index c8f3d2e06..d88bc1370 100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -2,7 +2,7 @@
 <script>
 	var old_cmin = 0;
 	var old_cmax = 99;
-	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], width:'100%', showLabels: false,  onstatechange: function(v) { 
+	$("#main-range").jRange({ isRange: true, from: 0, to: 99, step: 1, scale: [{{$labels}}], width:'100%', showLabels: false,  onstatechange: function(v) { 
 		var carr = v.split(",");
 		if(carr[0] != bParam_cmin) {
 			old_cmin = bParam_cmin;
@@ -17,6 +17,8 @@
 
 	var slideTimer = null;
 	function networkRefresh() {
+		$("#profile-jot-text-loading").show();
+
 		if((document.readyState !== "complete") || (slideTimer !== null))
 			return;
 		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))