Commit 6b048569 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'test__admission_v2' into test

parents 136e1d2f c2911960

module/Admission/src/Admission/Service/Exporter/CharteDoctorat/CharteDoctoratExporter.php

+1 −1
Changes for module/Admission/src/Admission/Service/Exporter/CharteDoctorat/CharteDoctoratExporter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class CharteDoctoratExporter extends RendererTemplatePdfExporter 
    public function export($filename = null, $destination = self::DESTINATION_BROWSER, $memoryLimit = null): ?string

    {

        //$this->setWatermark("CONFIDENTIEL");

        $this->setMarginTop(35);

        $this->setMarginTop(40);

        $this->setMarginBottom(15);



        return parent::export($filename, $destination, $memoryLimit);

module/Admission/src/Admission/Service/Exporter/CharteDoctorat/header.phtml

+2 −2
Changes for module/Admission/src/Admission/Service/Exporter/CharteDoctorat/header.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 
?>

<div class="header">

    <div style="width:25%; float:left; position:absolute; top: 20px; left: 20px">

        <img src="<?php echo $ETAB; ?>" style='max-width:4cm;max-height:4cm;' alt="Logo de l'établissement"/>

        <img src="<?php echo $ETAB; ?>" style='max-width:4cm;max-height:3cm;' alt="Logo de l'établissement"/>

    </div>

    <?php if ($COMUE): ?>

        <div style="width:25%; float:right; position:absolute; top: 20px; right: 10px">

            <img src="<?php echo $COMUE; ?>" style='max-width:4cm;max-height:4cm;' alt="Logo de la COMUE"/>

            <img src="<?php echo $COMUE; ?>" style='max-width:4cm;max-height:3cm;' alt="Logo de la COMUE"/>

        </div>

    <?php endif; ?>

</div>
 
 No newline at end of file

module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/ConventionFormationDoctoraleExporter.php

+2 −2
Changes for module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/ConventionFormationDoctoraleExporter.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ class ConventionFormationDoctoraleExporter extends RendererTemplatePdfExporter 
        }

        $this->setWatermark($watermark);



        $this->setMarginTop(35);

        $this->setMarginBottom(20);

        $this->setMarginTop(40);

        $this->setMarginBottom(15);



        return parent::export($filename, $destination, $memoryLimit);

    }

module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/header.phtml

+2 −2
Changes for module/Admission/src/Admission/Service/Exporter/ConventionFormationDoctorale/header.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 
 */

?>

<div style="width:25%; float:left; position:absolute; top: 20px; left: 20px">

    <img src="<?php echo $ETAB; ?>" style='max-width:4cm;max-height:4cm;' alt="Logo de la comue"/>

    <img src="<?php echo $ETAB; ?>" style='max-width:4cm;max-height:3cm;' alt="Logo de la comue"/>

</div>

<div style="width:25%; float:right; position:absolute; top: 20px; right: 10px">

    <img src="<?php echo $COMUE; ?>" style='max-width:4cm;max-height:4cm;' alt="Logo de l'établissement"/>

    <img src="<?php echo $COMUE; ?>" style='max-width:4cm;max-height:3cm;' alt="Logo de l'établissement"/>

</div>