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

Ajout d'une protection pour les logos

parent 2b53d946

module/Application/view/application/ecole-doctorale/index.phtml

+6 −0
Changes for module/Application/view/application/ecole-doctorale/index.phtml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -135,6 +135,12 @@ $selectedEcole = null; 
                    </table>



                    <!-- AFFICHAGE DU LOGO DE L'UR SELECTIONNÉE -->

                    <?php

                    $content = $ecole->getLogoContent();

                    if ($content === null) {

                        $ecole->setCheminLogo(null);

                    }

                    ?>

                    <div id="logo-div" class="pull-right">

                        <img style="max-width: 200px; max-height: 200px; border: 1px solid black; background-color: white;"

                             src="data:image/png;base64,<?php echo base64_encode($ecole->getLogoContent()); ?>"

module/Application/view/application/ecole-doctorale/modifier.phtml

+7 −0
Changes for module/Application/view/application/ecole-doctorale/modifier.phtml: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ $fcg = $this->formControlGroup(); 
    $logoFile = $form->get('cheminLogo');

    echo $this->formLabel($logoFile);

?>



    <?php

    $content = $form->getObject()->getLogoContent();

    if ($content === null) {

        $form->getObject()->setCheminLogo(null);

    }

    ?>

<table>

    <tr>

        <td>

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

+6 −0
Changes for module/Application/view/application/etablissement/index.phtml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ $selectedEcole = null; 
            </table>



            <!-- AFFICHAGE DU LOGO DE L'UR SELECTIONNÉE -->

                <?php

                $content = $etablissement->getLogoContent();

                if ($content === null) {

                    $etablissement->setCheminLogo(null);

                }

                ?>

            <div id="logo-div" class="pull-right">

                <img style="max-width: 200px; max-height: 200px; border: 1px solid black; background-color: white;"

                    src="data:image/png;base64,<?php echo base64_encode($etablissement->getLogoContent()); ?>"

module/Application/view/application/etablissement/modifier.phtml

+7 −0
Changes for module/Application/view/application/etablissement/modifier.phtml: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,13 @@ $fcg = $this->formControlGroup(); 
        $logoFile = $form->get('cheminLogo');

        echo $this->formLabel($logoFile);

        ?>



        <?php

        $content = $form->getObject()->getLogoContent();

        if ($content === null) {

            $form->getObject()->setCheminLogo(null);

        }

        ?>

        <table>

            <tr>

                <td>

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

+1 −1
Changes for module/Application/view/application/statistique/index.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ $code["ZAIROIS(E)"] = "Zaire"; 
        'packages':['geochart'],

        // Note: you will need to get a mapsApiKey for your project.

        // See: https://developers.google.com/chart/interactive/docs/basic_load_libs#load-settings

        'mapsApiKey': 'AIzaSyD-9tSrke72PouQMnMX-a7eZSW0jkFMBWY'

        'mapsApiKey': 'AIzaSyAZPWFm-VDkkiToc-s7Z982XQ6b6bDp428'

    });

    google.charts.setOnLoadCallback(drawRegionsMap);