diff options
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/msg-header.tpl | 28 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 14 |
2 files changed, 21 insertions, 21 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 503e4c8cc..85fa51b0a 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -52,10 +52,10 @@ else 'prvmail-upload-wrapper', { action: 'wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); @@ -64,23 +64,23 @@ else 'prvmail-attach-wrapper', { action: 'wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onSubmit: function(file,ext) { $('#prvmail-rotator').spin('tiny'); }, onComplete: function(file,response) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(response); + $('#prvmail-rotator').spin(false); } } ); }); - function jotGetLink() { + function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } @@ -103,15 +103,15 @@ else event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#profile-rotator').spin('tiny'); + $('#prvmail-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - addeditortext(response); - $('#profile-rotator').spin(false); + addmailtext(data); + $('#prvmail-rotator').spin(false); }); } } - function addeditortext(data) { + function addmailtext(data) { if(plaintext == 'none') { var currentText = $("#prvmail-text").val(); $("#prvmail-text").val(currentText + data); diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 709943541..c6f393aa4 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -34,21 +34,21 @@ <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i> </button> - <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" > - <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i> + <button id="prvmail-link-wrapper" class="btn btn-default btn-sm" onclick="prvmailJotGetLink(); return false;" > + <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" ></i> </button> {{if $feature_expire}} - <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" > - <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" onclick="prvmailGetExpiry();return false;"></i> + <button id="prvmail-expire-wrapper" class="btn btn-default btn-sm" onclick="prvmailGetExpiry();return false;" > + <i id="prvmail-expires" class="icon-eraser jot-icons" title="{{$expires}}" ></i> </button> {{/if}} {{if $feature_encrypt}} - <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" > - <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"></i> + <button id="prvmail-encrypt-wrapper" class="btn btn-default btn-sm" onclick="red_encrypt('{{$cipher}}','#prvmail-text',$('#prvmail-text').val());return false;"> + <i id="prvmail-encrypt" class="icon-key jot-icons" title="{{$encrypt}}" ></i> </button> {{/if}} <div id="prvmail-rotator-wrapper" > - <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> + <div id="prvmail-rotator"></div> </div> </div> <div id="prvmail-end"></div> |