From b536116791f8cb010157126f2e73f029a83ab5fb Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 15 Jul 2013 18:43:34 +0200 Subject: more spin.js porting --- view/tpl/jot-header.tpl | 16 ++++++++-------- view/tpl/jot.tpl | 9 ++++----- view/tpl/msg-header.tpl | 12 ++++++------ 3 files changed, 18 insertions(+), 19 deletions(-) (limited to 'view') 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 @@ + +
+
+
{{if $showacl}}
@@ -69,10 +72,6 @@ {{$jotplugins}}
-
- -
-
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); }); } } -- cgit v1.2.3