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

Correction graphique

parent 837c93b3

src/UnicaenRenderer/View/Helper/partial/rendu.phtml

+5 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ use UnicaenRenderer\Entity\Db\Rendu; 


<div class="row">

    <div class="col-md-4">

        <h2>Information sur le rendu </h2>

        <dl>

            <dt> Identifiant </dt>

            <dd>
@@ -32,11 +33,12 @@ use UnicaenRenderer\Entity\Db\Rendu; 
        </dl>

    </div>

    <div class="col-md-8">

        <div class="panel panel-default">

            <div class="panel-heading">

        <h2>Affichage du contenu </h2>

        <div class="card card-default">

            <div class="card-header">

                <?php echo $rendu->getSujet(); ?>

            </div>

            <div class="panel-body">

            <div class="card-body">

                <?php echo $rendu->getCorps(); ?>

            </div>

        </div>

view/unicaen-renderer/macro/index.phtml

+30 −36
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * @var Macro[] $macros

 * @var string[] $variables

 * @var string $variable

 * @var string $title

 */



use UnicaenRenderer\Entity\Db\Macro;
@@ -23,26 +24,29 @@ $canSupprimer = $this->isAllowed(DocumentmacroPrivileges::getResourceId(Document 
$this->headTitle($title);

?>



<div class="row">

    <div class="col-md-9">

        <h1 class="page-header">

            <?= $title ?>

        </h1>





<div class="row mb-3">

    <div class="col-md-12">

    </div>

    <div class="col-md-3">

        <?php if ($canRendu) : ?>

            <a href="<?php echo $this->url('contenu/rendu'); ?>" class="btn btn-primary action">

                <span class="icon tag"></span>

                Gérer les rendus

            <a href="<?php echo $this->url('contenu/rendu'); ?>" class="btn btn-secondary action">

                <span class="icon icon-listing"></span>

                Accéder aux rendus

            </a>

        <?php endif; ?>



        <?php if ($canTemplate) : ?>

            <a href="<?php echo $this->url('contenu/template'); ?>" class="btn btn-primary action">

                <span class="icon tag"></span>

                Gérer les templates

            <a href="<?php echo $this->url('contenu/template'); ?>" class="btn btn-secondary action">

                <span class="icon icon-listing"></span>

                Accéder aux templates

            </a>

        <?php endif; ?>

    </div>

</div>



<?php if ($canAjouter) : ?>

    <a href="<?php echo $this->url('contenu/macro/ajouter', [], [], true); ?>"

       class="btn btn-primary action ajax-modal" data-event="modification">
@@ -56,17 +60,9 @@ $this->headTitle($title); 
    <span class="icon icon-code"></span>

    Générer le JSON des macros

</a>

    </div>

</div>



<?php echo $this->partial('partial/filtre', ['variables' => $variables, 'params' => ['variable' => $variable]]); ?>



<div class="card border-default mb-3">

    <div class="card-header bg-default">

        <h2>Liste des macros</h2>

    </div>



    <div class="card-body">

<table id='macro-liste' class="table table-condensed table-hover">

            <thead>

            <tr>
@@ -112,8 +108,6 @@ $this->headTitle($title); 
            <?php endforeach; ?>

            </tbody>

        </table>

    </div>

</div>





<script>
@@ -125,7 +119,7 @@ $this->headTitle($title); 


        if (jQuery().dataTable) {

            $('#macro-liste').DataTable({

                "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "Tous"]],

                "lengthMenu": [[50, 100, -1], [50, 100, "Tous"]],

                "columnDefs": [

                    {targets: 3, orderable: false, searchable: false},

                ],

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

+8 −6
Original line number Diff line number Diff line
@@ -10,15 +10,17 @@ 


<div class="card border-default mb-3">

    <div class="card-header bg-default">

        <h2>Filtrer les macros</h2>

        <span class="icon icon-filter"></span>

        Filtrer les macros

    </div>



    <div class="card-body">

        <form method="get" id="filtre" action="<?php echo $this->url(); ?>">

            <div class="row">

                <!-- Variable -------------------------------------------------------- -->

                <div class="col-md-5">

                <div class="col-md-9">

                    <div class="form-group">

                        <label for="variable">Variable associée :</label>

                        <select id="variable" name="variable" class="form-control selectpicker">

                            <option value=""> Toutes les variables</option>

                            <?php foreach ($variables as $variable) : ?>
@@ -33,15 +35,15 @@ 
                    </div>

                </div>

                <!-- BOUTON -->

                <div class="col-md-7">

                <div class="col-md-3">

                    <div class="form-group">

                        <button class="btn btn-primary" id="filter">

                            <span class="icon icon-filtrer"></span>

                            Filtrer

                            Filtrer les macros

                        </button>

                        <button class="btn btn-primary" id="clear">

                            <span class="icon icon-erase"></span>

                            Effacer

                            <span class="icon icon-gommer"></span>

                            Remise à zéro

                        </button>

                    </div>

                </div>

view/unicaen-renderer/rendu/index.phtml

+16 −23
Original line number Diff line number Diff line
@@ -20,33 +20,28 @@ $canVoir = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Documentcon 
$canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(DocumentcontenuPrivileges::DOCUMENTCONTENU_SUPPRIMER));

?>



<div class="row">

    <div class="col-md-9">

        <h1 class="page-header">

            <?= $title ?>

        </h1>



<div class="row mb-3">

    <div class="col-md-12">

    </div>

    <div class="col-md-3">

        <?php if($canMacro) :?>

        <a href="<?php echo $this->url('contenu/macro'); ?>" class="btn btn-primary action">

            <span class="icon tag"></span>

            Gérer les macros

            <a href="<?php echo $this->url('contenu/macro'); ?>" class="btn btn-secondary action">

                <span class="icon icon-listing"></span>

                Accéder aux macros

            </a>

        <?php endif; ?>

        <?php if($canTemplate) :?>

        <a href="<?php echo $this->url('contenu/template'); ?>" class="btn btn-primary action">

            <span class="icon tag"></span>

            Gérer les templates

            <a href="<?php echo $this->url('contenu/template'); ?>" class="btn btn-secondary action">

                <span class="icon icon-listing"></span>

                Accéder aux templates

            </a>

        <?php endif; ?>

    </div>

</div>



<div class="card border-default mb-3">

    <div class="card-header bg-default">

        <h2>Liste des rendus</h2>

    </div>



    <div class="card-body">

<table id='rendu-liste' class="table table-condensed table-hover">

            <thead>

            <tr>
@@ -98,8 +93,6 @@ $canSupprimer = $this->isAllowed(DocumentcontenuPrivileges::getResourceId(Docume 
            <?php endforeach; ?>

            </tbody>

        </table>

    </div>

</div>



<script>

    $(function () {

view/unicaen-renderer/template/afficher.phtml

+27 −24
Original line number Diff line number Diff line
@@ -9,28 +9,31 @@ use UnicaenRenderer\Entity\Db\Template; 


?>



<dl class="dl-horizontal">

    <dt> Code </dt>

    <dd> <?php echo $template->getCode(); ?> </dd>

    <dt> Type </dt>

    <dd> <?php echo $template->getType(); ?> </dd>

<div class="row">

    <div class="col-md-6">

        <h2> Information sur le template </h2>



        <dl class="row">

            <dt class="col-md-4"> Code </dt>

            <dd class="col-md-8"> <?php echo $template->getCode(); ?> </dd>

            <dt class="col-md-4"> Type </dt>

            <dd class="col-md-8"> <?php echo $template->getType(); ?> </dd>

            <?php if ($template->getDescription()) : ?>

                <dt> Description </dt>

        <dd> <br/>

            <div style="border:1px solid black; border-radius: 5px; padding:0.5rem;">

                <?php echo $template->getDescription(); ?> </div>

                <dd>

                        <?php echo $template->getDescription(); ?>

                </dd>

            <?php endif; ?>

    <dt> Sujet </dt>

    <dd> <br/>

        <div style="border:1px solid black; border-radius: 5px; padding:0.5rem;">

        </dl>

    </div>

    <div class="col-md-6">

        <div class="card card-default">

            <div class="card-header">

                    <?php echo $template->getSujet(); ?>

            </div>

    </dd>

    <dt> Corps </dt>

    <dd> <br/>

        <div style="border:1px solid black; border-radius: 5px; padding:0.5rem;">

            <div class="card-body">

                <?php echo $template->getCorps(); ?>

            </div>

    </dd>

</dl>
 
        </div>

    </div>

</div>