From ea5262a0df3d6f8ed6c1d26f272982c9ee6cbf8e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 26 Sep 2017 13:02:11 +0200 Subject: get rid of spinner.js in use a lightweight css spinner instead --- view/tpl/admin_plugins.tpl | 10 +++++----- view/tpl/cdav_calendar.tpl | 10 +++++----- view/tpl/chat.tpl | 24 ++++++++++++++---------- view/tpl/conv_frame.tpl | 4 +++- view/tpl/conv_item.tpl | 6 +++++- view/tpl/event_head.tpl | 8 ++++---- view/tpl/events-js.tpl | 2 +- view/tpl/events_cal-js.tpl | 2 +- view/tpl/jot-header.tpl | 24 ++++++++++++------------ view/tpl/jot.tpl | 8 +++++--- view/tpl/msg-header.tpl | 12 ++++++------ view/tpl/nav.tpl | 4 +++- view/tpl/prv_message.tpl | 17 +++++++++-------- 13 files changed, 73 insertions(+), 58 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index fd5ae7d5e..adc0db434 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -41,8 +41,8 @@ {{$form}}
-
-
+
@@ -75,11 +75,11 @@ $("#generic-modal-ok-{{$newRepoModalID}}").addClass('btn-primary'); var repoURL = $('#id_repoURL').val(); var repoName = $('#id_repoName').val(); - $('#chat-rotator').spin('tiny'); + $('#chat-rotator').show(); $.post( "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, function(response) { - $('#chat-rotator').spin(false); + $('#chat-rotator').hide(); if (response.success) { var modalBody = $('#generic-modal-body-{{$newRepoModalID}}'); modalBody.html('
'+response.repo.readme+'
'); @@ -187,4 +187,4 @@ } } - \ No newline at end of file + diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 5d683d751..b0245e853 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -129,11 +129,11 @@ $(document).ready(function() { }, loading: function(isLoading, view) { - $('#events-spinner').spin('tiny'); - $('#events-spinner > i').css('color', 'transparent'); + $('#events-spinner').show(); + $('#today-btn > i').hide(); if(!isLoading) { - $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', ''); + $('#events-spinner').hide(); + $('#today-btn > i').show(); } } }); @@ -292,7 +292,7 @@ function on_more() {
- +
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 22f3465bf..c189cbd15 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -16,6 +16,9 @@
+
@@ -25,7 +28,7 @@
-
+
@@ -42,7 +45,7 @@ {{/if}}
-
+
+
+ +
-
-
-
-
@@ -101,7 +105,7 @@ var last_chat = 0; var chat_timer = null; $(document).ready(function() { - $('#chatTopBar').spin('small'); + $('#chat-top-spinner').show(); chat_timer = setTimeout(load_chats,300); $('#chatroom_bookmarks, #vcard').hide(); $('#chatroom_list, #chatroom_members').show(); @@ -134,7 +138,7 @@ function load_chats() { if(data.success && (! stopped)) { update_inroom(data.inroom); update_chats(data.chats); - $('#chatTopBar').spin(false); + $('#chat-top-spinner').hide(); } }); @@ -293,10 +297,10 @@ function toggleChatNotifications() { function chatJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#chat-rotator').spin('tiny'); + $('#chat-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); - $('#chat-rotator').spin(false); + $('#chat-rotator').hide(); }); } } diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl index 1f0e00db4..8aa865076 100755 --- a/view/tpl/conv_frame.tpl +++ b/view/tpl/conv_frame.tpl @@ -1,6 +1,8 @@
-
+ diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b3fe60750..b0c143f4a 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -86,6 +86,11 @@ {{/if}}
+
+ +
{{if $item.toplevel && $item.emojis && $item.reactions}}
-
{{if $item.responses || $item.attachments}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 3b2cb5041..2f440e826 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -67,11 +67,11 @@ showEvent(calEvent.id); }, loading: function(isLoading, view) { - $('#events-spinner').spin('tiny'); - $('#events-spinner > i').css('color', 'transparent'); + $('#events-spinner').show(); + $('#today-btn > i').hide(); if(!isLoading) { - $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', ''); + $('#events-spinner').hide(); + $('#today-btn > i').show(); $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 9d32c76be..d3f3414ff 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -11,7 +11,7 @@
- +
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index ba9e16dd6..2c4d961f9 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -4,7 +4,7 @@
- +
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 2d37b3ca2..2f9dd9f15 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -6,10 +6,10 @@ var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ - $("#profile-jot-text-loading").spin('small').show(); + $("#profile-jot-text-loading").show(); {{$geotag}} if(plaintext == 'none') { - $("#profile-jot-text-loading").spin(false).hide(); + $("#profile-jot-text-loading").hide(); $("#profile-jot-text").css({ 'height': 200 }); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode @@ -80,7 +80,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").spin(false).hide(); + $("#profile-jot-text-loading").hide(); $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -121,7 +121,7 @@ var activeCommentText = ''; dropZone: $('#profile-jot-text'), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); data.submit(); }, done: function(e,data) { @@ -130,7 +130,7 @@ var activeCommentText = ''; }, stop: function(e,data) { preview_post(); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }, }); @@ -204,11 +204,11 @@ var activeCommentText = ''; reply = prompt("{{$linkurl}}"); if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { addeditortext(data); preview_post(); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }); } } @@ -254,12 +254,12 @@ var activeCommentText = ''; else { if ($('#jot-popup').length != 0) $('#jot-popup').show(); - $('#like-rotator-' + id).spin('tiny'); + $('#like-rotator-' + id).show(); $.get('{{$baseurl}}/share/' + id, function(data) { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#like-rotator-' + id).spin(false); + $('#like-rotator-' + id).hide(); $(window).scrollTop(0); }); }); @@ -312,17 +312,17 @@ var activeCommentText = ''; if(reply && reply.length) { reply = bin2hex(reply); - $('#profile-rotator').spin('tiny'); + $('#profile-rotator').show(); $.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) { if(commentwin) { $(editwin).val( $(editwin).val() + data ); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); } else { if (!editor) $("#profile-jot-text").val(""); initEditor(function(){ addeditortext(data); - $('#profile-rotator').spin(false); + $('#profile-rotator').hide(); }); } }); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ce17f2f24..13e7602be 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -168,9 +168,11 @@
{{/if}} - -
-
+
+ +
{{if $preview}} diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 48bf5de4b..d71d432fb 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -12,7 +12,7 @@ dropZone: $('#prvmail-text'), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); data.submit(); }, done: function(e,data) { @@ -21,7 +21,7 @@ }, stop: function(e,data) { preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }, }); @@ -34,11 +34,11 @@ function prvmailJotGetLink() { reply = prompt("{{$linkurl}}"); if(reply && reply.length) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }); } } @@ -61,11 +61,11 @@ event.target.textContent = reply; event.preventDefault(); if(reply && reply.length) { - $('#prvmail-rotator').spin('tiny'); + $('#prvmail-rotator').show(); $.get('linkinfo?f=&url=' + reply, function(data) { addmailtext(data); preview_mail(); - $('#prvmail-rotator').spin(false); + $('#prvmail-rotator').hide(); }); } } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index f21017076..72860aebe 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -191,7 +191,9 @@ - +
{{/if}} -
+
@@ -31,12 +31,12 @@
-
+
-
+
{{if $feature_expire || $feature_encrypt}} -
+
{{if $feature_expire}}
+
+ +
-
-
-
-
-- cgit v1.2.3