move jotnets to jot and some cleanup (mostly whitespace)

This commit is contained in:
Mario Vavti
2016-08-21 15:43:03 +02:00
parent e4244c0cac
commit 4f62d7a78f
10 changed files with 124 additions and 103 deletions

View File

@@ -140,7 +140,8 @@ class Channel extends \Zotlabs\Web\Controller {
'profile_uid' => \App::$profile['profile_uid'],
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
$o .= status_editor($a,$x);

View File

@@ -73,7 +73,8 @@ class Display extends \Zotlabs\Web\Controller {
'expanded' => true,
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
$o = '<div id="jot-popup">';

View File

@@ -159,7 +159,7 @@ class Network extends \Zotlabs\Web\Controller {
'allow_gid' => $channel['channel_allow_gid'],
'deny_cid' => $channel['channel_deny_cid'],
'deny_gid' => $channel['channel_deny_gid']
);
);
$private_editing = ((($group || $cid) && (! intval($_GET['pf']))) ? true : false);
@@ -176,7 +176,8 @@ class Network extends \Zotlabs\Web\Controller {
'profile_uid' => local_channel(),
'editor_autocomplete' => true,
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
if($deftag)
$x['pretext'] = $deftag;

View File

@@ -126,7 +126,8 @@ class Rpost extends \Zotlabs\Web\Controller {
'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''),
'return_path' => 'rpost/return',
'bbco_autocomplete' => 'bbcode',
'bbcode' => true
'bbcode' => true,
'jotnets' => true
);
$editor = status_editor($a,$x);