diff options
| author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
| commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
| tree | bbd512126515afc929de06dce79ba847b9681092 /view/theme/testbubble/jot.tpl | |
| parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
| parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
| download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip | |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'view/theme/testbubble/jot.tpl')
| -rwxr-xr-x | view/theme/testbubble/jot.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
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 }} |