TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

prevent duplicate ids and adjust spinner color

Browse Source
This commit is contained in:
Mario
2022-01-19 13:18:47 +00:00
parent d98d56c3b5
commit c742f25801
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
view/css/conversation.css
View File

@@ -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);
}

4
view/tpl/connection_template.tpl
View File

@@ -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>

11
view/tpl/contact_edit_modal.tpl
View File

@@ -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);

2
view/tpl/conv_item.tpl
View File

@@ -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}}

2
view/tpl/conv_list.tpl
View File

@@ -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}}

2
view/tpl/search_item.tpl
View File

@@ -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}}