diff options
| -rwxr-xr-x | view/tpl/jot-header.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/msg-header.tpl | 12 |
3 files changed, 18 insertions, 19 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 3afc98737..260d742b3 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -123,10 +123,10 @@ function enableOnUser(){ 'wall-image-upload', { action: '{{$baseurl}}/wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); } } ); @@ -134,10 +134,10 @@ function enableOnUser(){ 'wall-file-upload', { action: '{{$baseurl}}/wall_attach/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { addeditortext(response); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); } } ); @@ -167,10 +167,10 @@ function enableOnUser(){ reply = prompt("{{$linkurl}}"); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { addeditortext(data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); } } @@ -224,12 +224,12 @@ function enableOnUser(){ event.preventDefault(); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); }); } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index f3410c5f4..1a23a284e 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -51,7 +51,10 @@ </div> <div id="profile-nolocation-wrapper" style="display: none;" > <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a> - </div> + </div> + <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > + <div id="profile-rotator"></div> + </div> {{if $showacl}} <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > @@ -69,10 +72,6 @@ {{$jotplugins}} </div> - <div id="profile-rotator-wrapper" style="display: {{$visitor}};" > - <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> - </div> - <div id="jot-preview-content" style="display:none;"></div> <div style="display: none;"> diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 4c47e1d6d..39fc30200 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -58,10 +58,10 @@ else 'prvmail-upload', { action: 'wall_upload/{{$nickname}}', name: 'userfile', - onSubmit: function(file,ext) { $('#profile-rotator').show(); }, + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { tinyMCE.execCommand('mceInsertRawHTML',false,response); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); } } ); @@ -71,10 +71,10 @@ else function jotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); } } @@ -90,10 +90,10 @@ else event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#profile-rotator').show(); + $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { tinyMCE.execCommand('mceInsertRawHTML',false,data); - $('#profile-rotator').hide(); + $('#profile-rotator').spin(false); }); } } |