dynamic load on slider change + delay to settle

5 files changed, 66 insertions, 18 deletions

diff --git a/mod/network.php b/mod/network.php
index bb4c3e419..99c0f746f 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -338,12 +338,6 @@ function network_content(&$a, $update = 0) {
 		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
 	}
 
-	$arr = array('tabs' => $tabs);
-	call_hooks('network_tabs', $arr);
-
-	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
-
-	// --- end item filter tabs
 
 
 
@@ -401,6 +395,14 @@ function network_content(&$a, $update = 0) {
 			'$world' => t('Everybody')
 		));
  	
+	$arr = array('tabs' => $tabs);
+	call_hooks('network_tabs', $arr);
+
+	$o .= replace_macros(get_markup_template('common_tabs.tpl'), array('$tabs'=> $arr['tabs']));
+
+	// --- end item filter tabs
+
+
 		// search terms header
 		if($search)
 			$o .= '<h2>' . t('Search Results For:') . ' '  . htmlspecialchars($search) . '</h2>';
diff --git a/view/main_slider.tpl b/view/main_slider.tpl
index bc9a60ed1..19d6fb15a 100644
--- a/view/main_slider.tpl
+++ b/view/main_slider.tpl
@@ -1,14 +1,20 @@
-<div id="main-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 80%;"><input id="main-range" type="text" name="cminmax" value="$val" /></div>
-<input id="slider-refresh" type="submit" name="submit" value="$refresh" onclick="networkRefresh();" /><div class="clear"></div>
+<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="$val" /></div>
 <script>
 	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '$intimate', '|', '$friends', '|', '$coworkers', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { 
 	var carr = v.split(";"); 
 	network_cmin = carr[0]; 
 	network_cmax = carr[1];
+	networkRefresh();
  } });
 
+	var slideTimer = null;
 	function networkRefresh() {
-		window.location.href = buildCmd();
+		if((document.readyState !== "complete") || (slideTimer !== null))
+			return;
+		slideTimer = setTimeout(networkTimerRefresh,5000);
 	}
 
+	function networkTimerRefresh() {
+		window.location.href = buildCmd();
+	}
 </script>
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index 20b4e923a..3029ce9bd 100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -44,7 +44,7 @@
 
 
 	{{ if $nav.notifications }}
-		<a id="nav-notifications-linkmenu" class="nav-commlink" onclick="notify_popup(); return false;" title="$nav.notifications.1">$nav.notifications.1</a>
+		<a id="nav-notifications-linkmenu" class="nav-commlink fakelink" onclick="notify_popup(); return false;" title="$nav.notifications.1">$nav.notifications.1</a>
 			<span id="notify-update" class="nav-ajax-left"></span>
 			<ul id="nav-notifications-menu" class="menu-popup">
 				<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 30f92dd85..c804c63b5 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -319,9 +319,12 @@ div.wall-item-content-wrapper.shiny {
 	color: #3465a4;
 	text-decoration: none;
 	cursor: pointer;
+}
+.fakebutton {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
+
 .lockview {
 	cursor: pointer;
 }
@@ -2157,6 +2160,8 @@ aside input[type='text'] {
 	text-decoration: underline;
 	cursor: pointer;
 }
+
+
 #settings-default-perms-menu {
 	margin-top: 15px;
 	margin-bottom: 15px;
@@ -3274,11 +3279,29 @@ ul.menu-popup {
 	margin-left: 25px;
 }
 
-#main-slider {
-	float: left;
+
+.jslider .jslider-scale ins {
+    color: #333;
+	font-size: 12px;
+	width: 100px;
+	text-align: center;
 }
-#slider-refresh {
-	float: right;
-	margin-right: 25px;
-	margin-top: 7px;
+
+.slider {
+	margin-top: 10px;
+	margin-bottom: 30px;
+}
+
+
+#main-slider {
+	position: relative; 
+	left: 5%; 
+	width: 90%;
 }
+
+
+#contact-slider {
+	position: relative; 
+	left: 5%; 
+	width: 90%;
+}
\ No newline at end of file
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 3040775ec..9f10ee540 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -220,6 +220,8 @@ nav #site-location {
 -o-transform: rotate(4deg);
 }
 
+
+/*
 .jslider .jslider-scale ins {
     color: #333;
 	font-size: 12px;
@@ -227,7 +229,22 @@ nav #site-location {
 	text-align: center;
 }
 
-#slider {
+.slider {
 	margin-top: 10px;
 	margin-bottom: 15px;
-}
\ No newline at end of file
+	height: 32px; 
+}
+
+#main-slider {
+	position: relative; 
+	left: 10%; 
+	width: 90%;
+}
+
+#contact-slider {
+	position: relative; 
+	left: 10%; 
+	width: 90%;
+
+}
+*/
\ No newline at end of file