From 4b36e41b098ae805d8a25e1c4ce7f38161418eea Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 23 Jul 2012 20:49:56 -0700
Subject: implement page update modes

---
 view/common_tabs.tpl                |  2 +-
 view/conversation.tpl               |  3 ++-
 view/jot-header.tpl                 |  6 +++---
 view/photo_edit.tpl                 |  9 ++-------
 view/photos_upload.tpl              |  8 +-------
 view/profile_edit.tpl               | 14 +-------------
 view/theme/dispy/conversation.tpl   |  3 ++-
 view/theme/quattro/conversation.tpl |  3 ++-
 8 files changed, 14 insertions(+), 34 deletions(-)

(limited to 'view')

diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
index 22c33d6b1..f8ceff46a 100644
--- a/view/common_tabs.tpl
+++ b/view/common_tabs.tpl
@@ -1,5 +1,5 @@
 <ul class="tabs">
 	{{ for $tabs as $tab }}
-		<li><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
+		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
 	{{ endfor }}
 </ul>
diff --git a/view/conversation.tpl b/view/conversation.tpl
index fe8304a6c..70cd389c9 100644
--- a/view/conversation.tpl
+++ b/view/conversation.tpl
@@ -1,3 +1,4 @@
+<div id="threads-begin"></div>
 {{ for $threads as $thread }}
 <div id="thread-wrapper-$thread.id" class="thread-wrapper">
 	{{ for $thread.items as $item }}
@@ -15,7 +16,7 @@
 	{{ endfor }}
 </div>
 {{ endfor }}
-
+<div id="threads-end"></div>
 <div id="conversation-end"></div>
 
 {{ if $dropping }}
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index f1c283470..64bcf27ca 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -283,9 +283,9 @@ function enableOnUser(){
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
 					$.fancybox.close();
 				} else {
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index 85d5fb8e2..53b69caae 100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
@@ -28,7 +28,7 @@
 	<div id="photo-edit-rotate-end"></div>
 
 	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
 			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
 		<div id="photo-edit-perms-menu-end"></div>
@@ -47,9 +47,4 @@
 	<div id="photo-edit-end"></div>
 </form>
 
-<script>
-	$("a#photo-edit-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
-	}); 
-</script>
+
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 706b3398d..33c48cbeb 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -23,7 +23,7 @@
 
 
 	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
 		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
 	<div id="photos-upload-perms-end"></div>
@@ -43,9 +43,3 @@
 	<div class="photos-upload-end" ></div>
 </form>
 
-<script>
-	$("a#photos-upload-perms-menu").fancybox({
-		'transitionIn' : 'none',
-		'transitionOut' : 'none'
-	}); 
-</script>
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 64cd47324..bc342cc3b 100644
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -172,7 +172,6 @@ $lbl_about
 
 </div>
 <div id="about-jot-end"></div>
-</div>
 
 
 <div id="interest-jot-wrapper" >
@@ -184,7 +183,6 @@ $lbl_hobbies
 
 </div>
 <div id="interest-jot-end"></div>
-</div>
 
 
 <div id="likes-jot-wrapper" >
@@ -196,7 +194,6 @@ $lbl_likes
 
 </div>
 <div id="likes-jot-end"></div>
-</div>
 
 
 <div id="dislikes-jot-wrapper" >
@@ -208,7 +205,6 @@ $lbl_dislikes
 
 </div>
 <div id="dislikes-jot-end"></div>
-</div>
 
 
 <div id="contact-jot-wrapper" >
@@ -220,7 +216,6 @@ $lbl_social
 
 </div>
 <div id="contact-jot-end"></div>
-</div>
 
 
 <div class="profile-edit-submit-wrapper" >
@@ -238,7 +233,6 @@ $lbl_music
 
 </div>
 <div id="music-jot-end"></div>
-</div>
 
 <div id="book-jot-wrapper" >
 <p id="book-jot-desc" >
@@ -249,7 +243,6 @@ $lbl_book
 
 </div>
 <div id="book-jot-end"></div>
-</div>
 
 
 
@@ -262,7 +255,6 @@ $lbl_tv
 
 </div>
 <div id="tv-jot-end"></div>
-</div>
 
 
 
@@ -275,7 +267,6 @@ $lbl_film
 
 </div>
 <div id="film-jot-end"></div>
-</div>
 
 
 <div class="profile-edit-submit-wrapper" >
@@ -293,7 +284,6 @@ $lbl_love
 
 </div>
 <div id="romance-jot-end"></div>
-</div>
 
 
 
@@ -306,7 +296,6 @@ $lbl_work
 
 </div>
 <div id="work-jot-end"></div>
-</div>
 
 
 
@@ -319,7 +308,6 @@ $lbl_school
 
 </div>
 <div id="education-jot-end"></div>
-</div>
 
 
 
@@ -331,4 +319,4 @@ $lbl_school
 
 </form>
 </div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
+<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
index 325adb972..a42585597 100644
--- a/view/theme/dispy/conversation.tpl
+++ b/view/theme/dispy/conversation.tpl
@@ -1,3 +1,4 @@
+<div id="threads-begin"></div>
 {{ for $threads as $thread }}
 <div id="thread-wrapper-$thread.id" class="thread-wrapper">
 	{{ for $thread.items as $item }}
@@ -15,7 +16,7 @@
 	{{ endfor }}
 </div>
 {{ endfor }}
-
+<div id="threads-end"></div>
 <div id="conversation-end"></div>
 
 {{ if $dropping }}
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
index 794360165..48ab4364a 100644
--- a/view/theme/quattro/conversation.tpl
+++ b/view/theme/quattro/conversation.tpl
@@ -1,3 +1,4 @@
+<div id="threads-begin"></div>
 {{ for $threads as $thread }}
 <div id="thread-wrapper-$thread.id" class="thread-wrapper">
 	{{ for $thread.items as $item }}
@@ -21,7 +22,7 @@
 	{{ endfor }}
 </div>
 {{ endfor }}
-
+<div id="threads-end"></div>
 <div id="conversation-end"></div>
 
 {{ if $dropping }}
-- 
cgit v1.2.3