diff options
| -rwxr-xr-x | mod/editpost.php | 4 | ||||
| -rwxr-xr-x | view/jot-header.tpl | 2 | ||||
| -rwxr-xr-x | view/jot.tpl | 5 | ||||
| -rwxr-xr-x | view/theme/dispy/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/theme/duepuntozero/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/theme/loozah/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/theme/testbubble/jot.tpl | 2 |
7 files changed, 11 insertions, 8 deletions
diff --git a/mod/editpost.php b/mod/editpost.php index f23b305f0..778ac3dcc 100755 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -28,6 +28,10 @@ function editpost_content(&$a) { return; } + $plaintext = false; + if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) + $plaintext = true; + $o .= '<h2>' . t('Edit post') . '</h2>'; diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 02662d2d4..007f639b6 100755 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -11,12 +11,12 @@ function initEditor(cb){ if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000' }); - $(".jothidden").show(); editor = true; $("a#jot-perms-icon").fancybox({ 'transitionIn' : 'elastic', 'transitionOut' : 'elastic' }); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); return; } diff --git a/view/jot.tpl b/view/jot.tpl index f116dc0f0..1c19dd6fa 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -13,9 +13,7 @@ <input type="hidden" name="preview" id="jot-preview" value="0" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - {{ if $content }}<script>initEditor();</script>{{ endif }} - - + <ul id="jot-tools" class="jothidden" style="display:none"> <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li> <li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li> @@ -45,6 +43,7 @@ </form> +{{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index 0ceddb3b7..c312d221a 100755 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -24,7 +24,6 @@ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - {{ if $content }}<script>initEditor();</script>{{ endif }} <div id="profile-jot-submit-wrapper" style="display:none"> @@ -73,3 +72,4 @@ <div id="profile-jot-end"></div> </form> </div> + {{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl index ade1614b7..e356d1d8f 100755 --- a/view/theme/duepuntozero/jot.tpl +++ b/view/theme/duepuntozero/jot.tpl @@ -18,7 +18,6 @@ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - {{ if $content }}<script>initEditor();</script>{{ endif }} <div id="profile-jot-submit-wrapper" class="jothidden"> <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> @@ -81,3 +80,4 @@ <div id="profile-jot-end"></div> </form> </div> + {{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl index 9bda1868e..ac64223fb 100755 --- a/view/theme/loozah/jot.tpl +++ b/view/theme/loozah/jot.tpl @@ -19,7 +19,6 @@ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - {{ if $content }}<script>initEditor();</script>{{ endif }} <div id="profile-jot-submit-wrapper" style="display:none" class="jothidden"> <input type="submit" id="profile-jot-submit" name="submit" value="$share" /> @@ -82,3 +81,4 @@ <div id="profile-jot-end"></div> </form> </div> + {{ if $content }}<script>initEditor();</script>{{ endif }} diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl index e2fd7132a..5bb5b4673 100755 --- a/view/theme/testbubble/jot.tpl +++ b/view/theme/testbubble/jot.tpl @@ -20,7 +20,6 @@ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> - {{ if $content }}<script>initEditor();</script>{{ endif }} <div id="profile-upload-wrapper" class="jot-tool" style="display: none;" > <div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div> @@ -72,3 +71,4 @@ <div id="profile-jot-end"></div> </form> </div> + {{ if $content }}<script>initEditor();</script>{{ endif }} |