Browse Source

Correctif & improvement trad

develop
Fabien Normand 3 years ago
parent
commit
c08f85fc50
7 changed files with 17 additions and 7 deletions
  1. BIN
      Resources/assets/app/adminlte/main/img/stripe.png
  2. BIN
      Resources/assets/app/adminlte/main/img/stripped.png
  3. +3
    -1
      Resources/assets/app/adminlte/main/scss/_common.scss
  4. +1
    -1
      Resources/views/admin/ticket/macro.html.twig
  5. +9
    -1
      Resources/views/adminlte/crud/field/association_many.html.twig
  6. +2
    -2
      Translation/TranslatorAdmin.php
  7. +2
    -2
      Twig/TranslatorTwigExtension.php

BIN
Resources/assets/app/adminlte/main/img/stripe.png View File

Before After
Width: 456  |  Height: 456  |  Size: 143KB

BIN
Resources/assets/app/adminlte/main/img/stripped.png View File

Before After
Width: 40  |  Height: 40  |  Size: 8.9KB

+ 3
- 1
Resources/assets/app/adminlte/main/scss/_common.scss View File

@@ -147,4 +147,6 @@ table.fixedHeader-floating {

.hidden {
display: none;
}
}

.badge.stripped{background-image: url('../img/stripped.png');}

+ 1
- 1
Resources/views/admin/ticket/macro.html.twig View File

@@ -21,7 +21,7 @@
{% include '@LcSov/admin/ticket/field/lastmessage.html.twig' %}
</td>
<td>
<a class="btn-sm btn-success" data-toggle="tooltip" title="{{ 'detail'|sov_trans_admin_action('Ticket') }}"
<a class="btn-sm btn-success" data-toggle="tooltip" title="{{ 'detail'|sov_trans_admin_action }}"
href="{{ ea_url_short("App\\Controller\\Ticket\\TicketAdminController", 'detail', ticket.id) }}">
<i class="fas fa-eye"></i>
</a>

+ 9
- 1
Resources/views/adminlte/crud/field/association_many.html.twig View File

@@ -1,3 +1,11 @@
{% for entity in field.value %}
<span class="badge badge-secondary">{{ entity }}</span>
{% if field.customOption('crudControllerFqcn') is not null and entity is not null%}
<a href="{{ ea_url_short(field.customOption('crudControllerFqcn'), 'edit', entity.id) }}">
<span class="badge badge-secondary">
{{ entity }}
</span>
</a>
{% else %}
<span class="badge badge-secondary">{{ entity }}</span>
{% endif %}
{% endfor %}

+ 2
- 2
Translation/TranslatorAdmin.php View File

@@ -16,9 +16,9 @@ class TranslatorAdmin
$this->translator = $translator;
}

public function transAction($action): string
public function transAction($action, $params=[]): string
{
return $this->trans('action.' . $action);
return $this->trans('action.' . $action, $params);
}

public function transMenu($menu, $params = []): string

+ 2
- 2
Twig/TranslatorTwigExtension.php View File

@@ -117,9 +117,9 @@ class TranslatorTwigExtension extends AbstractExtension
return $this->translatorAdmin->transMenu($menuName, $params);;
}

public function transAdminAction($actionName)
public function transAdminAction($actionName, $params = [])
{
return $this->translatorAdmin->transAction($actionName);;
return $this->translatorAdmin->transAction($actionName, $params);;
}

public function transAdminTitle($pageName, $entityClass = null, $params = [])

Loading…
Cancel
Save