Merge branch 'laminas_migration_bs5' of https://git.unicaen.fr/lib/unicaen/renderer into HEAD (837b9c7d) · Commits · lib / unicaen / renderer

config/merged/index.config.php

+3 −4

Original line number	Diff line number	Diff line
		@@ -34,12 +34,11 @@ return [
		'administration' => [
		'pages' => [
		'contenu' => [
		'label' => 'Contenu',
		'route' => 'contenu',
		'label' => 'Templates et macros',
		'route' => 'contenu/template',
		'resource' => PrivilegeController::getResourceId(IndexController::class, 'index'),
		'order' => 10001,
		'pages' => [
		],
		'icon' => 'fas fa-angle-right',
		],
		],
		],

readme.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ Dépendance à UnicaenPrivilege
		```php
		<?php

		use UnicaenAuth\Guard\PrivilegeController;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenRenderer\Controller\IndexController;
		use UnicaenRenderer\Controller\MacroController;
		use UnicaenRenderer\Controller\RenduController;

src/UnicaenRenderer/Service/Macro/MacroService.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ class MacroService {
		{
		$macros = $this->getMacros();

		$result = "let macros = [\n";
		$result = "macros = [\n";
		foreach ($macros as $macro) {
		$result .= " { title:'" . $macro->getCode() . "', description:'" . strip_tags(str_replace("'","\'",$macro->getDescription())) . "', content:'VAR[" . $macro->getCode() . "]' },\n";
		}

view/unicaen-renderer/macro/index.phtml

+5 −9

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ $this->headTitle($title);
		<?php if ($canAjouter) : ?>
		<a href="<?php echo $this->url('contenu/macro/ajouter', [], [], true); ?>"
		class="btn btn-primary action ajax-modal" data-event="modification">
		<span class="icon ajouter"></span>
		<span class="icon icon-ajouter"></span>
		Ajouter une macro
		</a>
		@@ -54,7 +53,6 @@ $this->headTitle($title);

		<a href="<?php echo $this->url('contenu/macro/generer-json', [], [], true); ?>"
		class="btn btn-primary action ajax-modal">
		<span class="icon code"></span>
		<span class="icon icon-code"></span>
		Générer le JSON des macros
		</a>
		@@ -84,9 +82,7 @@ $this->headTitle($title);
		<td>
		<?php echo $macro->getCode(); ?>
		<?php if ($macro->getDescription() !== null) : ?>
		<span class="icon information" data-toggle="tooltip" data-html="true"
		title="<?php echo $macro->getDescription(); ?>"></span>
		<span class="icon icon-information" data-toggle="tooltip" data-html="true"
		<span class="icon icon-information" data-bs-toggle="tooltip" data-bs-html="true"
		title="<?php echo $macro->getDescription(); ?>"></span>
		<?php endif; ?>
		</td>
		@@ -99,17 +95,17 @@ $this->headTitle($title);
		<td class="text-end">
		<?php if ($canModifier) : ?>
		<a href="<?php echo $this->url('contenu/macro/modifier', ['macro' => $macro->getId()], [], true); ?>"
		class="ajax-modal" data-event="modification" data-toggle="tooltip" data-html="true"
		class="ajax-modal" data-event="modification" data-bs-toggle="tooltip" data-bs-html="true"
		title="Modification de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>"
		>
		<span class="icon editer"></span><span class="icon icon-editer"></span></a>
		<span class="icon icon-editer"></span></a>
		<?php endif; ?>
		<?php if ($canSupprimer) : ?>
		<a href="<?php echo $this->url('contenu/macro/supprimer', ['macro' => $macro->getId()], [], true); ?>"
		class="ajax-modal" data-event="modification" data-toggle="tooltip" data-html="true"
		class="ajax-modal" data-event="modification" data-bs-toggle="tooltip" data-bs-html="true"
		title="Suppression de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>"
		>
		<span class="icon detruire text-danger"></span><span class="icon icon-supprimer text-danger"></span></a>
		<span class="icon icon-supprimer text-danger"></span></a>
		<?php endif; ?>
		</td>
		</tr>

view/unicaen-renderer/macro/partial/filtre.phtml

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,10 +36,11 @@
		<div class="col-md-7">
		<div class="form-group">
		<button class="btn btn-primary" id="filter">
		<span class="icon filtrer"></span>
		<span class="icon icon-filtrer"></span>
		Filtrer
		</button>
		<button class="btn btn-primary" id="clear">
		<span class="icon icon-erase"></span>
		Effacer
		</button>
		</div>