diff options
| -rw-r--r-- | view/css/conversation.css | 7 | ||||
| -rw-r--r-- | view/tpl/connection_template.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/contact_edit_modal.tpl | 11 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/conv_list.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/search_item.tpl | 2 |
6 files changed, 18 insertions, 10 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index fa5bfbe0a..93964cd08 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -364,3 +364,10 @@ img.smiley.emoji:hover { left: .65rem; top: .65rem; } + +.contact-edit-rotator .spinner.s { + border-left: .2rem solid rgba(254, 254, 254, .5); + border-right: .2rem solid rgba(254, 254, 254, .5); + border-bottom: .2rem solid rgba(254, 254, 254, .5); + border-top: .2rem solid rgba(254, 254, 254, .9); +} diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index 1c8b4be11..ffd02f352 100644 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -8,8 +8,8 @@ {{/if}} <span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span> <button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}"> - <i id="contact-edit-icon-{{$contact.id}}" class="fa fa-fw fa-pencil"></i> - <div id="contact-edit-rotator-{{$contact.id}}" class="spinner-wrapper" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div> + <i class="fa fa-fw fa-pencil contact-edit-icon-{{$contact.id}}"></i> + <div class="spinner-wrapper contact-edit-rotator-{{$contact.id}}" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div> {{$contact.edit}} </button> diff --git a/view/tpl/contact_edit_modal.tpl b/view/tpl/contact_edit_modal.tpl index 9e958c3a9..ddb1557c1 100644 --- a/view/tpl/contact_edit_modal.tpl +++ b/view/tpl/contact_edit_modal.tpl @@ -103,9 +103,10 @@ function init_contact_edit(poi) { if (!poi) - return - $('#contact-edit-rotator-' + poi).addClass('d-inline-block'); - $('#contact-edit-icon-' + poi).hide(); + return; + + $('.contact-edit-rotator-' + poi).addClass('d-inline-block'); + $('.contact-edit-icon-' + poi).hide(); $.get('contactedit/' + poi, function(data) { if (!data.success) { $.jGrowl(data.message, {sticky: false, theme: 'notice', life: 10000}); @@ -119,8 +120,8 @@ function activate(data) { $('#contact-save').removeClass('disabled'); $('#contact-tools').removeClass('disabled'); - $('#contact-edit-rotator-' + poi).removeClass('d-inline-block'); - $('#contact-edit-icon-' + poi).show(); + $('.contact-edit-rotator-' + poi).removeClass('d-inline-block'); + $('.contact-edit-icon-' + poi).show(); if (data.title) { $('#edit-modal-title').html(data.title); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 2d39d0be7..415f24ece 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -36,7 +36,7 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> {{if $item.contact_id}} - <div id="contact-edit-rotator-{{$item.contact_id}}" class="spinner-wrapper contact-edit-rotator"><div class="spinner s"></div></div> + <div class="spinner-wrapper contact-edit-rotator contact-edit-rotator-{{$item.contact_id}}"><div class="spinner s"></div></div> {{/if}} <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" loading="lazy" data-bs-toggle="dropdown" /> {{if $item.author_is_group_actor}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 30c9e980d..fde78e71e 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -30,7 +30,7 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> {{if $item.contact_id}} - <div id="contact-edit-rotator-{{$item.contact_id}}" class="spinner-wrapper contact-edit-rotator"><div class="spinner s"></div></div> + <div class="spinner-wrapper contact-edit-rotator contact-edit-rotator-{{$item.contact_id}}"><div class="spinner s"></div></div> {{/if}} <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /></a> {{if $item.author_is_group_actor}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index bcd6af9b2..7b63d83b8 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -24,7 +24,7 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> {{if $item.contact_id}} - <div id="contact-edit-rotator-{{$item.contact_id}}" class="spinner-wrapper contact-edit-rotator"><div class="spinner s"></div></div> + <div class="spinner-wrapper contact-edit-rotator contact-edit-rotator-{{$item.contact_id}}"><div class="spinner s"></div></div> {{/if}} <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /> {{if $item.author_is_group_actor}} |