mirror of https://github.com/friendica/friendica
post preview
This commit is contained in:
friendica
parent
805eb35a1a
commit
7011f71e8f
|
|
@ -136,6 +136,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
$profile_owner = 0;
|
||||
$page_writeable = false;
|
||||
|
||||
$previewing = (($preview) ? ' preview ' : '');
|
||||
|
||||
if($mode === 'network') {
|
||||
$profile_owner = local_user();
|
||||
$page_writeable = true;
|
||||
|
|
@ -261,7 +263,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
$body = prepare_body($item,true);
|
||||
|
||||
$tmp_item = replace_macros($tpl,array(
|
||||
'$id' => $item['item_id'],
|
||||
'$id' => (($preview) ? 'P0' : $item['item_id']),
|
||||
'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
|
||||
'$profile_url' => $profile_link,
|
||||
'$item_photo_menu' => item_photo_menu($item),
|
||||
|
|
@ -288,6 +290,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
'$dislike' => '',
|
||||
'$comment' => '',
|
||||
'$conv' => (($preview) ? '' : array('href'=> $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
|
||||
'$previewing' => $previewing,
|
||||
'$wait' => t('Please wait'),
|
||||
));
|
||||
|
||||
|
|
@ -624,6 +627,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
|||
'$like' => $like,
|
||||
'$dislike' => $dislike,
|
||||
'$comment' => $comment,
|
||||
'$previewing' => $previewing,
|
||||
'$wait' => t('Please wait'),
|
||||
|
||||
));
|
||||
|
|
@ -890,6 +894,7 @@ function status_editor($a,$x, $notes_cid = 0) {
|
|||
'$acl' => $x['acl'],
|
||||
'$bang' => $x['bang'],
|
||||
'$profile_uid' => $x['profile_uid'],
|
||||
'$preview' => t('Preview'),
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@
|
|||
if(data.preview) {
|
||||
|
||||
$("#comment-edit-preview-" + id).html(data.preview);
|
||||
$("#comment-edit-preview-" + id + " a").removeAttr('href');
|
||||
$("#comment-edit-preview-" + id + " a").click(function() { return false; });
|
||||
}
|
||||
},
|
||||
"json"
|
||||
|
|
@ -443,12 +443,12 @@
|
|||
function(data) {
|
||||
if(data.preview) {
|
||||
$("#jot-preview-content").html(data.preview);
|
||||
$("#jot-preview-content" + " a").removeAttr('href');
|
||||
$("#jot-preview-content" + " a").click(function() { return false; });
|
||||
}
|
||||
},
|
||||
"json"
|
||||
);
|
||||
$("#jot-preview").val("1");
|
||||
$("#jot-preview").val("0");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -201,6 +201,8 @@ function item_post(&$a) {
|
|||
|
||||
|
||||
if(! strlen($body)) {
|
||||
if($preview)
|
||||
killme();
|
||||
info( t('Empty post discarded.') . EOL );
|
||||
if(x($_POST,'return'))
|
||||
goaway($a->get_baseurl() . "/" . $return_path );
|
||||
|
|
@ -590,6 +592,7 @@ function item_post(&$a) {
|
|||
if($preview) {
|
||||
require_once('include/conversation.php');
|
||||
$o = conversation(&$a,array(array_merge($contact_record,$datarray)),'search',false,true);
|
||||
logger('preview: ' . $o);
|
||||
echo json_encode(array('preview' => $o));
|
||||
killme();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!--span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
|
||||
<div id="jot-preview-content" style="display:none;"></div-->
|
||||
<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
|
||||
<div id="jot-preview-content" style="display:none;"></div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
|
||||
<div class="wall-item-info" id="wall-item-info-$id">
|
||||
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
|
||||
|
|
|
|||
|
|
@ -247,6 +247,10 @@ div.wall-item-content-wrapper.shiny {
|
|||
background-repeat:no-repeat;
|
||||
}
|
||||
|
||||
.preview {
|
||||
background: #FFFFC8;
|
||||
}
|
||||
|
||||
/* from default */
|
||||
#jot-perms-icon,
|
||||
#profile-location,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
|
||||
<div class="wall-item-info" id="wall-item-info-$id">
|
||||
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-outside-wrapper$indent$previewing wallwall" id="wall-item-outside-wrapper-$id" >
|
||||
<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
|
||||
<div class="wall-item-info wallwall" id="wall-item-info-$id">
|
||||
<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
|
||||
|
|
|
|||
Loading…
Reference in New Issue