title of preview button incorrect, fix ability to upload to webpages

This commit is contained in:
friendica 2015-03-30 19:41:42 -07:00
parent cff7696e98
commit d3c064cc34
4 changed files with 7 additions and 4 deletions

View File

@ -146,6 +146,7 @@ function editblock_content(&$a) {
'$underline' => t('Underline'), '$underline' => t('Underline'),
'$quote' => t('Quote'), '$quote' => t('Quote'),
'$code' => t('Code'), '$code' => t('Code'),
'$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')),
'$upload' => t('Upload photo'), '$upload' => t('Upload photo'),
'$attach' => t('Attach file'), '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'), '$weblink' => t('Insert web link'),
@ -175,7 +176,7 @@ function editblock_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($channel['channel_id'])), '$profile_uid' => (intval($channel['channel_id'])),
'$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $itm[0]['app'], '$sourceapp' => $itm[0]['app'],
'$defexpire' => '', '$defexpire' => '',

View File

@ -170,7 +170,7 @@ function editlayout_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($owner)), '$profile_uid' => (intval($owner)),
'$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$defexpire' => '', '$defexpire' => '',

View File

@ -146,7 +146,7 @@ function editpost_content(&$a) {
'$acl' => '', '$acl' => '',
'$bang' => '', '$bang' => '',
'$profile_uid' => local_channel(), '$profile_uid' => local_channel(),
'$preview' => true, // ((feature_enabled(local_channel(),'preview')) ? t('Preview') : ''), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename), '$sourceapp' => t($a->sourcename),
'$catsenabled' => $catsenabled, '$catsenabled' => $catsenabled,

View File

@ -164,11 +164,13 @@ function editwebpage_content(&$a) {
$rp = 'webpages/' . $which; $rp = 'webpages/' . $which;
logger('canwrite: ' . (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')));
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $rp, '$return_path' => $rp,
'$webpage' => ITEM_WEBPAGE, '$webpage' => ITEM_WEBPAGE,
'$placeholdpagetitle' => t('Page link title'), '$placeholdpagetitle' => t('Page link title'),
'$pagetitle' => $page_title, '$pagetitle' => $page_title,
'$writefiles' => (perm_is_allowed($owner, get_observer_hash(), 'post_photos') || perm_is_allowed($owner, get_observer_hash(), 'write_storage')),
'$action' => 'item', '$action' => 'item',
'$share' => t('Edit'), '$share' => t('Edit'),
@ -207,7 +209,7 @@ function editwebpage_content(&$a) {
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
'$bang' => '', '$bang' => '',
'$profile_uid' => (intval($owner)), '$profile_uid' => (intval($owner)),
'$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''), '$preview' => t('Preview'),
'$jotplugins' => $jotplugins, '$jotplugins' => $jotplugins,
'$sourceapp' => $a->sourcename, '$sourceapp' => $a->sourcename,
'$defexpire' => '', '$defexpire' => '',