aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2012-02-13 01:30:42 -0800
committerfabrixxm <fabrix.xm@gmail.com>2012-02-13 01:30:42 -0800
commitf84309eb9202cb5917f05ca9cfe3a83a953fef0a (patch)
tree065e7fcef74e17d63072d386481cce8483772000
parent85c831bcbf6f4cc2793d91e4e3fb3da5828a3f60 (diff)
parent8369c243b321a421ea2ab92a49d8995b5724244e (diff)
downloadvolse-hubzilla-f84309eb9202cb5917f05ca9cfe3a83a953fef0a.tar.gz
volse-hubzilla-f84309eb9202cb5917f05ca9cfe3a83a953fef0a.tar.bz2
volse-hubzilla-f84309eb9202cb5917f05ca9cfe3a83a953fef0a.zip
Merge pull request #34 from fabrixxm/master
Allow reshare in display view
-rwxr-xr-xinclude/conversation.php12
-rwxr-xr-xmod/display.php18
-rwxr-xr-xview/jot-header.tpl4
-rwxr-xr-xview/search_item.tpl10
-rwxr-xr-xview/theme/quattro/quattro.less7
-rwxr-xr-xview/theme/quattro/style.css5
6 files changed, 51 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 35abb29ca..b44d4acd6 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -489,7 +489,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
$likebuttons = '';
- $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false);
+ $shareable = ((($profile_owner == local_user()) && (! $item['private'])) ? true : false); //($mode != 'display') &&
if($page_writeable) {
if($toplevelpost) {
@@ -821,7 +821,7 @@ function format_like($cnt,$arr,$type,$id) {
}}
-function status_editor($a,$x, $notes_cid = 0) {
+function status_editor($a,$x, $notes_cid = 0, $popup=false) {
$o = '';
@@ -885,7 +885,7 @@ function status_editor($a,$x, $notes_cid = 0) {
$o .= replace_macros($tpl,array(
'$return_path' => $a->cmd,
- '$action' => 'item',
+ '$action' => $a->get_baseurl().'/item',
'$share' => (($x['button']) ? $x['button'] : t('Share')),
'$upload' => t('Upload photo'),
'$shortupload' => t('upload photo'),
@@ -924,6 +924,12 @@ function status_editor($a,$x, $notes_cid = 0) {
'$preview' => t('Preview'),
));
+
+ if ($popup==true){
+ $o = '<div id="jot-popup" style="display: none;">'.$o.'</div>';
+
+ }
+
return $o;
}
diff --git a/mod/display.php b/mod/display.php
index 02f080a79..d96be4333 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -11,6 +11,7 @@ function display_content(&$a) {
require_once("include/bbcode.php");
require_once('include/security.php');
require_once('include/conversation.php');
+ require_once('include/acl_selectors.php');
$o = '<div id="live-display"></div>' . "\r\n";
@@ -66,6 +67,23 @@ function display_content(&$a) {
notice( t('Access to this profile has been restricted.') . EOL);
return;
}
+
+ if ($is_owner)
+ $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+
+ $x = array(
+ 'is_owner' => true,
+ 'allow_location' => $a->user['allow_location'],
+ 'default_location' => $a->user['default_location'],
+ 'nickname' => $a->user['nickname'],
+ 'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+ 'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
+ 'bang' => (($group || $cid) ? '!' : ''),
+ 'visitor' => 'block',
+ 'profile_uid' => local_user()
+ );
+ $o .= status_editor($a,$x,0,true);
+
$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
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;