Merge pull request #34 from fabrixxm/master

Allow reshare in display view

4 files changed, 24 insertions, 2 deletions

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 22b434916..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';
@@ -209,6 +209,8 @@ 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("");
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>
+
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 0d58000e6..ac84e0eff 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -547,6 +547,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 49d57eb37..0f5db6fe1 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -891,6 +891,11 @@ section {
   width: 25px;
   height: 25px;
 }
+#pause {
+  position: fixed;
+  bottom: 5px;
+  right: 5px;
+}
 /* contacts menu */
 .contact-photo-wrapper {
   position: relative;