From e1c6b776c4c388b4671c0838c9d24feac42857c2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 9 May 2013 22:04:30 -0700
Subject: fix timeago on search items, and bring back app display for wall
 items - which took a bit of re-arranging of a lot of other stuff

---
 js/main.js               | 12 ++++++------
 view/tpl/conv_item.tpl   |  2 +-
 view/tpl/search_item.tpl |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/main.js b/js/main.js
index df161e386..01aea6b22 100644
--- a/js/main.js
+++ b/js/main.js
@@ -353,7 +353,7 @@ function updateConvItems(mode,data) {
 					$(this).attr('src',$(this).attr('dst'));
 				});
 				$('#' + prev).after($(this));
-				$("div.wall-item-ago").timeago();
+				$(".autotime").timeago();
 				// divgrow doesn't prevent itself from attaching a second (or 500th)
 				// "show more" div to a content region - it also has a few other
 				// issues related to how we're trying to use it. 
@@ -365,7 +365,7 @@ function updateConvItems(mode,data) {
 					$(this).attr('src',$(this).attr('dst'));
 				});
 				$('#' + ident).replaceWith($(this));
-				$("div.wall-item-ago").timeago();
+				$(".autotime").timeago();
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 
 			}
@@ -382,7 +382,7 @@ function updateConvItems(mode,data) {
 					$(this).attr('src',$(this).attr('dst'));
 				});
 				$('#threads-end').before($(this));
-				$("div.wall-item-ago").timeago();
+				$(".autotime").timeago();
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 
 			}
@@ -391,7 +391,7 @@ function updateConvItems(mode,data) {
 					$(this).attr('src',$(this).attr('dst'));
 				});
 				$('#' + ident).replaceWith($(this));
-				$("div.wall-item-ago").timeago();
+				$(".autotime").timeago();
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 			}
 		});
@@ -410,7 +410,7 @@ function updateConvItems(mode,data) {
 					$(this).attr('src',$(this).attr('dst'));
 				});
 				$('#' + prev).after($(this));
-				$("div.wall-item-ago").timeago();
+				$(".autotime").timeago();
 
 				//	$("div.wall-item-body").divgrow({ initialHeight: 400 });
 			}
@@ -893,7 +893,7 @@ jQuery.timeago.settings.strings = {
 };
 
 
-$("div.wall-item-ago").timeago();
+$(".autotime").timeago();
 //$("div.wall-item-body").divgrow({ initialHeight: 400 });
 
 //reCalcHeight();
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index a03b79a90..91a4bd35d 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -43,7 +43,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.isotime}}">{{$item.localtime}}</div>				
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index debc1d89d..4814187f9 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -30,7 +30,7 @@
 		<div class="wall-item-author">
 				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
 
-				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.isotime}}">{{$item.localtime}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
+				<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"><span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
 				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-- 
cgit v1.2.3