Commit ae41aa70 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Pages 'Rôles et privilèges' et 'Profils et privilèges' : harmonisation +... 

Pages 'Rôles et privilèges' et 'Profils et privilèges' : harmonisation + mention du code de chaque catégorie/privilège pour faciliter la recherche.
parent 37f82c59

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ Journal des modifications 


10.4.0

------

- Pages 'Rôles et privilèges' et 'Profils et privilèges' : harmonisation + mention du code de chaque catégorie/privilège pour faciliter la recherche.

- [FIX] Admission : la marge du bas dans des PDF générés n'était pas respectée (pb dans unicaen/pdf).

- [FIX] Admission : dans le formulaire en mode lecture seule, des boutons radios étaient débloqués à tort.

module/Application/config/module.config.php

+1 −0
Changes for module/Application/config/module.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ return array( 
            '400_faa' => '/vendor/font-awesome-animation.min.css',

            '500_select2' => "/vendor/select2-4.0.13/dist/css/select2.min.css",

            '900_faa' => '/css/rapport-activite.css',

            '910_priv' => '/css/privilege.css',

        ],

        'printable_stylesheets' => [

        ],

module/Application/view/application/privilege/index.phtml

+17 −3
Changes for module/Application/view/application/privilege/index.phtml: 17 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(PrivilegePrivileges::P 
    </div>



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

        <table class="table table-condensed table-bordered table-hover">

        <table class="table table-condensed table-bordered table-hover privileges">

            <thead>

            <tr>

                <th></th>
@@ -102,13 +102,27 @@ $canModifier = $this->isAllowed(Privileges::getResourceId(PrivilegePrivileges::P 
                <?php if ($previous_categorie !== $privilege->getCategorie()) : ?>

                    <tr>

                        <td colspan="<?php echo count($roles) + 1; ?>" class="categorie">

                            <h3><?php echo $privilege->getCategorie()->getLibelle(); ?></h3>

                            <?php $id = $privilege->getCategorie()->getCode() ?>

                            <a id="<?php echo $id ?>" class="anchor" href="#<?php echo $id ?>"></a>

                            <h3 title="<?php echo $privilege->getCode() ?>">

                                <a href="#<?php echo $id ?>" class="anchored">

                                    <?php echo $privilege->getCategorie()->getLibelle(); ?>

                                </a>

                                <span class="categorie-code">'<?php echo $privilege->getCategorie()->getCode() ?>'</span>

                            </h3>

                        </td>

                    </tr>

                    <?php $previous_categorie = $privilege->getCategorie(); ?>

                <?php endif; ?>

                <tr data-legend="<?php echo $privilege->getLibelle() ?>">

                    <th class="privilege"> <?php echo $privilege->getLibelle(); ?> </th>

                    <th class="privilege">

                        <?php $id = $privilege->getCategorie()->getCode() . '-' . $privilege->getCode() ?>

                        <a id="<?php echo $id ?>" class="anchor" href="#<?php echo $id ?>"></a>

                        <a href="#<?php echo $id ?>" class="anchored">

                            <span title="<?php echo $privilege->getCode() ?>"><?php echo $privilege ?></span>

                        </a>

                        <span class="privilege-code">'<?php echo $privilege->getCode() ?>'</span>

                    </th>

                    <?php foreach ($roles as $role) : ?>

                        <?php

                        $code = ($role->getStructure() !== null) ? $role->getStructure()->getSigle() : '';

module/Application/view/application/profil/index.phtml

+6 −2
Changes for module/Application/view/application/profil/index.phtml: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ $canChangePrivilege = true; 
    </div>



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

        <table class="table table-condensed table-bordered table-hover">

        <table class="table table-condensed table-bordered table-hover privileges">

            <thead>

            <tr>

                <th> Privilèges </th>
@@ -128,9 +128,12 @@ $canChangePrivilege = true; 
                        <td class="categorie" colspan="<?php echo (1 + 1 + count($profils)); ?>">

                            <?php $id = $privilege->getCategorie()->getCode() ?>

                            <a id="<?php echo $id ?>" class="anchor" href="#<?php echo $id ?>"></a>

                            <h3 title="<?php echo $privilege->getCategorie()->getCode() ?>">

                                <a href="#<?php echo $id ?>" class="anchored">

                                <h3 title="<?php echo $previous->getCode() ?>"><?php echo $previous ?></h3>

                                    <?php echo $privilege->getCategorie() ?>

                                </a>

                                <span class="categorie-code">'<?php echo $privilege->getCategorie()->getCode() ?>'</span>

                            </h3>

                        </td>

                    </tr>

                <?php endif; ?>
@@ -141,6 +144,7 @@ $canChangePrivilege = true; 
                        <a href="#<?php echo $id ?>" class="anchored">

                            <span title="<?php echo $privilege->getCode() ?>"><?php echo $privilege ?></span>

                        </a>

                        <span class="privilege-code">'<?php echo $privilege->getCode() ?>'</span>

                    </th>

                    <?php foreach ($profils as $profil) : ?>

                        <td class="droit <?php echo $profil->getStructureType()?->getCode() ?: "aucun" ?>" id="<?php echo $privilege->getId(); ?>_<?php echo $profil->getId();?>"

public/css/privilege.css

0 → 100644
+8 −0
Changes for public/css/privilege.css: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
table.privileges .categorie-code, table.privileges .privilege-code {

  font-family: "Courier New", Courier, monospace;

  font-size: 75%;

  color: #6c757d;

  opacity: 60%;

  letter-spacing: -0.045rem; }



/*# sourceMappingURL=privilege.css.map */