Commit eb09fb7e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Uniformisation des filtres

parent b5461999
Loading
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
CHANGELOG
=========

7.1.1
-----
- Uniformisation des filtres
- Ajout d'un partiel pour le filtre des templates

7.1.0
-----
- Possibilité d'intégrer des templates dans un autre templates (sous-template)

7.0.6
-----
- [FIX] Plantage de TinyMCE à cause du `?php` oublié dans les `extended_valid_elements` : retrait car inutile au moteur par défaut de toute façon. 
+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
        <form method="get" id="filtre" action="<?php echo $this->url('contenu/macro', [], [], true); ?>">
            <div class="row">
                <!-- Variable -------------------------------------------------------- -->
                <div class="col-md-9">
                <div class="col-md-10">
                    <div class="form-group">
                        <label for="variable">Variable associée :</label>
                        <select id="variable" name="variable" class="form-control selectpicker">
@@ -35,11 +35,11 @@
                    </div>
                </div>
                <!-- BOUTON -->
                <div class="col-md-3">
                <div class="col-md-2">
                    <div class="form-group">
                        <button class="btn btn-primary" id="filter">
                            <span class="icon icon-filtrer"></span>
                            Filtrer les macros
                            Filtrer
                        </button>
                        <button class="btn btn-primary" id="clear">
                            <span class="icon icon-gommer"></span>
+5 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use UnicaenRenderer\Entity\Db\Template;
    <div class="card card-body">
        <form method="get" action="<?php echo ($url) ?? ''; ?>">
            <div class="row">
                <div class="col-m-9">
                <div class="col-md-10">
                    <div class="row">
                        <div class="col-md-4">
                            <label for="template">Template :</label>
@@ -46,16 +46,15 @@ use UnicaenRenderer\Entity\Db\Template;
                    </div>
                </div>
                <!-- BOUTON -->
                <div class="col-md-3">
                <div class="col-md-2">
                    <div class="pull-right">
                        <button class="btn btn-primary action" id="clear">
                            <span class="icon icon-gommer"></span> Remise à zéro
                        </button>

                        <button class="btn btn-primary action" id="filter">
                            <span class="icon icon-filtrer"></span>
                            Filtrer
                        </button>
                        <button class="btn btn-primary action" id="clear">
                            <span class="icon icon-gommer"></span> Remise à zéro
                        </button>
                    </div>
                </div>
            </div>
+1 −50
Original line number Diff line number Diff line
@@ -75,57 +75,8 @@ if (isset($title)) $this->headTitle($title);
    </div>
<?php endif; ?>

<div class="card border-default mb-3">
    <div class="card-header bg-default">
        <h2>Filtrer les templates</h2>
    </div>
    <div class="card-body">
        <form method="get" action="">
            <div class="row">
                <div class="col-md-4">
                    <label for="namespace"> Namespace : </label>
                    <select id="namespace" name="namespace" class="selectpicker" data-live-search="true">
                        <option value=""> Tous les namespaces</option>
                        <?php foreach ($namespaces as $key => $namespaceCurrent) : ?>
                            <?php if ($namespaceCurrent === null) $namespaceCurrent = TemplateController::SANS_NAMESPACE; ?>
                            <option value="<?php echo $namespaceCurrent; ?>"
                                <?php if (isset($namespace) && $namespaceCurrent === $namespace) echo " selected "; ?>
                            >
                                <?php echo $namespaceCurrent; ?>
                            </option>
                        <?php endforeach; ?>
                    </select>
                </div>
                <div class="col-md-4">
                    <label for="type"> Type : </label>
                    <select id="type" name="type" class="selectpicker" data-live-search="true">
                        <option value=""> Tous les types </option>
                        <?php foreach ($types as $key => $typeCurrent) : ?>
                            <option value="<?php echo $typeCurrent; ?>"
                                <?php if (isset($type) && $typeCurrent === $type) echo " selected "; ?>
                            >
                                <?php echo $typeCurrent; ?>
                            </option>
<?php echo $this->partial('partial/filtre.phtml', ['namespaces' => $namespaces, 'namespace' => $namespace, 'types' => $types, 'type' => $type]); ?>

                        <?php endforeach; ?>
                    </select>
                </div>
                <div class="col-md-4">
                    <div class="form-group">
                        <button class="btn btn-primary" id="filter">
                            <span class="icon icon-filtrer"></span>
                            Filtrer les templates
                        </button>
                        <button class="btn btn-primary" id="clear">
                            <span class="icon icon-gommer"></span>
                            Remise à zéro
                        </button>
                    </div>
                </div>
            </div>
        </form>
    </div>
</div>

<table id='template-liste' class="table table-condensed table-hover">
    <thead>
+68 −0
Original line number Diff line number Diff line
<?php

/**
 * @var string[] $namespaces
 * @var ?string $namespace
 * @var string[] $types
 * @var ?string $type
 */

?>

<div class="card border-default mb-3">
    <div class="card-header bg-default">
        Filtre de recherche des templates
    </div>
    <div class="card-body">
        <form method="get" action="">
            <div class="row">
                <div class="col-md-10">
                    <div class="row">
                        <div class="col-md-4">
                            <label for="namespace"> Namespace : </label>
                            <select id="namespace" name="namespace" class="selectpicker" data-live-search="true">
                                <option value=""> Tous les namespaces</option>
                                <?php use UnicaenRenderer\Controller\TemplateController;

                                foreach ($namespaces as $key => $namespaceCurrent) : ?>
                                    <?php if ($namespaceCurrent === null) $namespaceCurrent = TemplateController::SANS_NAMESPACE; ?>
                                    <option value="<?php echo $namespaceCurrent; ?>"
                                        <?php if (isset($namespace) && $namespaceCurrent === $namespace) echo " selected "; ?>
                                    >
                                        <?php echo $namespaceCurrent; ?>
                                    </option>
                                <?php endforeach; ?>
                            </select>
                        </div>
                        <div class="col-md-4">
                            <label for="type"> Type : </label>
                            <select id="type" name="type" class="selectpicker" data-live-search="true">
                                <option value=""> Tous les types</option>
                                <?php foreach ($types as $key => $typeCurrent) : ?>
                                    <option value="<?php echo $typeCurrent; ?>"
                                        <?php if (isset($type) && $typeCurrent === $type) echo " selected "; ?>
                                    >
                                        <?php echo $typeCurrent; ?>
                                    </option>

                                <?php endforeach; ?>
                            </select>
                        </div>
                    </div>
                </div>
                <div class="col-md-2">
                    <div class="form-group">
                        <button class="btn btn-primary" id="filter">
                            <span class="icon icon-filtrer"></span>
                            Filtrer
                        </button>
                        <button class="btn btn-primary" id="clear">
                            <span class="icon icon-gommer"></span>
                            Remise à zéro
                        </button>
                    </div>
                </div>
            </div>
        </form>
    </div>
</div>
 No newline at end of file