From 21b3dc9c27be50e73944eaec97001ad1279400f1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 25 Jul 2012 19:45:45 -0700
Subject: tie the main slider to ajax updates and buildCmd

---
 view/main_slider.tpl   | 6 ++++--
 view/search_item.tpl   | 2 +-
 view/wall_item.tpl     | 4 ++--
 view/wallwall_item.tpl | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/main_slider.tpl b/view/main_slider.tpl
index 19d6fb15a..6f2b5f4a3 100644
--- a/view/main_slider.tpl
+++ b/view/main_slider.tpl
@@ -11,10 +11,12 @@
 	function networkRefresh() {
 		if((document.readyState !== "complete") || (slideTimer !== null))
 			return;
-		slideTimer = setTimeout(networkTimerRefresh,5000);
+		slideTimer = setTimeout(networkTimerRefresh,2000);
 	}
 
 	function networkTimerRefresh() {
-		window.location.href = buildCmd();
+		slideTimer = null;
+		page_load = true;
+		liveUpdate();
 	}
 </script>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index e13c1e5a7..dc4a43c6a 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -42,7 +42,7 @@
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index b9278b375..458677433 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -62,9 +62,9 @@
 			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
 			{{ endif }}			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.pagedropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 478df8e88..983c03287 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -69,7 +69,7 @@
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
-				{{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>	
-- 
cgit v1.2.3