diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 19:54:16 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 19:54:16 -0700 |
| commit | db58b6223503a63f92cccddd87179ae8e3ae1e46 (patch) | |
| tree | 935315e6f8ffa412eb6b091a98d34955efe5a09f | |
| parent | f3b560b4535594d1b1189a3d3a5b7070f8e96beb (diff) | |
| download | volse-hubzilla-db58b6223503a63f92cccddd87179ae8e3ae1e46.tar.gz volse-hubzilla-db58b6223503a63f92cccddd87179ae8e3ae1e46.tar.bz2 volse-hubzilla-db58b6223503a63f92cccddd87179ae8e3ae1e46.zip | |
don't auto-open the editor in forum mode. Save the forum selection text until we open it.
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | mod/editblock.php | 1 | ||||
| -rw-r--r-- | mod/editlayout.php | 1 | ||||
| -rw-r--r-- | mod/editpost.php | 1 | ||||
| -rw-r--r-- | mod/editwebpage.php | 1 | ||||
| -rw-r--r-- | mod/network.php | 2 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 3 |
7 files changed, 9 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php index a3fdf39df..fb8ef8585 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1137,6 +1137,7 @@ function status_editor($a, $x, $popup = false) { '$newpost' => 'true', '$baseurl' => $a->get_baseurl(true), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$pretext' => ((x($x,'pretext')) ? $x['pretext'] : ''), '$geotag' => $geotag, '$nickname' => $x['nickname'], '$ispublic' => t('Visible to <strong>everybody</strong>'), diff --git a/mod/editblock.php b/mod/editblock.php index b4d954ef5..9269676b1 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -111,6 +111,7 @@ function editblock_content(&$a) { $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$pretext' => '', '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => '', '$nickname' => $channel['channel_address'], diff --git a/mod/editlayout.php b/mod/editlayout.php index 6ea7f4100..fc68cfe3c 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -105,6 +105,7 @@ function editlayout_content(&$a) { $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$pretext' => '', '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => $geotag, '$nickname' => $channel['channel_address'], diff --git a/mod/editpost.php b/mod/editpost.php index daca7c154..d4dc35ef8 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -47,6 +47,7 @@ function editpost_content(&$a) { $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$pretext' => '', '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => $geotag, '$nickname' => $channel['channel_address'], diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 974e8cc38..0192fd9c0 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -146,6 +146,7 @@ function editwebpage_content(&$a) { $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( '$baseurl' => $a->get_baseurl(), '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$pretext' => '', '$ispublic' => ' ', // t('Visible to <strong>everybody</strong>'), '$geotag' => $geotag, '$nickname' => $channel['channel_address'], diff --git a/mod/network.php b/mod/network.php index 3614c81d6..82c68424c 100644 --- a/mod/network.php +++ b/mod/network.php @@ -172,7 +172,7 @@ function network_content(&$a, $update = 0, $load = false) { 'profile_uid' => local_channel() ); if($deftag) - $x['body'] = $deftag; + $x['pretext'] = $deftag; $status_editor = status_editor($a,$x); $o .= $status_editor; diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 49369ab63..7e12c6bb3 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -3,6 +3,7 @@ var editor = false; var textlen = 0; var plaintext = '{{$editselect}}'; +var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ @@ -21,6 +22,8 @@ function initEditor(cb){ }); $(".jothidden").show(); if (typeof cb!="undefined") cb(); + if(pretext.length) + addeditortext(pretext); return; } tinyMCE.init({ |