diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-08-20 08:01:30 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-08-20 08:01:30 -0700 |
| commit | f3ba283613bb5bd39c0f39f96a2f91112f947923 (patch) | |
| tree | 9e31515169ab9e05f763d5ac8f625b8c3672b985 /view | |
| parent | add03b64985f79aa268514854e91d96b6880bb3d (diff) | |
| parent | 25fdc269bed74d2f1aaeb181906f50666fca1328 (diff) | |
| download | volse-hubzilla-f3ba283613bb5bd39c0f39f96a2f91112f947923.tar.gz volse-hubzilla-f3ba283613bb5bd39c0f39f96a2f91112f947923.tar.bz2 volse-hubzilla-f3ba283613bb5bd39c0f39f96a2f91112f947923.zip | |
Merge pull request #1 from friendica/master
Test update of my branched Red
Diffstat (limited to 'view')
| -rw-r--r-- | view/en/htconfig.tpl | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 1 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 29 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 6 |
4 files changed, 34 insertions, 4 deletions
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 0417e9af2..3e1269441 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -64,7 +64,7 @@ $a->config['system']['max_import_size'] = 200000; // maximum size of uploaded photos -$a->config['system']['maximagesize'] = 800000; +$a->config['system']['maximagesize'] = 3000000; // Location of PHP command line processor diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index abfeb44bc..f4c399735 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1882,6 +1882,7 @@ tr.mceLast { margin-right: 30px; } #prvmail-upload-wrapper, +#prvmail-attach-wrapper, #prvmail-link-wrapper, #prvmail-rotator-wrapper { float: left; diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 0be288709..5e2597605 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -54,7 +54,19 @@ else name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); + addeditortext(response); + $('#profile-rotator').spin(false); + } + } + ); + + var file_uploader = new window.AjaxUpload( + 'prvmail-attach', + { action: 'wall_attach/{{$nickname}}', + name: 'userfile', + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); $('#profile-rotator').spin(false); } } @@ -67,7 +79,7 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } @@ -86,11 +98,22 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } } + function addeditortext(data) { + if(plaintext == 'none') { + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); + } + else + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + + + </script> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 2ddf75544..164ba0c6d 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -26,6 +26,12 @@ <div id="prvmail-upload-wrapper" > <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div> </div> + + <div id="prvmail-attach-wrapper" > + <div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div> + </div> + + <div id="prvmail-link-wrapper" > <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div> </div> |