aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_plugins.tpl10
-rw-r--r--view/tpl/cdav_calendar.tpl10
-rw-r--r--view/tpl/chat.tpl24
-rwxr-xr-xview/tpl/conv_frame.tpl4
-rwxr-xr-xview/tpl/conv_item.tpl6
-rwxr-xr-xview/tpl/event_head.tpl8
-rwxr-xr-xview/tpl/events-js.tpl2
-rwxr-xr-xview/tpl/events_cal-js.tpl2
-rwxr-xr-xview/tpl/jot-header.tpl24
-rwxr-xr-xview/tpl/jot.tpl8
-rwxr-xr-xview/tpl/msg-header.tpl12
-rwxr-xr-xview/tpl/nav.tpl4
-rwxr-xr-xview/tpl/prv_message.tpl17
13 files changed, 73 insertions, 58 deletions
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}}
</div>
<div class="clear"></div>
- <div id="chat-rotator-wrapper" class="center-block">
- <div id="chat-rotator"></div>
+ <div id="chat-rotator" class="spinner-wrapper">
+ <div class="spinner s"></div>
</div>
<div class="clear"></div>
<div class="section-content-wrapper-np">
@@ -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('<div>'+response.repo.readme+'</div>');
@@ -187,4 +187,4 @@
}
}
-</script> \ No newline at end of file
+</script>
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() {
</div>
<div class="btn-group">
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
- <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+ <button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
</div>
<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
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 @@
</div>
<div id="chatContainer" class="section-content-wrapper">
<div id="chatTopBar">
+ <div id="chat-top-spinner" class="spinner-wrapper">
+ <div class="spinner m"></div>
+ </div>
<div id="chatLineHolder"></div>
</div>
<div class="clear"></div>
@@ -25,7 +28,7 @@
<div class="form-group">
<textarea id="chatText" name="chat_text" class="form-control"></textarea>
</div>
- <div id="chat-submit-wrapper">
+ <div id="chat-submit-wrapper" class="clearfix">
<div id="chat-submit" class="dropup pull-right">
<button class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><i class="fa fa-cog"></i></button>
<button class="btn btn-primary btn-sm" type="submit" id="chat-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
@@ -42,7 +45,7 @@
{{/if}}
</div>
</div>
- <div id="chat-tools" class="btn-toolbar pull-left">
+ <div id="chat-tools" class="btn-toolbar">
<div class="btn-group mr-2">
<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'chatText'); return false;">
<i class="fa fa-bold jot-icons"></i>
@@ -84,11 +87,12 @@
{{/if}}
</div>
</div>
+ <div class="btn-group">
+ <div id="chat-rotator" class="mt-2 spinner-wrapper">
+ <div class="spinner s"></div>
+ </div>
+ </div>
</div>
- <div id="chat-rotator-wrapper" class="pull-left">
- <div id="chat-rotator"></div>
- </div>
- <div class="clear"></div>
</div>
</form>
</div>
@@ -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 @@
<div id="threads-begin"></div>
<div id="threads-end"></div>
<div id="conversation-end"></div>
-<div id="page-spinner"></div>
+<div id="page-spinner" class="spinner-wrapper">
+ <div class="spinner m"></div>
+</div>
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}}
<div class="p-2 clearfix wall-item-tools">
<div class="float-right wall-item-tools-right">
+ <div class="btn-group">
+ <div id="like-rotator-{{$item.id}}" class="spinner-wrapper">
+ <div class="spinner s"></div>
+ </div>
+ </div>
{{if $item.toplevel && $item.emojis && $item.reactions}}
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-react-{{$item.id}}">
@@ -195,7 +200,6 @@
</div>
</div>
</div>
- <div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
{{if $item.responses || $item.attachments}}
<div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count && $item.attachments)}} btn-group{{/if}}">
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 @@
<button class="btn btn-success btn-sm" onclick="openClose('form');">{{$new_event.1}}</button>
<div class="btn-group">
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
- <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+ <button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
</div>
<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
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 @@
<div class="pull-right">
<div class="btn-group">
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
- <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+ <button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button>
<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
</div>
<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
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 @@
</div>
</div>
{{/if}}
- </div>
- <div id="profile-rotator-wrapper" class="float-left">
- <div id="profile-rotator"></div>
+ <div class="btn-group">
+ <div id="profile-rotator" class="mt-2 spinner-wrapper">
+ <div class="spinner s"></div>
+ </div>
+ </div>
</div>
<div id="profile-jot-submit-right" class="btn-group float-right">
{{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 @@
<form class="form-inline" method="get" action="search" role="search">
<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
</form>
- <div id="nav-search-spinner"></div>
+ <div id="nav-search-spinner" class="spinner-wrapper">
+ <div class="spinner s"></div>
+ </div>
</li>
<li class="nav-item" id="nav-search-btn">
<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index af6315c7e..59472f7d4 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -5,7 +5,7 @@
</div>
<div class="section-content-wrapper">
{{/if}}
- <div id="prvmail-wrapper" >
+ <div id="prvmail-wrapper">
<input id="invisible-wall-file-upload" type="file" name="files" style="visibility:hidden;position:absolute;top:-50;left:-50;width:0;height:0;" multiple>
<form id="prvmail-form" action="mail" method="post" >
<input type="hidden" id="inp-prvmail-expires" name="expires" value="{{$defexpire}}" />
@@ -31,12 +31,12 @@
<label for="prvmail-text">{{$yourmessage}}</label>
<textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
</div>
- <div id="prvmail-submit-wrapper" class="form-group">
+ <div id="prvmail-submit-wrapper" class="form-group clearfix">
<div id="prvmail-submit" class="float-right btn-group">
<button class="btn btn-outline-secondary btn-sm" id="prvmail-preview" title="{{$preview}}" onclick="preview_mail(); return false;"><i class="fa fa-eye"></i></button>
<button class="btn btn-primary btn-sm" type="submit" id="prvmail-submit" name="submit" value="{{$submit}}">{{$submit}}</button>
</div>
- <div id="prvmail-tools" class="btn-toolbar float-left">
+ <div id="prvmail-tools" class="btn-toolbar">
<div class="btn-group mr-2">
<button id="main-editor-bold" class="btn btn-outline-secondary btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'prvmail-text'); return false;">
<i class="fa fa-bold jot-icons"></i>
@@ -63,7 +63,7 @@
</button>
</div>
{{if $feature_expire || $feature_encrypt}}
- <div class="btn-group d-none d-lg-flex mr-2">
+ <div class="btn-group d-none d-lg-flex">
{{if $feature_expire}}
<button id="prvmail-expire-wrapper" class="btn btn-outline-secondary btn-sm" onclick="prvmailGetExpiry();return false;" >
<i id="prvmail-expires" class="fa fa-eraser jot-icons" title="{{$expires}}" ></i>
@@ -90,11 +90,12 @@
{{/if}}
</div>
</div>
+ <div class="btn-group">
+ <div id="prvmail-rotator" class="m-2 spinner-wrapper">
+ <div class="spinner s"></div>
+ </div>
+ </div>
</div>
- <div id="prvmail-rotator-wrapper" class="float-left">
- <div id="prvmail-rotator"></div>
- </div>
- <div class="clear"></div>
</div>
<div id="mail-preview-content" style="display: none;"></div>
</form>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 15:33:47 +0000