Browse Source

Merge branch 'develop' of https://forge.laclic.fr/Laclic/SovBundle into develop

feature/symfony6.1
Charly 3 years ago
parent
commit
1c40111b27
4 changed files with 16 additions and 1 deletions
  1. +1
    -0
      Resources/assets/app/adminlte/index/index.scss
  2. +3
    -0
      Resources/assets/app/adminlte/main/init.js
  3. +2
    -0
      Resources/assets/functions/widgets.js
  4. +10
    -1
      Resources/views/adminlte/crud/index.html.twig

+ 1
- 0
Resources/assets/app/adminlte/index/index.scss View File

@@ -40,3 +40,4 @@ table th.filtered{border-top:2px solid var(--primary);}
.card-body table th.sorted, table th.sorting_asc, table th.sorting_desc{border-top:2px solid var(--success);}
.card-body table th.sorted.filtered{border-top:0px; position: relative;}
.card-body table th.sorted.filtered:after{ content: ''; height: 2px; position: absolute; left: 0; width: 100%; right: 0; top: -1px; background: linear-gradient(to right, var(--success) 0%, var(--success) 50%, var(--primary) 50%, var(--primary) 100%);}
.link-as-text{color: #212529; }

+ 3
- 0
Resources/assets/app/adminlte/main/init.js View File

@@ -1,5 +1,8 @@
window.addEventListener('load', (event) => {

$(document).on('select2:open', () => {
document.querySelector('.select2-search__field').focus();
});

SovNotification.init();


+ 2
- 0
Resources/assets/functions/widgets.js View File

@@ -34,6 +34,8 @@ export class SovWidgets {
});
SovTools.log(myselect);

myselect.off('select2:open')

return myselect;
}
}

+ 10
- 1
Resources/views/adminlte/crud/index.html.twig View File

@@ -141,7 +141,16 @@
{% for field in entity.fields %}
<td class="{{ field.property == sort_field_name ? 'sorted' }} text-{{ field.textAlign }} {{ field.cssClass }}"
dir="{{ ea.i18n.textDirection }}">
{{ include(field.templatePath, { field: field, entity: entity }, with_context = false) }}
{# {% if (field.property == 'id' or field.property == 'title') %}#}
{# #}{# {% if (field == 'title' or field== 'id') and (metadata.dataType=="string" or metadata.dataType=="integer") and _entity_config.name != 'ProductFamilyAdvancedEditing' %} #}
{# <a class="link-as-text"#}
{# href="{{ ea_url_short(null, 'edit', entity.instance.id) }}">#}
{# {{ include(field.templatePath, { field: field, entity: entity }, with_context = false) }}#}

{# </a>#}
{# {% else %}#}
{{ include(field.templatePath, { field: field, entity: entity }, with_context = false) }}
{# {% endif %}#}
</td>
{% endfor %}


Loading…
Cancel
Save