From 84805501449aa03e86d985f3e2d9734184cea0db Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 10 Feb 2012 17:29:37 +0100
Subject: quattro: add "view in context" link in search results

---
 view/search_item.tpl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/search_item.tpl b/view/search_item.tpl
index c4f3ccac7..de8bd2396 100755
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -78,6 +78,14 @@
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
 		<div class="wall-item-like" id="wall-item-like-$id">$like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>	
+		<div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div>
+		{{ if $conv }}
+		<div class="wall-item-conv" id="wall-item-conv-$id" >
+			<a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a>
+		{{ endif }}
+		</div>
 	</div>
+	
+	
 </div>
+
-- 
cgit v1.2.3


From ed38808aae6585bb6c31a18788f0290812bae2f8 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 10 Feb 2012 17:30:22 +0100
Subject: hidden jot in "display" to allow reshare

---
 view/jot-header.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view')

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 22b434916..482fb0e0d 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -215,6 +215,9 @@ function enableOnUser(){
 			initEditor(function(){
 				addeditortext(data);
 				$('#like-rotator-' + id).hide();
+				if ($('#jot-popup').length != 0){
+					$('#jot-popup').show();
+				} 
 				$(window).scrollTop(0);
 			});
 
-- 
cgit v1.2.3


From 3e664dbdfe4a7b0d27a7dd317ab7e85853822275 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 13 Feb 2012 09:33:20 +0100
Subject: reshare in "display" view

---
 view/jot-header.tpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 482fb0e0d..251b9cdd0 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -209,15 +209,14 @@ function enableOnUser(){
 	}
 
 	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
 			if (!editor) $("#profile-jot-text").val("");
 			initEditor(function(){
 				addeditortext(data);
 				$('#like-rotator-' + id).hide();
-				if ($('#jot-popup').length != 0){
-					$('#jot-popup').show();
-				} 
 				$(window).scrollTop(0);
 			});
 
-- 
cgit v1.2.3


From 16d3bc9deb5cb80f438a53f1bf483c79351674af Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 13 Feb 2012 09:35:11 +0100
Subject: quattro: pause icon

---
 view/theme/quattro/quattro.less | 7 +++++++
 view/theme/quattro/style.css    | 5 +++++
 2 files changed, 12 insertions(+)

(limited to 'view')

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c9fda0e1d..1724ff30f 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -503,6 +503,13 @@ section {
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
 
+
+#pause {
+ position: fixed;
+ bottom: 5px;
+ right: 5px;
+}
+
 /* contacts menu */
 .contact-photo-wrapper { position: relative; }
 .contact-photo { 
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 41adcd8d2..8ff57813f 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -844,6 +844,11 @@ section {
   width: 25px;
   height: 25px;
 }
+#pause {
+  position: fixed;
+  bottom: 5px;
+  right: 5px;
+}
 /* contacts menu */
 .contact-photo-wrapper {
   position: relative;
-- 
cgit v1.2.3


From 8369c243b321a421ea2ab92a49d8995b5724244e Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 13 Feb 2012 10:19:10 +0100
Subject: Fix 'item not found' message

---
 view/jot-header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 251b9cdd0..02662d2d4 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -118,7 +118,7 @@ function enableOnUser(){
 }
 
 </script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
 <script>
 	var ispublic = '$ispublic';
 	var addtitle = '$addtitle';
-- 
cgit v1.2.3